changeset 1259:1275a5bc4a7d

make profiles failing as jdk.compact3 no longer exists
author alanb
date Wed, 29 Oct 2014 08:05:40 +0000
parents 693b9e6b7e8b
children cf3f3d5fae7e
files make/Images.gmk
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/Images.gmk	Mon Oct 27 11:16:10 2014 +0100
+++ b/make/Images.gmk	Wed Oct 29 08:05:40 2014 +0000
@@ -61,6 +61,10 @@
 JRE_MODULES := $(MAIN_MODULES) $(PROVIDER_MODULES)
 JDK_MODULES := $(JRE_MODULES) $(TOOLS_MODULES)
 
+# compact3 builds have additional modules
+JDK_COMPACT3_MODULES := java.compact3 java.smartcardio jdk.httpserver jdk.naming.dns \
+                       jdk.naming.rmi jdk.sctp jdk.security.auth
+
 # Replacing double-comma with a single comma is to workaround the issue
 # with some version of make on windows that doesn't substitute spaces 
 # with one comma properly as with make 4.0
@@ -143,7 +147,7 @@
 	$(ECHO) Creating jre compact3 jimage
 	$(RM) -r $(JRE_IMAGE_DIR)-compact3
 	$(JIMAGE_TOOL) \
-	    --mods $(call SubstComma, jdk.compact3 $(COMPACT_EXTRA_MODULES)) \
+	    --mods $(call SubstComma, $(JDK_COMPACT3_MODULES) $(COMPACT_EXTRA_MODULES)) \
 	    --output $(JRE_COMPACT3_IMAGE_DIR) \
 	    $(MODULES_XML) >> $(JRE_COMPACT3_SORTED_MODULES)
 	$(TOUCH) $@