Replaced gradlew shell script with the custom one licensed by Apache. Removed gradlew.bat from LICENSE, as it turns out we don't have to mention that (according to rat).
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/commit/1aab6930 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/tree/1aab6930 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/diff/1aab6930 Branch: refs/heads/master Commit: 1aab6930519183eb13299b300d24507d4a839cce Parents: f4a0885 Author: ddekany <[email protected]> Authored: Mon May 8 15:27:20 2017 +0200 Committer: ddekany <[email protected]> Committed: Mon May 8 15:27:20 2017 +0200 ---------------------------------------------------------------------- LICENSE | 10 -- gradle/wrapper/gradle-wrapper.properties | 20 ++- gradlew | 193 +++++++++++++++++--------- 3 files changed, 149 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/1aab6930/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 6eded96..94bd52e 100644 --- a/LICENSE +++ b/LICENSE @@ -211,13 +211,3 @@ src/main/resources/banner.txt ========================================================================= - - The Apache FreeMarker Online Tester (incubating) source code contains the - following files, which are generated files, and hence no license applies: - - gradle/wrapper/gradle-wrapper.jar - gradle/wrapper/gradle-wrapper.properties - gradlew - gradlew.bat - - ========================================================================= \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/1aab6930/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d959dfc..f62cefd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,22 @@ -#Wed May 03 11:59:02 CEST 2017 +# 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. + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-3.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/1aab6930/gradlew ---------------------------------------------------------------------- diff --git a/gradlew b/gradlew index 91a7e26..e53f798 100755 --- a/gradlew +++ b/gradlew @@ -1,19 +1,55 @@ #!/usr/bin/env bash -############################################################################## +# 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. + +## +## Tries to recreate Gradle's gradlew command in pure bash. +## This way you don't have to worry about binaries in your build. ## -## Gradle start up script for UN*X +## Depdencies +## unzip ## -############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +set -e +set -o pipefail APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" + MAX_FD="maximum" + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="-Dorg.gradle.appname=$APP_BASE_NAME" + +bin=`dirname "$0"` +bin=`cd "$bin">/dev/null; pwd` + +if [ -e "$bin/gradle/wrapper/gradle-wrapper.properties" ]; then + . "$bin/gradle/wrapper/gradle-wrapper.properties" +else + # the location that the wrapper is at doesn't have a properties + # check PWD, gradlew may be shared + if [ -e "$PWD/gradle/wrapper/gradle-wrapper.properties" ]; then + . "$PWD/gradle/wrapper/gradle-wrapper.properties" + else + echo "Unable to locate gradle-wrapper.properties. Not at $PWD/gradle/wrapper/gradle-wrapper.properties or $bin/gradle/wrapper/gradle-wrapper.properties" 1>&2 + exit 1 + fi +fi warn ( ) { echo "$*" @@ -28,7 +64,6 @@ die ( ) { # OS specific support (must be 'true' or 'false'). cygwin=false -msys=false darwin=false case "`uname`" in CYGWIN* ) @@ -37,16 +72,8 @@ case "`uname`" in 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" @@ -90,7 +117,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$darwin" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -110,55 +137,97 @@ 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 +# does not match gradle's hash +# waiting for http://stackoverflow.com/questions/26642077/java-biginteger-in-bash-rewrite-gradlew +hash() { + local input="$1" + if $darwin; then + md5 -q -s "$1" + else + echo -n "$1" | md5sum | cut -d" " -f1 + fi +} + +dist_path() { + local dir=$(basename $distributionUrl | sed 's;.zip;;g') + local id=$(hash "$distributionUrl") + + echo "$HOME/.gradle/${distributionPath:-wrapper/dists}/$dir/$id" +} + +zip_path() { + local dir=$(basename $distributionUrl | sed 's;.zip;;g') + local id=$(hash "$distributionUrl") + + echo "$HOME/.gradle/${zipStorePath:-wrapper/dists}/$dir/$id" +} + +download() { + local base_path=$(dist_path) + local file_name=$(basename $distributionUrl) + local dir_name=$(echo "$file_name" | sed 's;-bin.zip;;g' | sed 's;-src.zip;;g' |sed 's;-all.zip;;g') + + if [ ! -d "$base_path" ]; then + mkdir -p "$base_path" + else + # if data already exists, it means we failed to do this before + # so cleanup last run and try again + rm -rf $base_path/* + fi + + # download dist. curl on mac doesn't like the cert provided... + local zip_path=$(zip_path) + curl --insecure -L -o "$zip_path/$file_name" "$distributionUrl" + + pushd "$base_path" + touch "$file_name.lck" + unzip "$zip_path/$file_name" 1> /dev/null + touch "$file_name.ok" + popd +} + +is_cached() { + local file_name=$(basename $distributionUrl) + + [ -e "$(dist_path)/$file_name.ok" ] +} + +lib_path() { + local base_path=$(dist_path) + local file_name=$(basename $distributionUrl | sed 's;-bin.zip;;g' | sed 's;-src.zip;;g' |sed 's;-all.zip;;g') + + echo "$base_path/$file_name/lib" +} + +classpath() { + local dir=$(lib_path) + local cp=$(ls -1 $dir/*.jar | tr '\n' ':') + echo "$dir:$cp" +} # 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 "$@" +main() { + if ! is_cached; then + download + fi + + eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS + JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + + dynclasspath="$(classpath)" + if [ "$cygwin" = "true" ]; then + JAVACMD=$(cygpath --unix "$JAVACMD") + if [ -n "$dynclasspath" ]; then + # We assume that JAVACMD points to the Windows native java + dynclasspath=$(cygpath --path --windows "$dynclasspath") + fi + fi + + "$JAVACMD" "${JVM_OPTS[@]}" -cp "$dynclasspath" org.gradle.launcher.GradleMain "$@" +} + +main "$@"
