github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

upgrade to gradle 0.9 preview 1

Browse source
This commit is contained in:
kimchy 2010-04-02 15:47:27 +03:00
parent 3e12600520
commit 6ed23744fc
10 changed files with 189 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

50
build.gradle
View file

@ -2,7 +2,7 @@ import java.text.SimpleDateFormat
defaultTasks "clean", "release" defaultTasks "clean", "release"
usePlugin BasePlugin apply plugin: 'base'
archivesBaseName = 'elasticsearch' archivesBaseName = 'elasticsearch'
@ -69,32 +69,44 @@ task explodedDist(dependsOn: [configurations.distLib], description: 'Builds a mi
ant.chmod(dir: "$explodedDistDir/bin", perm: "ugo+rx", includes: "**/*") ant.chmod(dir: "$explodedDistDir/bin", perm: "ugo+rx", includes: "**/*")
} }
task zip(type: Zip) { task zip(type: Zip, dependsOn: ['explodedDist']) {
dependsOn explodedDist
// classifier = 'all'
}
zip.doFirst {task ->
zipRootFolder = "$archivesBaseName-${-> version}" zipRootFolder = "$archivesBaseName-${-> version}"
task.configure { from(explodedDistDir) {
zipFileSet(dir: explodedDistDir, prefix: zipRootFolder) { into zipRootFolder
exclude 'bin/*' exclude 'bin/*'
} }
zipFileSet(dir: explodedDistDir, prefix: zipRootFolder, fileMode: '775') { from(explodedDistDir) {
include 'bin/*' into zipRootFolder
exclude 'bin/*.*' include 'bin/*'
} exclude 'bin/*.*'
zipFileSet(dir: explodedDistDir, prefix: zipRootFolder) { fileMode: '775'
include 'bin/*.*' }
} from(explodedDistDir) {
into zipRootFolder
include 'bin/*.*'
} }
} }
//zip.doFirst {task ->
// task.configure {
// zipFileSet(dir: explodedDistDir, prefix: zipRootFolder) {
// exclude 'bin/*'
// }
// zipFileSet(dir: explodedDistDir, prefix: zipRootFolder, fileMode: '775') {
// include 'bin/*'
// exclude 'bin/*.*'
// }
// zipFileSet(dir: explodedDistDir, prefix: zipRootFolder) {
// include 'bin/*.*'
// }
// }
//}
//
task release(dependsOn: [zip, ":plugins-attachments:release"]) << { task release(dependsOn: [zip, ":plugins-attachments:release"]) << {
ant.delete(dir: explodedDistDir) ant.delete(dir: explodedDistDir)
} }
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '0.8' gradleVersion = '0.9-preview-1'
jarPath = 'gradle' jarPath = 'gradle'
} }

BIN
gradle/gradle-wrapper.jar
View file

Binary file not shown.

4
gradle/gradle-wrapper.properties
View file

@ -1,8 +1,8 @@
#Sun Dec 13 20:16:46 IST 2009 #Fri Apr 02 15:36:16 IDT 2010
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
distributionVersion=0.8 distributionVersion=0.9-preview-1
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
urlRoot=http\://dist.codehaus.org/gradle urlRoot=http\://dist.codehaus.org/gradle
distributionName=gradle distributionName=gradle

12
gradlew vendored
View file

