7903206: Support MSYS2 for building jtreg on Windows

Author: sormuras

make/Defs.gmk

@@ -39,7 +39,7 @@ LD_LIBRARY_PATH=
 
 #----------------------------------------------------------------------
 #
-# Support for Cygwin
+# Support for Cygwin and MSYS2 (which may identify as MSYS, MINGW32 or MINGW64 (the default))
 
 SYSTEM_UNAME := $(shell uname)
 
@@ -53,9 +53,15 @@ endif
 
 ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
 USING_CYGWIN = true
+USING_CYGWIN_OR_USING_MSYS = true
 endif
 
-ifdef USING_CYGWIN
+ifneq (,$(findstring MSYS,$(SYSTEM_UNAME))$(findstring MINGW,$(SYSTEM_UNAME)))
+USING_MSYS = true
+USING_CYGWIN_OR_USING_MSYS = true
+endif
+
+ifdef USING_CYGWIN_OR_USING_MSYS
 define FullPath
 $(shell cygpath -a -m $1 2> $(DEV_NULL))
 endef

make/build-support/build-common.sh

@@ -87,13 +87,13 @@ setup_shasum() {
 native_path() {
     check_arguments "${FUNCNAME}" 1 $#
 
-    if [ $CYGWIN -eq 1 ]; then echo $(cygpath -w $1); else echo "$1"; fi
+    if [ $CYGWIN_OR_MSYS -eq 1 ]; then echo $(cygpath -w $1); else echo "$1"; fi
 }
 
 mixed_path() {
     check_arguments "${FUNCNAME}" 1 $#
 
-    if [ $CYGWIN -eq 1 ]; then echo $(cygpath -m $1); else echo "$1"; fi
+    if [ $CYGWIN_OR_MSYS -eq 1 ]; then echo $(cygpath -m $1); else echo "$1"; fi
 }
 
 ##
@@ -331,4 +331,8 @@ export ANT_ARCHIVE_URL_BASE="${ANT_ARCHIVE_URL_BASE:-https://archive.apache.org/
 
 setup_shasum
 
-case $(uname) in CYGWIN*) CYGWIN=1 ;; *) CYGWIN=0 ;; esac
+##
+# Support for Cygwin and MSYS2 (which may identify as MSYS, MINGW32 or MINGW64 (the default))
+#
+case $(uname) in CYGWIN*|MSYS*|MINGW*) CYGWIN_OR_MSYS=1 ;; *) CYGWIN_OR_MSYS=0 ;; esac
+info "CYGWIN_OR_MSYS=$CYGWIN_OR_MSYS"

make/build.sh

@@ -926,7 +926,7 @@ make ANT="${ANT}"                                             \
      JCOV_JAR="${JCOV_JAR}"                                   \
      JCOV_LICENSE="${JCOV_LICENSE}"                           \
      JCOV_NETWORK_SAVER_JAR="${JCOV_NETWORK_SAVER_JAR}"       \
-     JDKHOME="${JAVA_HOME}"                                   \
+     JDKHOME="$(mixed_path ${JAVA_HOME})"                     \
      JTHARNESS_COPYRIGHT="${JTHARNESS_COPYRIGHT}"             \
      JTHARNESS_LICENSE="${JTHARNESS_LICENSE}"                 \
      JUNIT_JAR="$(mixed_path "${JUNIT_JAR}")"                 \