changeset 13118:6ad5d252b55c

8143141: Bring in minor build changes from the jigsaw/jake forest Reviewed-by: ihse, mchung
author erikj
date Tue, 24 Nov 2015 15:46:14 +0100
parents 1326072e44bf
children 715972927a17
files make/gendata/GendataBreakIterator.gmk make/gensrc/GensrcCommon.gmk make/gensrc/GensrcMisc.gmk make/gensrc/GensrcProperties.gmk make/launcher/Launcher-jdk.jcmd.gmk make/launcher/Launcher-jdk.jconsole.gmk make/launcher/Launcher-jdk.jdi.gmk make/launcher/LauncherCommon.gmk make/lib/Lib-jdk.crypto.ucrypto.gmk
diffstat 9 files changed, 8 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/make/gendata/GendataBreakIterator.gmk	Tue Nov 24 10:22:26 2015 +0100
+++ b/make/gendata/GendataBreakIterator.gmk	Tue Nov 24 15:46:14 2015 +0100
@@ -58,13 +58,13 @@
 
 # output
 BASE_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/java.base/sun/text/resources
-SL_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/jdk.localedata/sun/text/resources
+LD_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/jdk.localedata/sun/text/resources
 BIFILES := $(BASE_DATA_PKG_DIR)/CharacterBreakIteratorData \
     $(BASE_DATA_PKG_DIR)/WordBreakIteratorData \
     $(BASE_DATA_PKG_DIR)/LineBreakIteratorData \
     $(BASE_DATA_PKG_DIR)/SentenceBreakIteratorData
-BIFILES_TH := $(SA_DATA_PKG_DIR)/th/WordBreakIteratorData_th \
-    $(SA_DATA_PKG_DIR)/th/LineBreakIteratorData_th
+BIFILES_TH := $(LD_DATA_PKG_DIR)/th/WordBreakIteratorData_th \
+    $(LD_DATA_PKG_DIR)/th/LineBreakIteratorData_th
 
 $(BIFILES): $(BASE_DATA_PKG_DIR)/_the.bifiles
 $(BASE_DATA_PKG_DIR)/_the.bifiles: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
@@ -77,9 +77,9 @@
 	    -spec $(UNICODEDATA)
 	$(TOUCH) $@
 
-$(BIFILES_TH): $(SL_DATA_PKG_DIR)/_the.bifiles_th
-$(SL_DATA_PKG_DIR)/_the.bifiles_th: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
-$(SL_DATA_PKG_DIR)/_the.bifiles_th: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR)
+$(BIFILES_TH): $(LD_DATA_PKG_DIR)/_the.bifiles_th
+$(LD_DATA_PKG_DIR)/_the.bifiles_th: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
+$(LD_DATA_PKG_DIR)/_the.bifiles_th: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR)
 	$(ECHO) $(LOG_INFO) "Generating BreakIteratorData_th"
 	$(MKDIR) -p $(@D)/th
 	$(RM) $(BIFILES_TH)
--- a/make/gensrc/GensrcCommon.gmk	Tue Nov 24 10:22:26 2015 +0100
+++ b/make/gensrc/GensrcCommon.gmk	Tue Nov 24 15:46:14 2015 +0100
@@ -33,4 +33,3 @@
 include SetupJavaCompilers.gmk
 # We need the tools.
 include Tools.gmk
-
--- a/make/gensrc/GensrcMisc.gmk	Tue Nov 24 10:22:26 2015 +0100
+++ b/make/gensrc/GensrcMisc.gmk	Tue Nov 24 15:46:14 2015 +0100
@@ -100,7 +100,6 @@
       SRC := $(GENSRC_UC_SRC), \
       INCLUDE_FILES := $(GENSRC_UC_SRC_FILE), \
       TOOLCHAIN := TOOLCHAIN_BUILD, \
-      CFLAGS := $(filter -D%, $(CFLAGS_JDKEXE)), \
       OBJECT_DIR := $(GENSRC_UC_BIN), \
       OUTPUT_DIR := $(GENSRC_UC_BIN), \
       PROGRAM := genUnixConstants))
--- a/make/gensrc/GensrcProperties.gmk	Tue Nov 24 10:22:26 2015 +0100
+++ b/make/gensrc/GensrcProperties.gmk	Tue Nov 24 15:46:14 2015 +0100
@@ -75,7 +75,7 @@
 
   # Convert .../src/<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
   # to .../support/gensrc/<module>/com/sun/tools/javac/resources/javac_zh_CN.java
