changeset 1239:cb0dc72bc941

Move net.properties to conf
author chegar
date Wed, 15 Oct 2014 15:39:45 +0100
parents 05e067d532c0
children 065d58d7f2a3
files make/Images.gmk make/ModuleWrapper.gmk
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/Images.gmk	Tue Oct 14 14:13:58 2014 +0200
+++ b/make/Images.gmk	Wed Oct 15 15:39:45 2014 +0100
@@ -74,12 +74,14 @@
 
 MODULES_CMDS := $(SUPPORT_OUTPUTDIR)/modules_cmds-stripped
 MODULES_LIBS := $(SUPPORT_OUTPUTDIR)/modules_libs-stripped
+MODULES_CONF := $(SUPPORT_OUTPUTDIR)/modules_conf
 
 JIMAGE_TOOL := $(JAVA_SMALL) \
     -Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes \
     -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_bt_classes build.tools.module.ImageBuilder \
     --cmds $(MODULES_CMDS) \
     --libs $(MODULES_LIBS) \
+    --configs $(MODULES_CONF) \
     --classes $(JDK_OUTPUTDIR)/modules \
     --endian $(OPENJDK_TARGET_CPU_ENDIAN) \
     #
--- a/make/ModuleWrapper.gmk	Tue Oct 14 14:13:58 2014 +0200
+++ b/make/ModuleWrapper.gmk	Wed Oct 15 15:39:45 2014 +0100
@@ -78,5 +78,11 @@
     DEST := $(JDK_OUTPUTDIR)/bin, \
     FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE)/%, $(TARGETS))))
 
+$(eval $(call SetupCopyFiles,COPY_CONF, \
+    SRC := $(SUPPORT_OUTPUTDIR)/modules_conf/$(MODULE), \
+    DEST := $(JDK_OUTPUTDIR)/conf, \
+    FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_conf/$(MODULE)/%, \
+          $(TARGETS))))
+
 all: $(TARGETS) $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \
-    $(COPY_INCLUDE) $(COPY_CMDS)
+    $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_CONF)