RFR: JDK-8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths

Erik Joelsson erik.joelsson at oracle.com
Wed May 14 12:32:44 UTC 2014


Hello,

Please review this minor fix for jdk9. The input variables 
JPRT_ARCHIVE_BUNDLE and JPRT_ARCHIVE_INSTALL_BUNDLE are typically 
provided by JPRT using the Windows mixed path (c:/jprt/...). We would 
like to stop using a special version of gnu make in JPRT to handle paths 
with colon in them. The solution is to convert these paths before trying 
to use them.

Bug: https://bugs.openjdk.java.net/browse/JDK-8043127
Patch inline:

diff -r b84fc0b1efc2 make/Jprt.gmk
--- a/make/Jprt.gmk
+++ b/make/Jprt.gmk
@@ -23,8 +23,22 @@
  # questions.
  #

-# This file is contains targets utilities needed by JPRT.
+# This file contains targets and utilities needed by JPRT.

+# Cygpath is only defined when running on Cygwin
+ifneq ($(CYGPATH), )
+  # If we get JPRT_ARCHIVE_*BUNDLE externally, make sure they have 
/cygdrive
+  # style paths
+  ifdef JPRT_ARCHIVE_BUNDLE
+    override JPRT_ARCHIVE_BUNDLE := $(shell $(CYGPATH) -u 
$(JPRT_ARCHIVE_BUNDLE))
+  endif
+  ifdef JPRT_ARCHIVE_INSTALL_BUNDLE
+    override JPRT_ARCHIVE_INSTALL_BUNDLE := $(shell $(CYGPATH) -u 
$(JPRT_ARCHIVE_INSTALL_BUNDLE))
+  endif
+endif
+
+# When running in JPRT these will be provided. Need defaults so that 
this makefile
+# is valid anyway.
  ifndef JPRT_ARCHIVE_BUNDLE
    JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
  endif




More information about the build-dev mailing list