-  # Strip away prefix and suffix, leaving for example only:
+  # Strip away prefix and suffix, leaving for example only: 
   # "<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN"
   $1_JAVAS := $$(patsubst $$($1_MODULE_PATH_ROOT)/%, \
       $(SUPPORT_OUTPUTDIR)/gensrc/%, \
--- a/make/launcher/Launcher-jdk.jcmd.gmk	Tue Nov 24 10:22:26 2015 +0100
+++ b/make/launcher/Launcher-jdk.jcmd.gmk	Tue Nov 24 15:46:14 2015 +0100
@@ -30,7 +30,6 @@
     JAVA_ARGS := \
         -Dsun.jvm.hotspot.debugger.useProcDebugger \
         -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
-    APP_CLASSPATH := /lib/tools.jar /lib/sa-jdi.jar /classes, \
     MACOSX_SIGNED := true, \
 ))
 
@@ -39,7 +38,6 @@
     JAVA_ARGS := \
         -Dsun.jvm.hotspot.debugger.useProcDebugger \
         -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
-    APP_CLASSPATH := /lib/tools.jar /lib/sa-jdi.jar /classes, \
     MACOSX_SIGNED := true, \
 ))
 
@@ -52,7 +50,6 @@
     JAVA_ARGS := \
         -Dsun.jvm.hotspot.debugger.useProcDebugger \
         -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
-    APP_CLASSPATH := /lib/tools.jar /lib/sa-jdi.jar /classes, \
     MACOSX_SIGNED := true, \
 ))
 
--- a/make/launcher/Launcher-jdk.jconsole.gmk	Tue Nov 24 10:22:26 2015 +0100
+++ b/make/launcher/Launcher-jdk.jconsole.gmk	Tue Nov 24 15:46:14 2015 +0100
@@ -28,7 +28,6 @@
 $(eval $(call SetupBuildLauncher, jconsole, \
     MAIN_CLASS := sun.tools.jconsole.JConsole, \
     JAVA_ARGS := -Djconsole.showOutputViewer, \
-    APP_CLASSPATH := /lib/jconsole.jar /lib/tools.jar /classes, \
     CFLAGS_windows := -DJAVAW, \
     LIBS_windows := user32.lib, \
 ))
--- a/make/launcher/Launcher-jdk.jdi.gmk	Tue Nov 24 10:22:26 2015 +0100
+++ b/make/launcher/Launcher-jdk.jdi.gmk	Tue Nov 24 15:46:14 2015 +0100
@@ -27,5 +27,4 @@
 
 $(eval $(call SetupBuildLauncher, jdb, \
     MAIN_CLASS := com.sun.tools.example.debug.tty.TTY, \
-    APP_CLASSPATH := /lib/tools.jar /lib/sa-jdi.jar /classes, \
 ))
--- a/make/launcher/LauncherCommon.gmk	Tue Nov 24 10:22:26 2015 +0100
+++ b/make/launcher/LauncherCommon.gmk	Tue Nov 24 15:46:14 2015 +0100
@@ -64,7 +64,6 @@
 # Remaining parameters are named arguments. These include:
 # MAIN_CLASS   The Java main class to launch
 # JAVA_ARGS   Processed into a -DJAVA_ARGS C flag
-# APP_CLASSPATH   Processed into a -DAPP_CLASSPATH C flag
 # CFLAGS   Additional CFLAGS
 # CFLAGS_windows   Additional CFLAGS_windows
 # LIBS_unix   Additional LIBS_unix
@@ -103,15 +102,6 @@
     $1_CFLAGS += -DJAVA_ARGS=$$($1_JAVA_ARGS_STR)
   endif
 
-  ifneq ($$($1_APP_CLASSPATH), )
-    $1_APP_CLASSPATH_STR := '{ $$(strip $$(foreach a, \
-        $$($1_APP_CLASSPATH), "$$a"$(COMMA) )) }'
-    # Remove the trailing comma
-    $1_APP_CLASSPATH_STR := $$(strip $$(subst $$(COMMA) }', }', \
-        $$($1_APP_CLASSPATH_STR)))
-    $1_CFLAGS += -DAPP_CLASSPATH=$$($1_APP_CLASSPATH_STR)
-  endif
-
   $1_LIBS :=
   ifeq ($(OPENJDK_TARGET_OS), macosx)
     ifeq ($$($1_MACOSX_SIGNED), true)
--- a/make/lib/Lib-jdk.crypto.ucrypto.gmk	Tue Nov 24 10:22:26 2015 +0100
+++ b/make/lib/Lib-jdk.crypto.ucrypto.gmk	Tue Nov 24 15:46:14 2015 +0100
@@ -43,7 +43,7 @@
       LDFLAGS := $(LDFLAGS_JDKLIB), \
       LIBS := $(LIBDL), \
       LIBS_solaris := -lc, \
-      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2ucrypto, \
+      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libj2ucrypto, \
       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
 
   $(BUILD_LIBJ2UCRYPTO): $(BUILD_LIBJAVA)