mirror of
https://github.com/valitydev/thrift.git
synced 2024-11-07 10:48:51 +00:00
7004a61e44
Client: java THRIFT-4294: Java Configure Fails for Ant >= 1.10 THRIFT-4259: Thrift does not compile due to Ant Maven task errors THRIFT-4178: Java libraries missing from package when using cmake THRIFT-3983: libthrift is deployed on central with pom packaging instead of jar THRIFT-1507: Maven can't download resource from central when behind a proxy and won't use local repository THRIFT-1418: Compiling Thrift from source: Class org.apache.tools.ant.taskdefs.ConditionTask doesn't support the nested "typefound" element Refactor CMake install hook to allow using "sudo make install/fast" which avoids the THRIFT-1507 and THRIFT-1418 issues. New Gradle based build system for Thrift Java Library * Add Gradle 4.4.1 Wrapper artifacts to enable builds Using the Gradle Wrapper helps normalize the builds on all platforms so we use a consistent build tool independent of package managers. The Gradle build logic was partitioned into multiple specific scripts to simplify understanding and maintenance of the build. This is now hooked into CMake and Autoconf processing steps and can build/test/publish to Maven. The README.md was updated to illustrate the new build options and add some documentation on the requirements for Maven publication. Cleaned up the CMake files to reduce reliance on file globbing which is known to cause confusion when multiple users contribute. * Fix two minor issues in Javadoc and unit test Return values were undeclared in Javadoc Test was asserting on the wrong test object instance * Create simple runner scripts for cross-check Using Gradle as a java execution wrapper is too heavy. I simplified the test client/server execution by using a three generated scripts in the build directory direcly callable by the cross-check test harness. * Cleanup the remaining Ant build scripts Pulled the Maven Ant task properties out of the Java build since they are no longer used there. Deleted the no longer used build.xml and build.properties files from the Java build. Made each Ant build own the Maven Ant task details in their build.properties file. * Fix the build issue with Java SSL in the ubuntu-trusty container The latest Trusty JDK7 builds seem to have encountered this issue because the OpenJDK removed the SunEC algorithms. * Update the developer info as requested in review Use the generic Apache Thrift developer list for contact information * Add Clover Code coverage for easy access by developers Clover plugin for Gradle was applied and configured which enables code coverage reports to be available on demand via a command line option. The documentation in the README.md was enhanced to give the details of this change and how to take advantage of it.
173 lines
5.2 KiB
Bash
Executable File
173 lines
5.2 KiB
Bash
Executable File
#!/usr/bin/env sh
|
|
|
|
##############################################################################
|
|
##
|
|
## Gradle start up script for UN*X
|
|
##
|
|
##############################################################################
|
|
|
|
# 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\"`/" >/dev/null
|
|
APP_HOME="`pwd -P`"
|
|
cd "$SAVED" >/dev/null
|
|
|
|
APP_NAME="Gradle"
|
|
APP_BASE_NAME=`basename "$0"`
|
|
|
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
DEFAULT_JVM_OPTS=""
|
|
|
|
# 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
|
|
nonstop=false
|
|
case "`uname`" in
|
|
CYGWIN* )
|
|
cygwin=true
|
|
;;
|
|
Darwin* )
|
|
darwin=true
|
|
;;
|
|
MINGW* )
|
|
msys=true
|
|
;;
|
|
NONSTOP* )
|
|
nonstop=true
|
|
;;
|
|
esac
|
|
|
|
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" -a "$nonstop" = "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"`
|
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
|
|
|
# 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
|
|
|
|
# Escape application args
|
|
save () {
|
|
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
|
echo " "
|
|
}
|
|
APP_ARGS=$(save "$@")
|
|
|
|
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
|
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
|
|
|
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
|
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
|
cd "$(dirname "$0")"
|
|
fi
|
|
|
|
exec "$JAVACMD" "$@"
|