Mercurial > hg > jdk9-shenandoah > jdk
changeset 12709:e294ae9fe11c
8065912: Better handling of classpath in build-infra
Reviewed-by: erikj
author | ihse |
---|---|
date | Wed, 09 Sep 2015 09:36:46 +0200 |
parents | cef7f168def1 |
children | b8ceaba10dfe |
files | make/Tools.gmk make/gensrc/GensrcSwing.gmk make/rmic/RmicCommon.gmk |
diffstat | 3 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Tools.gmk Tue Sep 08 22:14:25 2015 +0000 +++ b/make/Tools.gmk Wed Sep 09 09:36:46 2015 +0200 @@ -38,7 +38,9 @@ $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \ SETUP := GENERATE_OLDBYTECODE, \ - ADD_JAVAC_FLAGS := "-Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes$(PATH_SEP)$(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes", \ + ADD_JAVAC_FLAGS := -Xbootclasspath/p:$(call PathList, \ + $(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes \ + $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes), \ SRC := $(JDK_TOPDIR)/make/src/classes $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes, \ BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \ COPY := boot.modules ext.modules)) @@ -126,11 +128,11 @@ build.tools.cldrconverter.CLDRConverter TOOL_GENMODULESXML = $(JAVA_SMALL) -Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR) \ - -cp "$(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes$(PATH_SEP)$(JDK_OUTPUTDIR)" \ + -cp $(call PathList, $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes $(JDK_OUTPUTDIR)) \ build.tools.module.GenJdepsModulesXml TOOL_IMAGEBUILDER = $(JAVA_SMALL) -Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes \ - -cp "$(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes$(PATH_SEP)$(JDK_OUTPUTDIR)" \ + -cp $(call PathList, $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes $(JDK_OUTPUTDIR)) \ build.tools.module.ImageBuilder ##########################################################################################
--- a/make/gensrc/GensrcSwing.gmk Tue Sep 08 22:14:25 2015 +0000 +++ b/make/gensrc/GensrcSwing.gmk Wed Sep 09 09:36:46 2015 +0200 @@ -77,9 +77,9 @@ $(ECHO) Generating beaninfo $(MKDIR) -p $(BEANINFO_OUTPUTDIR)/javax/swing $(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) \ - -sourcepath "$(subst $(SPACE),$(PATH_SEP),\ + -sourcepath $(call PathList,\ $(wildcard $(JDK_TOPDIR)/src/*/*/classes) \ - $(SUPPORT_OUTPUTDIR)/gensrc/java.base)" \ + $(SUPPORT_OUTPUTDIR)/gensrc/java.base) \ -doclet build.tools.swingbeaninfo.GenDocletBeanInfo \ -x $(SWINGBEAN_DEBUG_FLAG) -d $(BEANINFO_OUTPUTDIR)/javax/swing \ -t $(DOCLET_DATA_DIR)/SwingBeanInfo.template \
--- a/make/rmic/RmicCommon.gmk Tue Sep 08 22:14:25 2015 +0000 +++ b/make/rmic/RmicCommon.gmk Wed Sep 09 09:36:46 2015 +0200 @@ -31,8 +31,9 @@ ########################################################################################## -BTRMIC_CP := $(INTERIM_CORBA_JAR)$(PATH_SEP)$(BUILDTOOLS_OUTPUTDIR)/interim_rmic_classes$(PATH_SEP)$(INTERIM_LANGTOOLS_JAR) -BTRMIC_ARGS := "-Xbootclasspath/p:$(BTRMIC_CP)" -cp "$(BTRMIC_CP)" +BTRMIC_CP := $(call PathList, $(INTERIM_CORBA_JAR) \ + $(BUILDTOOLS_OUTPUTDIR)/interim_rmic_classes $(INTERIM_LANGTOOLS_JAR)) +BTRMIC_ARGS := -Xbootclasspath/p:$(BTRMIC_CP) -cp $(BTRMIC_CP) RMIC := $(JAVA) $(BTRMIC_ARGS) sun.rmi.rmic.Main CLASSES_DIR := $(JDK_OUTPUTDIR)/modules