Skip to content

Commit 1bd8aea

Browse files
committed
Fix Gradle Wrapper
1 parent c71536d commit 1bd8aea

File tree

3 files changed

+115
-181
lines changed

3 files changed

+115
-181
lines changed

Diff for: gradle/wrapper/gradle-wrapper.jar

-320 Bytes
Binary file not shown.

Diff for: gradlew

+25-21
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,30 @@
66
##
77
##############################################################################
88

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
1126

1227
APP_NAME="Gradle"
1328
APP_BASE_NAME=`basename "$0"`
1429

30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
1533
# Use the maximum available, or set MAX_FD != -1 to use that value.
1634
MAX_FD="maximum"
1735

@@ -30,6 +48,7 @@ die ( ) {
3048
cygwin=false
3149
msys=false
3250
darwin=false
51+
nonstop=false
3352
case "`uname`" in
3453
CYGWIN* )
3554
cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
4059
MINGW* )
4160
msys=true
4261
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
4365
esac
4466

45-
# Attempt to set APP_HOME
46-
# Resolve links: $0 may be a link
47-
PRG="$0"
48-
# Need this for relative symlinks.
49-
while [ -h "$PRG" ] ; do
50-
ls=`ls -ld "$PRG"`
51-
link=`expr "$ls" : '.*-> \(.*\)$'`
52-
if expr "$link" : '/.*' > /dev/null; then
53-
PRG="$link"
54-
else
55-
PRG=`dirname "$PRG"`"/$link"
56-
fi
57-
done
58-
SAVED="`pwd`"
59-
cd "`dirname \"$PRG\"`/" >/dev/null
60-
APP_HOME="`pwd -P`"
61-
cd "$SAVED" >/dev/null
62-
6367
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6468

6569
# Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
8589
fi
8690

8791
# Increase the maximum file descriptors if we can.
88-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
8993
MAX_FD_LIMIT=`ulimit -H -n`
9094
if [ $? -eq 0 ] ; then
9195
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then

Diff for: gradlew.bat

