[lucene-solr] branch master updated: LUCENE-9372: gradlew does not run on cygwin (Peter Barna via Dawid Weiss)

[dw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dweiss pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new eebe40a  LUCENE-9372: gradlew does not run on cygwin (Peter Barna via Dawid Weiss)
eebe40a is described below

commit eebe40a2f54d5e1e0df66dc34467df887c357cfc
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Sat May 16 10:58:23 2020 +0200

    LUCENE-9372: gradlew does not run on cygwin (Peter Barna via Dawid Weiss)
---
 gradlew            | 5 +++--
 lucene/CHANGES.txt | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gradlew b/gradlew
index 0c9d74a..32be99f 100755
--- a/gradlew
+++ b/gradlew
@@ -103,6 +103,9 @@ location of your Java installation."
 fi
 
 # LUCENE-9266: verify and download the gradle wrapper jar if we don't have one.
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+fi
 GRADLE_WRAPPER_JAR=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if ! $JAVACMD --source 11 $APP_HOME/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java $GRADLE_WRAPPER_JAR ; then
     exit $?
@@ -139,8 +142,6 @@ 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
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 13c2c4a..ab88bcb 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -118,6 +118,9 @@ Bug fixes
 * LUCENE-9290: Don't assume that different XYPoint have different hash code
   (Ignacio Vera via Mike Drob)
 
+* LUCENE-9372: Fix paths for cygwin/msys before gradle wrapper jar lookup.
+  (Peter Barna)
+
 Other
 
 * LUCENE-8768: Fix Javadocs build in Java 11. (Namgyu Kim)