mirror of
https://github.com/valitydev/thrift.git
synced 2024-11-06 10:25:18 +00:00
THRIFT-5562: remove gradle wrapper and use installed gradle 6.9
Client: java Patch: Jiayu Liu This closes #2576
This commit is contained in:
parent
a8fded4976
commit
5d220eb332
@ -99,10 +99,10 @@ if(ANDROID)
|
||||
CMAKE_DEPENDENT_OPTION(BUILD_JAVA "Build Java library" ON
|
||||
"BUILD_LIBRARIES;WITH_JAVA;GRADLE_FOUND" OFF)
|
||||
else()
|
||||
find_package(Gradlew QUIET)
|
||||
find_package(Gradle QUIET)
|
||||
find_package(Java QUIET)
|
||||
CMAKE_DEPENDENT_OPTION(BUILD_JAVA "Build Java library" ON
|
||||
"BUILD_LIBRARIES;WITH_JAVA;JAVA_FOUND;GRADLEW_FOUND" OFF)
|
||||
"BUILD_LIBRARIES;WITH_JAVA;JAVA_FOUND;GRADLE_FOUND" OFF)
|
||||
endif()
|
||||
|
||||
# Javascript
|
||||
@ -197,7 +197,7 @@ if(ANDROID)
|
||||
MESSAGE_DEP(GRADLE_FOUND "Gradle missing")
|
||||
else()
|
||||
MESSAGE_DEP(JAVA_FOUND "Java Runtime missing")
|
||||
MESSAGE_DEP(GRADLEW_FOUND "Gradle Wrapper missing")
|
||||
MESSAGE_DEP(GRADLE_FOUND "Gradle missing")
|
||||
endif()
|
||||
message(STATUS " Build Javascript library: ${BUILD_JAVASCRIPT}")
|
||||
MESSAGE_DEP(WITH_JAVASCRIPT "Disabled by WITH_JAVASCRIPT=OFF")
|
||||
|
@ -1,36 +0,0 @@
|
||||
#
|
||||
# Licensed to the Apache Software Foundation (ASF) under one
|
||||
# or more contributor license agreements. See the NOTICE file
|
||||
# distributed with this work for additional information
|
||||
# regarding copyright ownership. The ASF licenses this file
|
||||
# to you under the Apache License, Version 2.0 (the
|
||||
# "License"); you may not use this file except in compliance
|
||||
# with the License. You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing,
|
||||
# software distributed under the License is distributed on an
|
||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
# KIND, either express or implied. See the License for the
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
|
||||
|
||||
# GRADLEW_FOUND - system has Gradlew
|
||||
# GRADLEW_EXECUTABLE - the Gradlew executable
|
||||
#
|
||||
# It will search the location CMAKE_SOURCE_DIR/lib/java
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
||||
find_program(GRADLEW_EXECUTABLE gradlew PATHS ${CMAKE_SOURCE_DIR}/lib/java NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
|
||||
find_package_handle_standard_args(Gradlew DEFAULT_MSG GRADLEW_EXECUTABLE)
|
||||
mark_as_advanced(GRADLEW_EXECUTABLE)
|
||||
|
||||
# Buggy find_program cannot find gradlew.bat when gradlew is at the same path
|
||||
# and even buggier ctest will not execute gradlew.bat when gradlew is given.
|
||||
if(CMAKE_HOST_WIN32)
|
||||
string(REGEX REPLACE "(.+gradlew)$" "\\1.bat" GRADLEW_EXECUTABLE ${GRADLEW_EXECUTABLE})
|
||||
endif(CMAKE_HOST_WIN32)
|
@ -149,12 +149,19 @@ RUN apt-get install -y --no-install-recommends \
|
||||
haxelib setup --always /usr/share/haxe/lib && \
|
||||
haxelib install --always hxcpp 2>&1 > /dev/null
|
||||
|
||||
ENV GRADLE_VERSION="6.9.2"
|
||||
RUN apt-get install -y --no-install-recommends \
|
||||
`# Java dependencies` \
|
||||
ant \
|
||||
ant-optional \
|
||||
maven \
|
||||
openjdk-11-jdk-headless
|
||||
openjdk-11-jdk-headless && \
|
||||
`# Gradle` \
|
||||
wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \
|
||||
(echo "8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
|
||||
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
|
||||
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
|
||||
ln -s /usr/local/gradle/bin/gradle /usr/local/bin
|
||||
|
||||
RUN apt-get install -y --no-install-recommends \
|
||||
`# Lua dependencies` \
|
||||
|
@ -148,12 +148,19 @@ RUN apt-get install -y --no-install-recommends \
|
||||
haxelib setup --always /usr/share/haxe/lib && \
|
||||
haxelib install --always hxcpp 2>&1 > /dev/null
|
||||
|
||||
ENV GRADLE_VERSION="6.9.2"
|
||||
RUN apt-get install -y --no-install-recommends \
|
||||
`# Java dependencies` \
|
||||
ant \
|
||||
ant-optional \
|
||||
maven \
|
||||
openjdk-11-jdk-headless
|
||||
openjdk-11-jdk-headless && \
|
||||
`# Gradle` \
|
||||
wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \
|
||||
(echo "8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
|
||||
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
|
||||
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
|
||||
ln -s /usr/local/gradle/bin/gradle /usr/local/bin
|
||||
|
||||
RUN apt-get install -y --no-install-recommends \
|
||||
`# Lua dependencies` \
|
||||
|
@ -155,12 +155,20 @@ RUN apt-get install -y --no-install-recommends \
|
||||
haxelib install --always hxcpp 3.4.64 2>&1 > /dev/null
|
||||
# note: hxcpp 3.4.185 (latest) no longer ships static libraries, and caused a build failure
|
||||
|
||||
ENV GRADLE_VERSION="6.9.2"
|
||||
RUN apt-get install -y --no-install-recommends \
|
||||
`# Java dependencies` \
|
||||
ant \
|
||||
ant-optional \
|
||||
openjdk-8-jdk \
|
||||
maven
|
||||
maven \
|
||||
unzip && \
|
||||
`# Gradle` \
|
||||
wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \
|
||||
(echo "8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
|
||||
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
|
||||
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
|
||||
ln -s /usr/local/gradle/bin/gradle /usr/local/bin
|
||||
|
||||
# disabled: same as ubuntu-bionic jobs
|
||||
# RUN apt-get install -y --no-install-recommends \
|
||||
|
@ -195,11 +195,12 @@ AX_THRIFT_LIB(java, [Java], yes)
|
||||
if test "$with_java" = "yes"; then
|
||||
AX_JAVAC_AND_JAVA
|
||||
AC_PATH_PROG([ANT], [ant])
|
||||
AC_PATH_PROG([GRADLE], [gradle])
|
||||
AX_CHECK_ANT_VERSION($ANT, 1.7)
|
||||
AC_SUBST(CLASSPATH)
|
||||
AC_SUBST(ANT_FLAGS)
|
||||
AC_SUBST(GRADLE_OPTS)
|
||||
if test "x$JAVA" != "x" && test "x$JAVAC" != "x" && test "x$ANT" != "x" ; then
|
||||
if test "x$JAVA" != "x" && test "x$JAVAC" != "x" && test "x$ANT" != "x" && test "x$GRADLE" != "x" ; then
|
||||
have_java="yes"
|
||||
fi
|
||||
fi
|
||||
@ -921,10 +922,10 @@ fi
|
||||
if test "$have_java" = "yes" ; then
|
||||
echo
|
||||
echo "Java Library:"
|
||||
echo " Using gradlew ............. : lib/java/gradlew"
|
||||
echo " Using gradle .............. : $GRADLE"
|
||||
echo " Using java ................ : $JAVA"
|
||||
echo " Using javac ............... : $JAVAC"
|
||||
echo " Using Gradle version ...... : $(lib/java/gradlew --version --quiet | grep Gradle 2>&1)"
|
||||
echo " Using Gradle version ...... : $($GRADLE --version --quiet | grep Gradle 2>&1)"
|
||||
echo " Using java version ........ : $($JAVA -version 2>&1 | grep 'version ')"
|
||||
fi
|
||||
if test "$have_lua" = "yes" ; then
|
||||
|
2
debian/rules
vendored
2
debian/rules
vendored
@ -73,7 +73,7 @@ build-indep-stamp: configure-stamp $(CURDIR)/compiler/cpp/thrift
|
||||
|
||||
# Java
|
||||
cd $(CURDIR)/lib/java && \
|
||||
./gradlew --no-daemon -Prelease=true jar
|
||||
gradle --no-daemon -Prelease=true jar
|
||||
|
||||
# C#
|
||||
$(MAKE) -C $(CURDIR)/lib/netstd
|
||||
|
@ -51,8 +51,8 @@ else()
|
||||
file(GLOB_RECURSE THRIFTJAVA_SOURCES LIST_DIRECTORIES false
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/src/*")
|
||||
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/libs/libthrift.jar"
|
||||
COMMENT "Building Java library using Gradle Wrapper"
|
||||
COMMAND ${GRADLEW_EXECUTABLE} ${GRADLE_OPTS} assemble
|
||||
COMMENT "Building Java library using Gradle"
|
||||
COMMAND ${GRADLE_EXECUTABLE} ${GRADLE_OPTS} assemble
|
||||
--console=plain --no-daemon
|
||||
-Prelease=${PRELEASE}
|
||||
-Pthrift.version=${thrift_VERSION}
|
||||
@ -67,7 +67,7 @@ else()
|
||||
add_custom_target(MavenPublish
|
||||
COMMENT "Publishing Java Library to Apache Maven staging"
|
||||
DEPENDS ThriftJava
|
||||
COMMAND ${GRADLEW_EXECUTABLE} ${GRADLE_OPTS} clean uploadArchives
|
||||
COMMAND ${GRADLE_EXECUTABLE} ${GRADLE_OPTS} clean uploadArchives
|
||||
--console=plain --no-daemon
|
||||
-Prelease=${PRELEASE}
|
||||
-Pthrift.version=${thrift_VERSION}
|
||||
@ -89,7 +89,7 @@ else()
|
||||
|
||||
if(BUILD_TESTING)
|
||||
add_test(NAME JavaTest
|
||||
COMMAND ${GRADLEW_EXECUTABLE} ${GRADLE_OPTS} test
|
||||
COMMAND ${GRADLE_EXECUTABLE} ${GRADLE_OPTS} test
|
||||
--console=plain --no-daemon
|
||||
-Prelease=${PRELEASE}
|
||||
-Pthrift.version=${thrift_VERSION}
|
||||
|
@ -20,13 +20,13 @@
|
||||
export CLASSPATH
|
||||
|
||||
all-local:
|
||||
./gradlew $(GRADLE_OPTS) assemble \
|
||||
gradle $(GRADLE_OPTS) assemble \
|
||||
-Prelease=true \
|
||||
-Pthrift.version=$(PACKAGE_VERSION) \
|
||||
--console=plain
|
||||
|
||||
install-exec-hook:
|
||||
./gradlew $(GRADLE_OPTS) install \
|
||||
gradle $(GRADLE_OPTS) install \
|
||||
-Prelease=true \
|
||||
-Pinstall.path=$(DESTDIR)$(JAVA_PREFIX) \
|
||||
-Pinstall.javadoc.path=$(DESTDIR)$(docdir)/java \
|
||||
@ -34,24 +34,24 @@ install-exec-hook:
|
||||
--console=plain
|
||||
|
||||
clean-local:
|
||||
./gradlew $(GRADLE_OPTS) clean --console=plain
|
||||
gradle $(GRADLE_OPTS) clean --console=plain
|
||||
|
||||
precross: $(THRIFT)
|
||||
./gradlew $(GRADLE_OPTS) shadowJar \
|
||||
gradle $(GRADLE_OPTS) shadowJar \
|
||||
-Prelease=true \
|
||||
-Pthrift.version=$(PACKAGE_VERSION) \
|
||||
-Pthrift.compiler=$(THRIFT) \
|
||||
--console=plain
|
||||
|
||||
check-local: $(THRIFT)
|
||||
./gradlew $(GRADLE_OPTS) test \
|
||||
gradle $(GRADLE_OPTS) test \
|
||||
-Prelease=true \
|
||||
-Pthrift.version=$(PACKAGE_VERSION) \
|
||||
-Pthrift.compiler=$(THRIFT) \
|
||||
--console=plain
|
||||
|
||||
maven-publish:
|
||||
./gradlew $(GRADLE_OPTS) uploadArchives \
|
||||
gradle $(GRADLE_OPTS) uploadArchives \
|
||||
-Prelease=true \
|
||||
-Pthrift.version=$(PACKAGE_VERSION) \
|
||||
--console=plain
|
||||
@ -61,8 +61,6 @@ EXTRA_DIST = \
|
||||
gradle.properties \
|
||||
settings.gradle \
|
||||
gradle \
|
||||
gradlew \
|
||||
gradlew.bat \
|
||||
CMakeLists.txt \
|
||||
coding_standards.md \
|
||||
android \
|
||||
|
@ -44,7 +44,7 @@ developers.
|
||||
|
||||
To compile the Java Thrift libraries, simply do the following:
|
||||
|
||||
./gradlew
|
||||
gradle
|
||||
|
||||
Yep, that's easy. Look for libthrift-<version>.jar in the build/libs directory.
|
||||
|
||||
@ -65,12 +65,12 @@ that.
|
||||
|
||||
To just build the library without running unit tests you simply do this.
|
||||
|
||||
./gradlew assemble
|
||||
gradle assemble
|
||||
|
||||
To install the library in the local Maven repository location
|
||||
where other Maven or Gradle builds can reference it simply do this.
|
||||
|
||||
./gradlew install
|
||||
gradle install
|
||||
|
||||
The library will be placed in your home directory under .m2/repository
|
||||
|
||||
@ -80,7 +80,7 @@ classpath, or install if in your default system classpath of choice.
|
||||
|
||||
Build Thrift behind a proxy:
|
||||
|
||||
./gradlew -Dhttp.proxyHost=myproxyhost -Dhttp.proxyPort=8080 -Dhttp.proxyUser=thriftuser -Dhttp.proxyPassword=topsecret
|
||||
gradle -Dhttp.proxyHost=myproxyhost -Dhttp.proxyPort=8080 -Dhttp.proxyUser=thriftuser -Dhttp.proxyPassword=topsecret
|
||||
|
||||
or via
|
||||
|
||||
@ -107,7 +107,7 @@ under the location build/reports/clover/clover.pdf.
|
||||
|
||||
The following command will build, unit test, and generate Clover reports:
|
||||
|
||||
./gradlew -PcloverEnabled=true
|
||||
gradle -PcloverEnabled=true
|
||||
|
||||
|
||||
Publishing Maven Artifacts to Maven Central
|
||||
@ -146,7 +146,7 @@ It is also possible to manually publish using the Gradle build directly.
|
||||
With the key information and credentials in place the following will generate
|
||||
if needed the build artifacts and proceed to publish the results.
|
||||
|
||||
./gradlew -Prelease=true uploadArchives
|
||||
gradle -Prelease=true uploadArchives
|
||||
|
||||
It is also possible to override the target repository for the Maven Publication
|
||||
by using a Gradle property, for example you can publish signed JAR files to your
|
||||
@ -157,7 +157,7 @@ company internal server if you add this to the command line or in the
|
||||
|
||||
Or the same on the command line:
|
||||
|
||||
./gradlew -Pmaven-repository-url=https://my.company.com/service/local/staging/deploy/maven2 -Prelease=true -Pthrift.version=0.11.0 uploadArchives
|
||||
gradle -Pmaven-repository-url=https://my.company.com/service/local/staging/deploy/maven2 -Prelease=true -Pthrift.version=0.11.0 uploadArchives
|
||||
|
||||
|
||||
Dependencies
|
||||
@ -175,7 +175,7 @@ changed to remove the boolean return type and instead rely on Exceptions.
|
||||
|
||||
* Per THRIFT-4805, TSaslTransportException has been removed. The same condition
|
||||
is now covered by TTansportException, where `TTransportException.getType() == END_OF_FILE`.
|
||||
|
||||
|
||||
## 0.12.0
|
||||
|
||||
The access modifier of the AutoExpandingBuffer class has been changed from
|
||||
|
BIN
lib/java/gradle/wrapper/gradle-wrapper.jar
vendored
BIN
lib/java/gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
188
lib/java/gradlew
vendored
188
lib/java/gradlew
vendored
@ -1,188 +0,0 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# Copyright 2015 the original author or authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## 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='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# 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 or MSYS, switch paths to Windows format before running java
|
||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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" "$@"
|
100
lib/java/gradlew.bat
vendored
100
lib/java/gradlew.bat
vendored
@ -1,100 +0,0 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is 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.
|
||||
|
||||
goto fail
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windows variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
set CMD_LINE_ARGS=
|
||||
set _SKIP=2
|
||||
|
||||
:win9xME_args_slurp
|
||||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
Loading…
Reference in New Issue
Block a user