aboutsummaryrefslogtreecommitdiff
path: root/gradlew
diff options
context:
space:
mode:
authorEric Anderson <ejona@google.com>2015-10-23 10:45:14 -0700
committerEric Anderson <ejona@google.com>2015-10-23 13:46:37 -0700
commit209d3a3f38b064f1f48bc5060f95b752b19cf648 (patch)
treed8dc6891d7808f1a0e1f1aaaf45233d29a30409b /gradlew
parent2467d618b737b13a06d4de72123856d6a86bba5f (diff)
downloadgrpc-grpc-java-209d3a3f38b064f1f48bc5060f95b752b19cf648.tar.gz
Upgrade gradle to 2.8
This fixes a problem where gradle would try to use VC's amd64_x86 cl (without the correct environment) and fail to compile with return code -1073741515 (STATU_DLL_NOT_FOUND) because of missing mspdb120.dll.
Diffstat (limited to 'gradlew')
-rwxr-xr-xgradlew10
1 files changed, 3 insertions, 7 deletions
diff --git a/gradlew b/gradlew
index 91a7e269e..9d82f7891 100755
--- a/gradlew
+++ b/gradlew
@@ -42,11 +42,6 @@ case "`uname`" in
;;
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"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
fi
done
SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -114,6 +109,7 @@ fi
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`