changeset 26333:a384ec316f00

Merge
author duke
date Wed, 05 Jul 2017 19:59:21 +0200
parents 9628dff9b9a1 8d6d3257c748
children 4554006fae4a
files
diffstat 4 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags-top-repo	Thu Sep 04 14:45:08 2014 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 19:59:21 2017 +0200
@@ -271,3 +271,4 @@
 d3ec8d048e6c3c46b6e0ee011cc551ad386dfba5 jdk9-b26
 ba5645f2735b41ed085d07ba20fa7b322afff318 jdk9-b27
 ea2f7981236f3812436958748ab3d26e80a35130 jdk9-b28
+9e6581aeda388a23fbee021fc33e6aa152a60657 jdk9-b29
--- a/make/CompileJavaModules.gmk	Thu Sep 04 14:45:08 2014 -0700
+++ b/make/CompileJavaModules.gmk	Wed Jul 05 19:59:21 2017 +0200
@@ -89,7 +89,7 @@
 
 ################################################################################
 
-java.desktop_COPY := .gif .png .wav .txt .xml .css flavormap.properties
+java.desktop_COPY := .gif .png .wav .txt .xml .css flavormap.properties .pf
 java.desktop_CLEAN := iio-plugin.properties
 
 java.desktop_EXCLUDES += \
--- a/make/Main.gmk	Thu Sep 04 14:45:08 2014 -0700
+++ b/make/Main.gmk	Wed Jul 05 19:59:21 2017 +0200
@@ -236,11 +236,11 @@
 
 # Creates the jar files (rt.jar resources.jar etc)
 main-jars:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJars.gmk)
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) PROFILE="" -f CreateJars.gmk)
 
 # Creates the images (j2sdk-image j2re-image etc)
 images:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk)
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) PROFILE="" -f Images.gmk)
         ifeq ($(OPENJDK_TARGET_OS), macosx)
 	  +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk)
         endif
--- a/make/common/MakeBase.gmk	Thu Sep 04 14:45:08 2014 -0700
+++ b/make/common/MakeBase.gmk	Wed Jul 05 19:59:21 2017 +0200
@@ -349,7 +349,7 @@
     # (and causing a crash on Cygwin).
     # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
     # Only use time if it's GNU time which supports format and output file.
-    WRAPPER_SHELL:=/bin/bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash
+    WRAPPER_SHELL:=$$(BASH) $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash
     SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
   endif
   # Never remove warning messages; this is just for completeness