Hi Erik ,
On 14/05/14 13:32, Erik Joelsson wrote:
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
Altho' not a reviewer in the formal sense, pls be advised this seems
eminently sensible and indeed, looks fine.
--
Dave Pointon FIAP MBCS
Now I saw, tho' too late, the folly of beginning a work before we count the
cost and before we we judge rightly of our strength to go thro' with it -
Robinson Crusoe
