make/Bundles.gmk

rev 57725 : 8237192: Generate stripped/public pdbs on Windows for jdk images

@@ -123,10 +123,15 @@
           $$(foreach d, $$($1_BASE_DIRS), \
             ( $(CD) $$d \
             && $(TAR) cf - -$(TAR_INCLUDE_PARAM) $$($1_$$d_LIST_FILE) \
                 $(TAR_IGNORE_EXIT_VALUE) ) \
             | ( $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) && $(TAR) xf - )$$(NEWLINE) )
+          # Rename stripped pdb files
+            for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.stripped.pdb"`; do \
+              $(ECHO) found stripped pdb file $$$${f}, we rename it to: $$$${f%stripped.pdb}pdb; \
+              $(MV) $$$${f} $$$${f%stripped.pdb}pdb; \
+            done
           # Unzip any zipped debuginfo files
           ifeq ($$($1_UNZIP_DEBUGINFO), true)
             for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.diz"`; do \
               $(CD) $$$${f%/*} && $(UNZIP) -q $$$${f} && $(RM) $$$${f}; \
             done

@@ -216,17 +221,28 @@
           $(SYMBOLS_EXCLUDE_PATTERN) \
           $(JDK_IMAGE_HOMEDIR)/demo/% \
           , \
           $(ALL_JDK_FILES) \
       )
+
+  # include stripped pdb files in jdk image bundle
+  ifeq ($(call isTargetOs, windows), true)
+  JDK_STRIPPED_PDB_FILES := \
+      $(filter \
+           %.stripped.pdb \
+          , \
+          $(ALL_JDK_FILES) \
+      )
+
+  # remove the stripped pdb files from symbols bundle, we include only the full pdbs
   JDK_SYMBOLS_BUNDLE_FILES := \
       $(filter \
           $(JDK_SYMBOLS_EXCLUDE_PATTERN) \
           $(SYMBOLS_EXCLUDE_PATTERN) \
           , \
           $(filter-out \
-              $(JDK_IMAGE_HOMEDIR)/demo/% \
+              $(JDK_IMAGE_HOMEDIR)/demo/%  %.stripped.pdb \
               , \
               $(ALL_JDK_SYMBOLS_FILES) \
           ) \
       ) \
       $(call FindFiles, $(SYMBOLS_IMAGE_DIR))

@@ -243,27 +259,37 @@
       JRE_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
           $(call containing, .dSYM/, $(patsubst $(JRE_IMAGE_DIR)/%, %, $(ALL_JRE_FILES))))
     endif
   endif
 
+  # include stripped pdb files in jdk image bundle
+  ifeq ($(call isTargetOs, windows), true)
+  JRE_STRIPPED_PDB_FILES := \
+      $(filter \
+           %.stripped.pdb \
+          , \
+          $(ALL_JRE_FILES) \
+      )
+  endif
+
   JRE_BUNDLE_FILES := $(filter-out \
       $(JRE_SYMBOLS_EXCLUDE_PATTERN) \
       $(SYMBOLS_EXCLUDE_PATTERN), \
       $(ALL_JRE_FILES))
 
   $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
       BUNDLE_NAME := $(JDK_BUNDLE_NAME), \
-      FILES := $(JDK_BUNDLE_FILES), \
+      FILES := $(JDK_BUNDLE_FILES) $(JDK_STRIPPED_PDB_FILES), \
       SPECIAL_INCLUDES := $(JDK_SPECIAL_INCLUDES), \
       BASE_DIRS := $(JDK_IMAGE_DIR), \
       SUBDIR := $(JDK_BUNDLE_SUBDIR), \
   ))
 
   PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)
 
   $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
-      BUNDLE_NAME := $(JRE_BUNDLE_NAME), \
+      BUNDLE_NAME := $(JRE_BUNDLE_NAME) $(JRE_STRIPPED_PDB_FILES), \
       FILES := $(JRE_BUNDLE_FILES), \
       BASE_DIRS := $(JRE_IMAGE_DIR), \
       SUBDIR := $(JRE_BUNDLE_SUBDIR), \
   ))