@ -10,6 +10,8 @@
GRADLE_OPTS="$GRADLE_OPTS -Xmx512m" GRADLE_OPTS="$GRADLE_OPTS -Xmx512m"
# JAVA_OPTS="$JAVA_OPTS -Xmx512" # JAVA_OPTS="$JAVA_OPTS -Xmx512"
GRADLE_APP_NAME=Gradle
warn ( ) { warn ( ) {
echo "${PROGNAME}: $*" echo "${PROGNAME}: $*"
} }
@ -60,7 +62,7 @@ if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi fi
STARTER_MAIN_CLASS=org.gradle.wrapper.WrapperMain STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
CLASSPATH=`dirname "$0"`/gradle/gradle-wrapper.jar CLASSPATH=`dirname "$0"`/gradle/gradle-wrapper.jar
WRAPPER_PROPERTIES=`dirname "$0"`/gradle/gradle-wrapper.properties WRAPPER_PROPERTIES=`dirname "$0"`/gradle/gradle-wrapper.properties
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
@ -83,10 +85,15 @@ if [ -z "$JAVA_HOME" ] ; then
warn "JAVA_HOME environment variable is not set" warn "JAVA_HOME environment variable is not set"
fi fi
# For Darwin, add GRADLE_APP_NAME to the JAVA_OPTS as -Xdock:name
if $darwin; then
JAVA_OPTS="$JAVA_OPTS -Xdock:name=$GRADLE_APP_NAME"
# we may also want to set -Xdock:image
fi
# For Cygwin, switch paths to Windows format before running java # For Cygwin, switch paths to Windows format before running java
if $cygwin ; then if $cygwin ; then
JAVA_HOME=`cygpath --path --mixed "$JAVA_HOME"` JAVA_HOME=`cygpath --path --mixed "$JAVA_HOME"`
TOOLS_JAR=`cygpath --path --mixed "$TOOLS_JAR"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
# We build the pattern for arguments to be converted via cygpath # We build the pattern for arguments to be converted via cygpath
@ -130,7 +137,6 @@ fi
"$JAVACMD" $JAVA_OPTS $GRADLE_OPTS \ "$JAVACMD" $JAVA_OPTS $GRADLE_OPTS \
-classpath "$CLASSPATH" \ -classpath "$CLASSPATH" \
-Dtools.jar="$TOOLS_JAR" \
-Dorg.gradle.wrapper.properties="$WRAPPER_PROPERTIES" \ -Dorg.gradle.wrapper.properties="$WRAPPER_PROPERTIES" \
$STARTER_MAIN_CLASS \ $STARTER_MAIN_CLASS \
"$@" "$@"

251
gradlew.bat vendored
View file

@ -1,127 +1,126 @@
@if "%DEBUG%" == "" @echo off @if "%DEBUG%" == "" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem ## @rem ##
@rem Gradle startup script for Windows ## @rem Gradle startup script for Windows ##
@rem ## @rem ##
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem $Revision: 10602 $ $Date: 2008-01-25 02:49:54 +0100 (ven., 25 janv. 2008) $ @rem $Revision: 10602 $ $Date: 2008-01-25 02:49:54 +0100 (ven., 25 janv. 2008) $
@rem @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
@rem Uncomment those lines to set JVM options. GRADLE_OPTS and JAVA_OPTS can be used together. @rem Uncomment those lines to set JVM options. GRADLE_OPTS and JAVA_OPTS can be used together.
set GRADLE_OPTS=%GRADLE_OPTS% -Xmx512m set GRADLE_OPTS=%GRADLE_OPTS% -Xmx512m
@rem set JAVA_OPTS=%JAVA_OPTS% -Xmx512 @rem set JAVA_OPTS=%JAVA_OPTS% -Xmx512
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 Determine the command interpreter to execute the "CD" later
set COMMAND_COM="cmd.exe" set COMMAND_COM="cmd.exe"
if exist "%SystemRoot%\system32\cmd.exe" set COMMAND_COM="%SystemRoot%\system32\cmd.exe" if exist "%SystemRoot%\system32\cmd.exe" set COMMAND_COM="%SystemRoot%\system32\cmd.exe"
if exist "%SystemRoot%\command.com" set COMMAND_COM="%SystemRoot%\command.com" 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 @rem Use explicit find.exe to prevent cygwin and others find.exe from being used
set FIND_EXE="find.exe" set FIND_EXE="find.exe"
if exist "%SystemRoot%\system32\find.exe" set FIND_EXE="%SystemRoot%\system32\find.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" if exist "%SystemRoot%\command\find.exe" set FIND_EXE="%SystemRoot%\command\find.exe"
:check_JAVA_HOME :check_JAVA_HOME
@rem Make sure we have a valid JAVA_HOME @rem Make sure we have a valid JAVA_HOME
if not "%JAVA_HOME%" == "" goto have_JAVA_HOME if not "%JAVA_HOME%" == "" goto have_JAVA_HOME
echo. echo.
echo ERROR: Environment variable JAVA_HOME has not been set. echo ERROR: Environment variable JAVA_HOME has not been set.
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 :have_JAVA_HOME
@rem Validate JAVA_HOME @rem Validate JAVA_HOME
%COMMAND_COM% /C DIR "%JAVA_HOME%" 2>&1 | %FIND_EXE% /I /C "%JAVA_HOME%" >nul %COMMAND_COM% /C DIR "%JAVA_HOME%" 2>&1 | %FIND_EXE% /I /C "%JAVA_HOME%" >nul
if not errorlevel 1 goto init if not errorlevel 1 goto init
echo. echo.
echo ERROR: JAVA_HOME might be set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME might be 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 if there are problems. echo location of your Java installation if there are problems.
echo. echo.
:init :init
@rem get name of script to launch with full path @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: =% 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. @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 IF "%_marker%" == "%JAVA_HOME%" goto :win9xME_args
set _FIXPATH= set _FIXPATH=
call :fixpath "%JAVA_HOME%" call :fixpath "%JAVA_HOME%"
set JAVA_HOME=%_FIXPATH:~1% set JAVA_HOME=%_FIXPATH:~1%
goto win9xME_args goto win9xME_args
:fixpath :fixpath
if not %1.==. ( if not %1.==. (
for /f "tokens=1* delims=;" %%a in (%1) do ( for /f "tokens=1* delims=;" %%a in (%1) do (
call :shortfilename "%%a" & call :fixpath "%%b" call :shortfilename "%%a" & call :fixpath "%%b"
) )
) )
goto :EOF goto :EOF
:shortfilename :shortfilename
for %%i in (%1) do set _FIXPATH=%_FIXPATH%;%%~fsi for %%i in (%1) do set _FIXPATH=%_FIXPATH%;%%~fsi
goto :EOF 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=
set _SKIP=2 set _SKIP=2
:win9xME_args_slurp :win9xME_args_slurp
if "x%~1" == "x" goto execute if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%* set CMD_LINE_ARGS=%*
goto execute goto execute
:4NT_args :4NT_args
@rem Get arguments from the 4NT Shell from JP Software @rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$ set CMD_LINE_ARGS=%$
:execute :execute
@rem Setup the command line @rem Setup the command line
set STARTER_MAIN_CLASS=org.gradle.wrapper.WrapperMain set STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
set CLASSPATH=%DIRNAME%\gradle\gradle-wrapper.jar set CLASSPATH=%DIRNAME%\gradle\gradle-wrapper.jar
set WRAPPER_PROPERTIES=%DIRNAME%\gradle\gradle-wrapper.properties set WRAPPER_PROPERTIES=%DIRNAME%\gradle\gradle-wrapper.properties
set JAVA_EXE=%JAVA_HOME%\bin\java.exe set JAVA_EXE=%JAVA_HOME%\bin\java.exe
set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar
set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%"
set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dtools.jar="%TOOLS_JAR%" -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%"
"%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 @rem End local scope for the variables with windows NT shell
@rem End local scope for the variables with windows NT shell if "%ERRORLEVEL%"=="0" goto mainEnd
if "%ERRORLEVEL%"=="0" goto mainEnd
if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1
if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code!
rem the _cmd.exe /c_ return code! if not "" == "%GRADLE_EXIT_CONSOLE%" exit "%ERRORLEVEL%"
if not "" == "%GRADLE_EXIT_CONSOLE%" exit "%ERRORLEVEL%" exit /b "%ERRORLEVEL%"
exit /b "%ERRORLEVEL%"
:mainEnd
:mainEnd if "%OS%"=="Windows_NT" endlocal
if "%OS%"=="Windows_NT" endlocal
:omega :omega

8
modules/benchmark/micro/build.gradle
View file

@ -1,6 +1,6 @@
dependsOn(':elasticsearch') dependsOn(':elasticsearch')
usePlugin 'java' apply plugin: 'java'
archivesBaseName = "$rootProject.archivesBaseName-$project.archivesBaseName" archivesBaseName = "$rootProject.archivesBaseName-$project.archivesBaseName"
@ -20,7 +20,7 @@ dependencies {
test { test {
useTestNG() useTestNG()
options.suiteName = project.name suiteName = project.name
options.listeners = ["org.elasticsearch.util.testng.Listeners"] listeners = ["org.elasticsearch.util.testng.Listeners"]
options.systemProperties = ["es.test.log.conf": System.getProperty("es.test.log.conf", "log4j-gradle.properties")] systemProperties["es.test.log.conf"] = System.getProperty("es.test.log.conf", "log4j-gradle.properties")
} }

10
modules/elasticsearch/build.gradle
View file

@ -1,7 +1,7 @@
dependsOn(':test-testng') dependsOn(':test-testng')
usePlugin 'java' apply plugin: 'java'
usePlugin 'maven' apply plugin: 'maven'
archivesBaseName = "$project.archivesBaseName" archivesBaseName = "$project.archivesBaseName"
@ -63,9 +63,9 @@ dependencies {
test { test {
useTestNG() useTestNG()
jmvArgs = ["-ea", "-Xmx1024m"] jmvArgs = ["-ea", "-Xmx1024m"]
options.suiteName = project.name suiteName = project.name
options.listeners = ["org.elasticsearch.util.testng.Listeners"] listeners = ["org.elasticsearch.util.testng.Listeners"]
options.systemProperties = ["es.test.log.conf": System.getProperty("es.test.log.conf", "log4j-gradle.properties")] systemProperties["es.test.log.conf"] = System.getProperty("es.test.log.conf", "log4j-gradle.properties")
} }
configure(install.repositories.mavenInstaller) { configure(install.repositories.mavenInstaller) {

12
modules/test/integration/build.gradle
View file

@ -1,6 +1,6 @@
dependsOn(':elasticsearch') dependsOn(':elasticsearch')
usePlugin 'java' apply plugin: 'java'
archivesBaseName = "$rootProject.archivesBaseName-$project.archivesBaseName" archivesBaseName = "$rootProject.archivesBaseName-$project.archivesBaseName"
@ -22,10 +22,8 @@ dependencies {
test { test {
useTestNG() useTestNG()
jmvArgs = ["-ea", "-Xmx1024m"] jmvArgs = ["-ea", "-Xmx1024m"]
options.suiteName = project.name suiteName = project.name
options.listeners = ["org.elasticsearch.util.testng.Listeners"] listeners = ["org.elasticsearch.util.testng.Listeners"]
options.systemProperties = [ systemProperties["es.test.log.conf"] = System.getProperty("es.test.log.conf", "log4j-gradle.properties")
"es.test.log.conf": System.getProperty("es.test.log.conf", "log4j-gradle.properties"), systemProperties["java.net.preferIPv4Stack"] = "true"
"java.net.preferIPv4Stack": "true"
]
} }

4
modules/test/testng/build.gradle
View file

@ -1,4 +1,4 @@
usePlugin 'java' apply plugin: 'java'
archivesBaseName = "$rootProject.archivesBaseName-$project.archivesBaseName" archivesBaseName = "$rootProject.archivesBaseName-$project.archivesBaseName"
@ -18,5 +18,5 @@ dependencies {
test { test {
useTestNG() useTestNG()
options.systemProperties = ["es.test.log.conf": "log4j-gradle.properties"] systemProperties['es.test.log.conf'] = 'log4j-gradle.properties'
} }

23
plugins/attachments/build.gradle
View file

@ -1,6 +1,6 @@
dependsOn(':elasticsearch') dependsOn(':elasticsearch')
usePlugin 'java' apply plugin: 'java'
archivesBaseName = "elasticsearch-attachments" archivesBaseName = "elasticsearch-attachments"
@ -43,11 +43,9 @@ dependencies {
test { test {
useTestNG() useTestNG()
jmvArgs = ["-ea", "-Xmx1024m"] jmvArgs = ["-ea", "-Xmx1024m"]
options.suiteName = project.name suiteName = project.name
options.listeners = ["org.elasticsearch.util.testng.Listeners"] listeners = ["org.elasticsearch.util.testng.Listeners"]
options.systemProperties = [ systemProperties["es.test.log.conf"] = System.getProperty("es.test.log.conf", "log4j-gradle.properties")
"es.test.log.conf": System.getProperty("es.test.log.conf", "log4j-gradle.properties")
]
} }
task explodedDist(dependsOn: [jar], description: 'Builds the plugin zip file') << { task explodedDist(dependsOn: [jar], description: 'Builds the plugin zip file') << {
@ -67,17 +65,8 @@ task explodedDist(dependsOn: [jar], description: 'Builds the plugin zip file') <
} }
} }
task zip(type: Zip) { task zip(type: Zip, dependsOn: ['explodedDist']) {
dependsOn explodedDist from(explodedDistDir) {
// classifier = 'all'
}
zip.doFirst {task ->
zipRootFolder = "" // its the plugin, don't create it under a specific name
task.configure {
zipFileSet(dir: explodedDistDir, prefix: zipRootFolder) {
// just copy over everything
}
} }
} }