-
Notifications
You must be signed in to change notification settings - Fork 7.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rather than hacking stuff on top of the existing Ant build, add Rio/Gradle build files. This allows leveraging CI-Gen and other Rio features. In the immediate future, it solves the problem of SRC and JAVADOC packages not being published. <rdar://problem/22790711> cie-zookeeper-3.4-client-15.6.1-sources.jar only has RAD related sources (not zookeeper)
- Loading branch information
Marco Primi
committed
Jan 11, 2016
1 parent
7e30292
commit 380f175
Showing
6 changed files
with
289 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,112 @@ | ||
/* | ||
*** TODO *** a number of non-essential improvements can be made to this build: | ||
* generateJute does not declare outputs so it runs every time the build runs | ||
* generateVersion does not declare outputs so it runs every time the build runs | ||
* The idea project generation does not depend on generateJute and generateVersion | ||
* Zookeeper launch scripts work only with the default Ant build | ||
* The custom properties required for tests to pass are not set in idea | ||
*/ | ||
|
||
buildscript { | ||
dependencies { | ||
classpath "com.apple.cie.rio:gradle-build-plugin:${rioGradlePluginVersion}" | ||
} | ||
} | ||
|
||
apply plugin: 'rio-library' | ||
|
||
apply plugin: 'java' | ||
apply plugin: 'idea' | ||
|
||
sourceCompatibility = "${jdkVersion}" | ||
|
||
dependencies { | ||
compile "com.apple.cie.rio:splunk-log-layouts-common:0.7.0" | ||
compile "com.apple.cie.rio:splunk-log-layouts-log4j:0.7.0" | ||
compile "org.slf4j:slf4j-api:1.7.5" | ||
compile "org.slf4j:slf4j-log4j12:1.7.5" | ||
|
||
compile "log4j:log4j:1.2.17" | ||
compile "jline:jline:2.11" | ||
compile "io.netty:netty:3.7.0.Final" | ||
compile "commons-cli:commons-cli:1.2" | ||
compile "org.mortbay.jetty:jetty:6.1.26" | ||
compile "org.codehaus.jackson:jackson-mapper-asl:1.9.11" | ||
|
||
runtime "org.slf4j:slf4j-api:1.6.1" | ||
runtime "org.slf4j:slf4j-log4j12:1.6.1" | ||
runtime "log4j:log4j:1.2.17.jar" | ||
|
||
testCompile "junit:junit:4.12" | ||
testCompile "org.mockito:mockito-all:1.8.2" | ||
testCompile "checkstyle:checkstyle:5.0" | ||
|
||
} | ||
|
||
def generatedFilesFolder = new File( 'src/java/generated' ) | ||
def testFolder = new File( '.out/test' ) | ||
def testDataFolder = new File( '.out/test/data' ) | ||
|
||
sourceSets.main.java.srcDirs += ["src/java/main", generatedFilesFolder] | ||
sourceSets.test.java.srcDirs += ["src/java/test"] | ||
|
||
task generatedClassesMkdir() { | ||
description = 'Create folder where generated java code is output' | ||
if( !generatedFilesFolder.exists() ) { | ||
generatedFilesFolder.mkdirs() | ||
} | ||
} | ||
|
||
task buildJuteCompiler(type: JavaCompile) { | ||
description = 'Builds the Jute compiler' | ||
source = fileTree(dir: 'src/java/main').matching { include 'org/apache/jute/**' } | ||
destinationDir = sourceSets.main.output.classesDir | ||
classpath = sourceSets.main.compileClasspath | ||
} | ||
|
||
task generateJute(type: JavaExec, dependsOn: ['buildJuteCompiler', 'generatedClassesMkdir']) { | ||
description = 'Generates Java classes described in zookeeper.jute' | ||
workingDir = generatedFilesFolder | ||
main = 'org.apache.jute.compiler.generated.Rcc' | ||
args = ["-l", "java", "../../zookeeper.jute" ] | ||
classpath += sourceSets.main.compileClasspath | ||
classpath += files(sourceSets.main.output.classesDir) | ||
} | ||
|
||
task buildVersionGenerator(type: JavaCompile) { | ||
description = 'Builds the VerGen utility' | ||
source = fileTree(dir: 'src/java/main').matching { include 'org/apache/zookeeper/version/util/**' } | ||
destinationDir = sourceSets.main.output.classesDir | ||
classpath = sourceSets.main.compileClasspath | ||
} | ||
|
||
task generateVersion(type: JavaExec, dependsOn: ['buildVersionGenerator', 'generatedClassesMkdir']) { | ||
description = 'Generates Java version Info class using VerGen' | ||
workingDir = generatedFilesFolder | ||
main = 'org.apache.zookeeper.version.util.VerGen' | ||
args = ["${version}", "1", new Date() ] | ||
classpath += sourceSets.main.compileClasspath | ||
classpath += files(sourceSets.main.output.classesDir) | ||
} | ||
|
||
// Before compiling Java, generate generated java classes | ||
compileJava.dependsOn += [generateJute, generateVersion] | ||
|
||
// Override for defaults properties when running tests | ||
tasks.withType(Test) { | ||
systemProperty "build.test.dir", testFolder | ||
systemProperty "test.data.dir", testDataFolder | ||
systemProperty "log4j.configuration", "conf/log4j.properties" | ||
} | ||
|
||
task testFoldersMkdir() { | ||
description = 'Create folders for test output' | ||
if( !testFolder.exists() ) { | ||
testFolder.mkdirs() | ||
} | ||
if( !testDataFolder.exists() ) { | ||
testDataFolder.mkdirs() | ||
} | ||
} | ||
|
||
test.dependsOn += [testFoldersMkdir] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
version=3.4.7.4 | ||
group=com.apple.cie.zookeeper | ||
|
||
jdkVersion=1.7 | ||
|
||
rioGradlePluginVersion=+ |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#Tue Aug 19 16:38:31 PDT 2014 | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists | ||
distributionUrl=https\://artifacts.geo.apple.com/artifactory/gradle-distributions/gradle-2.2.1-all.zip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,164 @@ | ||
#!/usr/bin/env bash | ||
|
||
############################################################################## | ||
## | ||
## Gradle start up script for UN*X | ||
## | ||
############################################################################## | ||
|
||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. | ||
DEFAULT_JVM_OPTS="" | ||
|
||
APP_NAME="Gradle" | ||
APP_BASE_NAME=`basename "$0"` | ||
|
||
# Use the maximum available, or set MAX_FD != -1 to use that value. | ||
MAX_FD="maximum" | ||
|
||
warn ( ) { | ||
echo "$*" | ||
} | ||
|
||
die ( ) { | ||
echo | ||
echo "$*" | ||
echo | ||
exit 1 | ||
} | ||
|
||
# OS specific support (must be 'true' or 'false'). | ||
cygwin=false | ||
msys=false | ||
darwin=false | ||
case "`uname`" in | ||
CYGWIN* ) | ||
cygwin=true | ||
;; | ||
Darwin* ) | ||
darwin=true | ||
;; | ||
MINGW* ) | ||
msys=true | ||
;; | ||
esac | ||
|
||
# For Cygwin, ensure paths are in UNIX format before anything is touched. | ||
if $cygwin ; then | ||
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` | ||
fi | ||
|
||
# Attempt to set APP_HOME | ||
# Resolve links: $0 may be a link | ||
PRG="$0" | ||
# Need this for relative symlinks. | ||
while [ -h "$PRG" ] ; do | ||
ls=`ls -ld "$PRG"` | ||
link=`expr "$ls" : '.*-> \(.*\)$'` | ||
if expr "$link" : '/.*' > /dev/null; then | ||
PRG="$link" | ||
else | ||
PRG=`dirname "$PRG"`"/$link" | ||
fi | ||
done | ||
SAVED="`pwd`" | ||
cd "`dirname \"$PRG\"`/" >&- | ||
APP_HOME="`pwd -P`" | ||
cd "$SAVED" >&- | ||
|
||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar | ||
|
||
# Determine the Java command to use to start the JVM. | ||
if [ -n "$JAVA_HOME" ] ; then | ||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then | ||
# IBM's JDK on AIX uses strange locations for the executables | ||
JAVACMD="$JAVA_HOME/jre/sh/java" | ||
else | ||
JAVACMD="$JAVA_HOME/bin/java" | ||
fi | ||
if [ ! -x "$JAVACMD" ] ; then | ||
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 | ||
else | ||
JAVACMD="java" | ||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | ||
Please set the JAVA_HOME variable in your environment to match the | ||
location of your Java installation." | ||
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 maximum file descriptor limit: $MAX_FD_LIMIT" | ||
fi | ||
fi | ||
|
||
# For Darwin, add options to specify how the application appears in the dock | ||
if $darwin; then | ||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" | ||
fi | ||
|
||
# For Cygwin, switch paths to Windows format before running java | ||
if $cygwin ; then | ||
APP_HOME=`cygpath --path --mixed "$APP_HOME"` | ||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` | ||
|
||
# We build the pattern for arguments to be converted via cygpath | ||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` | ||
SEP="" | ||
for dir in $ROOTDIRSRAW ; do | ||
ROOTDIRS="$ROOTDIRS$SEP$dir" | ||
SEP="|" | ||
done | ||
OURCYGPATTERN="(^($ROOTDIRS))" | ||
# Add a user-defined pattern to the cygpath arguments | ||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then | ||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" | ||
fi | ||
# Now convert the arguments - kludge to limit ourselves to /bin/sh | ||
i=0 | ||
for arg in "$@" ; do | ||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` | ||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option | ||
|
||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition | ||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` | ||
else | ||
eval `echo args$i`="\"$arg\"" | ||
fi | ||
i=$((i+1)) | ||
done | ||
case $i in | ||
(0) set -- ;; | ||
(1) set -- "$args0" ;; | ||
(2) set -- "$args0" "$args1" ;; | ||
(3) set -- "$args0" "$args1" "$args2" ;; | ||
(4) set -- "$args0" "$args1" "$args2" "$args3" ;; | ||
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; | ||
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; | ||
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; | ||
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; | ||
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; | ||
esac | ||
fi | ||
|
||
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules | ||
function splitJvmOpts() { | ||
JVM_OPTS=("$@") | ||
} | ||
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS | ||
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" | ||
|
||
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
rootProject.name = 'zookeeper' |