upgrade to gradle 0.9.2
This commit is contained in:
parent
94c632b79b
commit
2820988171
|
@ -176,5 +176,5 @@ task release(dependsOn: [zip, tar]) << {
|
||||||
}
|
}
|
||||||
|
|
||||||
task wrapper(type: Wrapper) {
|
task wrapper(type: Wrapper) {
|
||||||
gradleVersion = '0.9.1'
|
gradleVersion = '0.9.2'
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
|
@ -1,6 +1,6 @@
|
||||||
#Mon Jan 03 11:44:56 IST 2011
|
#Sun Jan 30 16:03:01 IST 2011
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=http\://gradle.artifactoryonline.com/gradle/distributions/gradle-0.9.1-bin.zip
|
distributionUrl=http\://gradle.artifactoryonline.com/gradle/distributions/gradle-0.9.2-bin.zip
|
||||||
|
|
|
@ -12,16 +12,20 @@ GRADLE_OPTS="$GRADLE_OPTS -Xmx512m"
|
||||||
|
|
||||||
GRADLE_APP_NAME=Gradle
|
GRADLE_APP_NAME=Gradle
|
||||||
|
|
||||||
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
|
MAX_FD="maximum"
|
||||||
|
|
||||||
warn ( ) {
|
warn ( ) {
|
||||||
echo "${PROGNAME}: $*"
|
echo "$*"
|
||||||
}
|
}
|
||||||
|
|
||||||
die ( ) {
|
die ( ) {
|
||||||
warn "$*"
|
echo
|
||||||
|
echo "$*"
|
||||||
|
echo
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
# OS specific support (must be 'true' or 'false').
|
||||||
cygwin=false
|
cygwin=false
|
||||||
msys=false
|
msys=false
|
||||||
|
@ -79,12 +83,31 @@ if [ -z "$JAVACMD" ] ; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
die "JAVA_HOME is not defined correctly, can not execute: $JAVACMD"
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
fi
|
fi
|
||||||
if [ -z "$JAVA_HOME" ] ; then
|
if [ -z "$JAVA_HOME" ] ; then
|
||||||
warn "JAVA_HOME environment variable is not set"
|
warn "JAVA_HOME environment variable is not set"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
|
||||||
|
MAX_FD_LIMIT=`ulimit -H -n`
|
||||||
|
if [ $? -eq 0 ] ; then
|
||||||
|
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||||
|
MAX_FD="$MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
ulimit -n $MAX_FD
|
||||||
|
if [ $? -ne 0 ] ; then
|
||||||
|
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# For Darwin, add GRADLE_APP_NAME to the JAVA_OPTS as -Xdock:name
|
# For Darwin, add GRADLE_APP_NAME to the JAVA_OPTS as -Xdock:name
|
||||||
if $darwin; then
|
if $darwin; then
|
||||||
JAVA_OPTS="$JAVA_OPTS -Xdock:name=$GRADLE_APP_NAME"
|
JAVA_OPTS="$JAVA_OPTS -Xdock:name=$GRADLE_APP_NAME"
|
||||||
|
@ -137,7 +160,7 @@ fi
|
||||||
|
|
||||||
GRADLE_APP_BASE_NAME=`basename "$0"`
|
GRADLE_APP_BASE_NAME=`basename "$0"`
|
||||||
|
|
||||||
"$JAVACMD" $JAVA_OPTS $GRADLE_OPTS \
|
exec "$JAVACMD" $JAVA_OPTS $GRADLE_OPTS \
|
||||||
-classpath "$CLASSPATH" \
|
-classpath "$CLASSPATH" \
|
||||||
-Dorg.gradle.appname="$GRADLE_APP_BASE_NAME" \
|
-Dorg.gradle.appname="$GRADLE_APP_BASE_NAME" \
|
||||||
-Dorg.gradle.wrapper.properties="$WRAPPER_PROPERTIES" \
|
-Dorg.gradle.wrapper.properties="$WRAPPER_PROPERTIES" \
|
||||||
|
|
|
@ -5,10 +5,6 @@
|
||||||
@rem ##
|
@rem ##
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
|
|
||||||
@rem
|
|
||||||
@rem $Revision: 10602 $ $Date: 2008-01-25 02:49:54 +0100 (ven., 25 janv. 2008) $
|
|
||||||
@rem
|
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell
|
@rem Set local scope for the variables with windows NT shell
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
|
@ -19,69 +15,29 @@ set GRADLE_OPTS=%GRADLE_OPTS% -Xmx512m
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%" == "" set DIRNAME=.\
|
if "%DIRNAME%" == "" set DIRNAME=.\
|
||||||
|
|
||||||
@rem Determine the command interpreter to execute the "CD" later
|
@rem Find java.exe
|
||||||
set COMMAND_COM="cmd.exe"
|
set JAVA_EXE=java.exe
|
||||||
if exist "%SystemRoot%\system32\cmd.exe" set COMMAND_COM="%SystemRoot%\system32\cmd.exe"
|
if not defined JAVA_HOME goto init
|
||||||
if exist "%SystemRoot%\command.com" set COMMAND_COM="%SystemRoot%\command.com"
|
|
||||||
|
|
||||||
@rem Use explicit find.exe to prevent cygwin and others find.exe from being used
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
set FIND_EXE="find.exe"
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
if exist "%SystemRoot%\system32\find.exe" set FIND_EXE="%SystemRoot%\system32\find.exe"
|
|
||||||
if exist "%SystemRoot%\command\find.exe" set FIND_EXE="%SystemRoot%\command\find.exe"
|
|
||||||
|
|
||||||
:check_JAVA_HOME
|
if exist "%JAVA_EXE%" goto init
|
||||||
@rem Make sure we have a valid JAVA_HOME
|
|
||||||
if not "%JAVA_HOME%" == "" goto have_JAVA_HOME
|
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ERROR: Environment variable JAVA_HOME has not been set.
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
echo.
|
echo.
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
echo location of your Java installation.
|
echo location of your Java installation.
|
||||||
echo.
|
echo.
|
||||||
goto end
|
goto end
|
||||||
|
|
||||||
:have_JAVA_HOME
|
|
||||||
@rem Validate JAVA_HOME
|
|
||||||
%COMMAND_COM% /C DIR "%JAVA_HOME%" 2>&1 | %FIND_EXE% /I /C "%JAVA_HOME%" >nul
|
|
||||||
if not errorlevel 1 goto init
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME might be set to an invalid directory: %JAVA_HOME%
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation if there are problems.
|
|
||||||
echo.
|
|
||||||
|
|
||||||
:init
|
:init
|
||||||
@rem get name of script to launch with full path
|
|
||||||
@rem Get command-line arguments, handling Windowz variants
|
@rem Get command-line arguments, handling Windowz variants
|
||||||
SET _marker=%JAVA_HOME: =%
|
|
||||||
@rem IF NOT "%_marker%" == "%JAVA_HOME%" ECHO JAVA_HOME "%JAVA_HOME%" contains spaces. Please change to a location without spaces if this causes problems.
|
|
||||||
|
|
||||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||||
if "%eval[2+2]" == "4" goto 4NT_args
|
if "%eval[2+2]" == "4" goto 4NT_args
|
||||||
|
|
||||||
IF "%_marker%" == "%JAVA_HOME%" goto :win9xME_args
|
|
||||||
|
|
||||||
set _FIXPATH=
|
|
||||||
call :fixpath "%JAVA_HOME%"
|
|
||||||
set JAVA_HOME=%_FIXPATH:~1%
|
|
||||||
|
|
||||||
goto win9xME_args
|
|
||||||
|
|
||||||
:fixpath
|
|
||||||
if not %1.==. (
|
|
||||||
for /f "tokens=1* delims=;" %%a in (%1) do (
|
|
||||||
call :shortfilename "%%a" & call :fixpath "%%b"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
goto :EOF
|
|
||||||
:shortfilename
|
|
||||||
for %%i in (%1) do set _FIXPATH=%_FIXPATH%;%%~fsi
|
|
||||||
goto :EOF
|
|
||||||
|
|
||||||
|
|
||||||
:win9xME_args
|
:win9xME_args
|
||||||
@rem Slurp the command line arguments.
|
@rem Slurp the command line arguments.
|
||||||
set CMD_LINE_ARGS=
|
set CMD_LINE_ARGS=
|
||||||
|
@ -103,10 +59,10 @@ set CMD_LINE_ARGS=%$
|
||||||
set STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
|
set STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
|
||||||
set CLASSPATH=%DIRNAME%\gradle\wrapper\gradle-wrapper.jar
|
set CLASSPATH=%DIRNAME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
set WRAPPER_PROPERTIES=%DIRNAME%\gradle\wrapper\gradle-wrapper.properties
|
set WRAPPER_PROPERTIES=%DIRNAME%\gradle\wrapper\gradle-wrapper.properties
|
||||||
set JAVA_EXE=%JAVA_HOME%\bin\java.exe
|
|
||||||
|
|
||||||
set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%"
|
set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%"
|
||||||
|
|
||||||
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %GRADLE_OPTS% -classpath "%CLASSPATH%" %STARTER_MAIN_CLASS% %CMD_LINE_ARGS%
|
"%JAVA_EXE%" %GRADLE_OPTS% -classpath "%CLASSPATH%" %STARTER_MAIN_CLASS% %CMD_LINE_ARGS%
|
||||||
|
|
||||||
:end
|
:end
|
||||||
|
|
Loading…
Reference in New Issue