Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
authorjlaskey
Thu, 09 Jun 2016 11:12:18 -0300
changeset 38845 6d03072cdab8
parent 38844 8af6df8a3613
child 38846 221a3402ad10
8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources) Reviewed-by: sundar
make/Images.gmk file | annotate | diff | comparison | revisions 
--- a/make/Images.gmk	Thu Jun 09 10:40:19 2016 +0200
+++ b/make/Images.gmk	Thu Jun 09 11:12:18 2016 -0300
@@ -115,16 +115,16 @@
 # Use this file inside the image as target for make rule
 JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
 
-JLINK_ORDER_RESOURCES := *module-info.class*
+JLINK_ORDER_RESOURCES := **module-info.class
 ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
   JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/classlist/classlist
 endif
 JLINK_ORDER_RESOURCES += \
-    /java.base/java/* \
-    /java.base/jdk/* \
-    /java.base/sun/* \
-    /java.base/com/* \
-    /jdk.localedata/* \
+    /java.base/java/** \
+    /java.base/jdk/** \
+    /java.base/sun/** \
+    /java.base/com/** \
+    /jdk.localedata/** \
     #
 
 JLINK_TOOL := $(JLINK) --modulepath $(IMAGES_OUTPUTDIR)/jmods \
jdk-sandbox