stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8169816: Move src.zip and jrt-fs.jar under the lib directory

Browse Source 
Reviewed-by: alanb, erikj
This commit is contained in:
Mandy Chung 2016-11-28 11:36:15 -08:00
parent ffc4d62ccc
commit d8c7cf7073
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
make/Images.gmk
View File

@ -354,11 +354,11 @@ JDK_TARGETS += $(JDK_DOC_TARGETS)
################################################################################
# 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
@ -400,16 +400,6 @@ $(eval $(call SetupCopyFiles, COPY_SAMPLES, \
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

2
make/JrtfsJar.gmk
View File

@ -65,7 +65,7 @@ $(eval $(call SetupCopyFiles, COPY_JIMAGE_SERVICE_PROVIDER, \
$(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, \
))

13
make/Main.gmk
View File

@ -603,12 +603,12 @@ else
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 @@ else
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