+90-160
Original file line numberDiff line numberDiff line change
@@ -1,160 +1,90 @@
1-
#!/usr/bin/env bash
2-
3-
##############################################################################
4-
##
5-
## Gradle start up script for UN*X
6-
##
7-
##############################################################################
8-
9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
11-
12-
APP_NAME="Gradle"
13-
APP_BASE_NAME=`basename "$0"`
14-
15-
# Use the maximum available, or set MAX_FD != -1 to use that value.
16-
MAX_FD="maximum"
17-
18-
warn ( ) {
19-
echo "$*"
20-
}
21-
22-
die ( ) {
23-
echo
24-
echo "$*"
25-
echo
26-
exit 1
27-
}
28-
29-
# OS specific support (must be 'true' or 'false').
30-
cygwin=false
31-
msys=false
32-
darwin=false
33-
case "`uname`" in
34-
CYGWIN* )
35-
cygwin=true
36-
;;
37-
Darwin* )
38-
darwin=true
39-
;;
40-
MINGW* )
41-
msys=true
42-
;;
43-
esac
44-
45-
# Attempt to set APP_HOME
46-
# Resolve links: $0 may be a link
47-
PRG="$0"
48-
# Need this for relative symlinks.
49-
while [ -h "$PRG" ] ; do
50-
ls=`ls -ld "$PRG"`
51-
link=`expr "$ls" : '.*-> \(.*\)$'`
52-
if expr "$link" : '/.*' > /dev/null; then
53-
PRG="$link"
54-
else
55-
PRG=`dirname "$PRG"`"/$link"
56-
fi
57-
done
58-
SAVED="`pwd`"
59-
cd "`dirname \"$PRG\"`/" >/dev/null
60-
APP_HOME="`pwd -P`"
61-
cd "$SAVED" >/dev/null
62-
63-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
64-
65-
# Determine the Java command to use to start the JVM.
66-
if [ -n "$JAVA_HOME" ] ; then
67-
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
68-
# IBM's JDK on AIX uses strange locations for the executables
69-
JAVACMD="$JAVA_HOME/jre/sh/java"
70-
else
71-
JAVACMD="$JAVA_HOME/bin/java"
72-
fi
73-
if [ ! -x "$JAVACMD" ] ; then
74-
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
75-
76-
Please set the JAVA_HOME variable in your environment to match the
77-
location of your Java installation."
78-
fi
79-
else
80-
JAVACMD="java"
81-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
82-
83-
Please set the JAVA_HOME variable in your environment to match the
84-
location of your Java installation."
85-
fi
86-
87-
# Increase the maximum file descriptors if we can.
88-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
89-
MAX_FD_LIMIT=`ulimit -H -n`
90-
if [ $? -eq 0 ] ; then
91-
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
92-
MAX_FD="$MAX_FD_LIMIT"
93-
fi
94-
ulimit -n $MAX_FD
95-
if [ $? -ne 0 ] ; then
96-
warn "Could not set maximum file descriptor limit: $MAX_FD"
97-
fi
98-
else
99-
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
100-
fi
101-
fi
102-
103-
# For Darwin, add options to specify how the application appears in the dock
104-
if $darwin; then
105-
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
106-
fi
107-
108-
# For Cygwin, switch paths to Windows format before running java
109-
if $cygwin ; then
110-
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
111-
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
112-
JAVACMD=`cygpath --unix "$JAVACMD"`
113-
114-
# We build the pattern for arguments to be converted via cygpath
115-
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
116-
SEP=""
117-
for dir in $ROOTDIRSRAW ; do
118-
ROOTDIRS="$ROOTDIRS$SEP$dir"
119-
SEP="|"
120-
done
121-
OURCYGPATTERN="(^($ROOTDIRS))"
122-
# Add a user-defined pattern to the cygpath arguments
123-
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
124-
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
125-
fi
126-
# Now convert the arguments - kludge to limit ourselves to /bin/sh
127-
i=0
128-
for arg in "$@" ; do
129-
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
130-
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
131-
132-
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
133-
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
134-
else
135-
eval `echo args$i`="\"$arg\""
136-
fi
137-
i=$((i+1))
138-
done
139-
case $i in
140-
(0) set -- ;;
141-
(1) set -- "$args0" ;;
142-
(2) set -- "$args0" "$args1" ;;
143-
(3) set -- "$args0" "$args1" "$args2" ;;
144-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
145-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
146-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
147-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
148-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
149-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
150-
esac
151-
fi
152-
153-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
154-
function splitJvmOpts() {
155-
JVM_OPTS=("$@")
156-
}
157-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
159-
160-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
1+
@if "%DEBUG%" == "" @echo off
2+
@rem ##########################################################################
3+
@rem
4+
@rem Gradle startup script for Windows
5+
@rem
6+
@rem ##########################################################################
7+
8+
@rem Set local scope for the variables with windows NT shell
9+
if "%OS%"=="Windows_NT" setlocal
10+
11+
set DIRNAME=%~dp0
12+
if "%DIRNAME%" == "" set DIRNAME=.
13+
set APP_BASE_NAME=%~n0
14+
set APP_HOME=%DIRNAME%
15+
16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS=
18+
19+
@rem Find java.exe
20+
if defined JAVA_HOME goto findJavaFromJavaHome
21+
22+
set JAVA_EXE=java.exe
23+
%JAVA_EXE% -version >NUL 2>&1
24+
if "%ERRORLEVEL%" == "0" goto init
25+
26+
echo.
27+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28+
echo.
29+
echo Please set the JAVA_HOME variable in your environment to match the
30+
echo location of your Java installation.
31+
32+
goto fail
33+
34+
:findJavaFromJavaHome
35+
set JAVA_HOME=%JAVA_HOME:"=%
36+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37+
38+
if exist "%JAVA_EXE%" goto init
39+
40+
echo.
41+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42+
echo.
43+
echo Please set the JAVA_HOME variable in your environment to match the
44+
echo location of your Java installation.
45+
46+
goto fail
47+
48+
:init
49+
@rem Get command-line arguments, handling Windows variants
50+
51+
if not "%OS%" == "Windows_NT" goto win9xME_args
52+
if "%@eval[2+2]" == "4" goto 4NT_args
53+
54+
:win9xME_args
55+
@rem Slurp the command line arguments.
56+
set CMD_LINE_ARGS=
57+
set _SKIP=2
58+
59+
:win9xME_args_slurp
60+
if "x%~1" == "x" goto execute
61+
62+
set CMD_LINE_ARGS=%*
63+
goto execute
64+
65+
:4NT_args
66+
@rem Get arguments from the 4NT Shell from JP Software
67+
set CMD_LINE_ARGS=%$
68+
69+
:execute
70+
@rem Setup the command line
71+
72+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
74+
@rem Execute Gradle
75+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
76+
77+
:end
78+
@rem End local scope for the variables with windows NT shell
79+
if "%ERRORLEVEL%"=="0" goto mainEnd
80+
81+
:fail
82+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
83+
rem the _cmd.exe /c_ return code!
84+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
85+
exit /b 1
86+
87+
:mainEnd
88+
if "%OS%"=="Windows_NT" endlocal
89+
90+
:omega

0 commit comments

Comments
 (0)