changeset 8044:e766da5575fa

8009426: "profiles" target fails due to nashorn if "images" is not built first Reviewed-by: alanb
author dholmes
date Tue, 19 Mar 2013 06:01:14 -0400
parents a0275a47fa78
children 4103eb6b2137
files makefiles/CreateJars.gmk makefiles/Profiles.gmk makefiles/profile-includes.txt
diffstat 3 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/makefiles/CreateJars.gmk	Tue Mar 19 09:53:36 2013 +0100
+++ b/makefiles/CreateJars.gmk	Tue Mar 19 06:01:14 2013 -0400
@@ -76,8 +76,6 @@
 $(IMAGES_OUTPUTDIR)/lib/tzdb.jar: $(JDK_OUTPUTDIR)/lib/tzdb.jar
 	$(install-file)
 
-JARS += $(IMAGES_OUTPUTDIR)/lib/tzdb.jar 
-
 ##########################################################################################
 
 LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in is it \
@@ -1120,8 +1118,6 @@
 $(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar: $(NASHORN_DIST)/nashorn.jar
 	$(install-file)
 
-JARS += $(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar
-
 ##########################################################################################
 
 -include $(CUSTOM_MAKE_DIR)/CreateJars.gmk
--- a/makefiles/Profiles.gmk	Tue Mar 19 09:53:36 2013 +0100
+++ b/makefiles/Profiles.gmk	Tue Mar 19 06:01:14 2013 -0400
@@ -84,7 +84,7 @@
 # The full set of "jar" files needed for a complete JDK (ct.sym and src.zip
 # are also included.)
 # Note we need to add back the regular form of all the custom profile jars e.g.
-# rt.jar and resources.jar
+# rt.jar and resources.jar that we filtered out above
 
 ALL_JARS := $(FULL_JRE_JARS) \
         $(IMAGES_OUTPUTDIR)/lib/rt.jar \
@@ -94,7 +94,6 @@
         $(IMAGES_OUTPUTDIR)/lib/tools.jar \
         $(IMAGES_OUTPUTDIR)/lib/ct.sym \
         $(IMAGES_OUTPUTDIR)/src.zip \
-        $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar \
         $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar
 
 ifeq ($(OPENJDK_TARGET_OS),solaris)
--- a/makefiles/profile-includes.txt	Tue Mar 19 09:53:36 2013 +0100
+++ b/makefiles/profile-includes.txt	Tue Mar 19 06:01:14 2013 -0400
@@ -178,6 +178,7 @@
     cmm/sRGB.pf \
     ext/cldrdata.jar \
     ext/dnsns.jar \
+    ext/nashorn.jar \
     ext/sunec.jar \
     ext/sunpkcs11.jar \
     ext/zipfs.jar \
@@ -251,6 +252,7 @@
     charsets.jar \
     ext/cldrdata.jar \
     ext/dnsns.jar \
+    ext/nashorn.jar \
     ext/sunec.jar \
     ext/sunpkcs11.jar \
     ext/zipfs.jar