OpenJDK / jdk / hs
changeset 42285:864475e2cf63
8169816: Move src.zip and jrt-fs.jar under the lib directory
Reviewed-by: alanb, erikj
| author | mchung |
|---|---|
| date | Mon, 28 Nov 2016 11:36:15 -0800 |
| parents | 38f8784217d0 |
| children | 039f2a4129d1 |
| files | make/Images.gmk make/JrtfsJar.gmk make/Main.gmk |
| diffstat | 3 files changed, 9 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Images.gmk Mon Nov 28 15:19:08 2016 +0100 +++ b/make/Images.gmk Mon Nov 28 11:36:15 2016 -0800 @@ -354,11 +354,11 @@ ################################################################################ # src.zip -$(JDK_IMAGE_DIR)/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip +$(JDK_IMAGE_DIR)/lib/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip $(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)) $(install-file) -JDK_TARGETS += $(JDK_IMAGE_DIR)/src.zip +JDK_TARGETS += $(JDK_IMAGE_DIR)/lib/src.zip ################################################################################ # /demo dir @@ -401,16 +401,6 @@ JDK_TARGETS += $(COPY_SAMPLES) ################################################################################ -# jrt-fs.jar - -$(eval $(call SetupCopyFiles,COPY_JRTFS_JAR, \ - SRC := $(SUPPORT_OUTPUTDIR), \ - DEST := $(JDK_IMAGE_DIR), \ - FILES := $(SUPPORT_OUTPUTDIR)/jrt-fs.jar)) - -JDK_TARGETS += $(COPY_JRTFS_JAR) - -################################################################################ # Code coverage data files ifeq ($(GCOV_ENABLED), true)
--- a/make/JrtfsJar.gmk Mon Nov 28 15:19:08 2016 +0100 +++ b/make/JrtfsJar.gmk Mon Nov 28 11:36:15 2016 -0800 @@ -65,7 +65,7 @@ $(eval $(call SetupJarArchive,BUILD_JRTFS_JAR, \ DEPENDENCIES := $(BUILD_JRTFS) $(COPY_JIMAGE_SERVICE_PROVIDER), \ SRCS := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \ - JAR := $(SUPPORT_OUTPUTDIR)/jrt-fs.jar, \ + JAR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jrt-fs.jar, \ MANIFEST := $(SUPPORT_OUTPUTDIR)/java-main-manifest.mf, \ ))
--- a/make/Main.gmk Mon Nov 28 15:19:08 2016 +0100 +++ b/make/Main.gmk Mon Nov 28 11:36:15 2016 -0800 @@ -603,12 +603,12 @@ jdk.jdeps-gendata: java rmic - # Declare dependencies between jmod targets. Only java.base jmod needs access - # to the other jmods to be built. + # Declare dependencies between jmod targets. + # java.base jmod needs jrt-fs.jar and access to the other jmods to be built. # When creating a BUILDJDK, we don't need to add hashes to java.base, thus # we don't need to depend on all other jmods ifneq ($(CREATING_BUILDJDK), true) - java.base-jmod: $(filter-out java.base-jmod \ + java.base-jmod: jrtfs-jar $(filter-out java.base-jmod \ $(addsuffix -jmod, $(call FindAllUpgradeableModules)), $(JMOD_TARGETS)) endif @@ -679,11 +679,10 @@ java.base-jmod jdk-image jre-image: generate-link-opt-data endif - jdk-image: jmods zip-source create-source-revision-tracker demos samples \ - jrtfs-jar - jre-image: jmods create-source-revision-tracker jrtfs-jar + jdk-image: jmods zip-source create-source-revision-tracker demos samples + jre-image: jmods create-source-revision-tracker - profiles: jmods zip-source create-source-revision-tracker jrtfs-jar + profiles: jmods zip-source create-source-revision-tracker mac-bundles-jdk: jdk-image jre-image