jdk9-gnu-options Sdiff make

make/Images.gmk

 114 JLINK_JLI_CLASSES :=
 115 ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
 116   JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/classlist/classlist
 117   JLINK_JLI_CLASSES := --generate-jli-classes=@$(SUPPORT_OUTPUTDIR)/classlist/jli_trace.out
 118 endif
 119 JLINK_ORDER_RESOURCES += \
 120     /java.base/java/** \
 121     /java.base/jdk/** \
 122     /java.base/sun/** \
 123     /java.base/com/** \
 124     /jdk.localedata/** \
 125     #
 126 
 127 JLINK_TOOL := $(JLINK) --module-path $(IMAGES_OUTPUTDIR)/jmods \
 128     --endian $(OPENJDK_BUILD_CPU_ENDIAN) \
 129     --release-info $(BASE_RELEASE_FILE) \
 130     --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
 131     $(JLINK_JLI_CLASSES) \
 132     #
 133 


 134 ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true)
 135   JLINK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods
 136 endif
 137 
 138 $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 139     $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE)
 140         $(ECHO) Creating jdk jimage
 141         $(RM) -r $(JDK_IMAGE_DIR)
 142         $(JLINK_TOOL) --output $(JDK_IMAGE_DIR) \
 143             --add-modules $(JDK_MODULES_LIST) $(JLINK_EXTRA_OPTS)

 144         $(TOUCH) $@
 145 
 146 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 147     $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
 148         $(ECHO) Creating jre jimage
 149         $(RM) -r $(JRE_IMAGE_DIR)
 150         $(JLINK_TOOL) --output $(JRE_IMAGE_DIR) \
 151             --add-modules $(JRE_MODULES_LIST)

 152         $(TOUCH) $@
 153 
 154 JRE_COMPACT1_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact1
 155 JRE_COMPACT2_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact2
 156 JRE_COMPACT3_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact3
 157 

 158 $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 159     $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE)
 160         $(ECHO) Creating jre compact1 jimage
 161         $(RM) -r $(JRE_COMPACT1_IMAGE_DIR)
 162         $(JLINK_TOOL) --add-modules $(JRE_COMPACT1_MODULES_LIST) \

 163             --output $(JRE_COMPACT1_IMAGE_DIR)
 164         $(TOUCH) $@
 165 
 166 $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 167     $(call DependOnVariable, JRE_COMPACT2_MODULES_LIST) $(BASE_RELEASE_FILE)
 168         $(ECHO) Creating jre compact2 jimage
 169         $(RM) -r $(JRE_COMPACT2_IMAGE_DIR)
 170         $(JLINK_TOOL) --add-modules $(JRE_COMPACT2_MODULES_LIST) \

 171             --output $(JRE_COMPACT2_IMAGE_DIR)
 172         $(TOUCH) $@
 173 
 174 $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 175     $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(BASE_RELEASE_FILE)
 176         $(ECHO) Creating jre compact3 jimage
 177         $(RM) -r $(JRE_COMPACT3_IMAGE_DIR)
 178         $(JLINK_TOOL) --add-modules $(JRE_COMPACT3_MODULES_LIST) \

 179             --output $(JRE_COMPACT3_IMAGE_DIR)
 180         $(TOUCH) $@
 181 
 182 TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 183 TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 184 TOOL_JRE_COMPACT1_TARGETS := $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 185 TOOL_JRE_COMPACT2_TARGETS := $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 186 TOOL_JRE_COMPACT3_TARGETS := $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 187 
 188 ################################################################################
 189 # /man dir
 190 #
 191 # All variables in this section are assigned with simple =, without :, to enable
 192 # more selective overriding from the custom version of this file.
 193 #
 194 # Avoid evaluating this whole section on windows for speed and stability
 195 ifneq ($(OPENJDK_TARGET_OS), windows)
 196   JRE_MAN_PAGES += \
 197       java.1 \
 198       jjs.1 \

 296         $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \
 297         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
 298         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
 299   endif
 300 
 301   ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
 302     JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
 303         $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
 304         $(JRE_IMAGE_DIR)/man/ja
 305 
 306     JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
 307         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
 308         $(JDK_IMAGE_DIR)/man/ja
 309   endif
 310 
 311   JRE_TARGETS += $(JRE_MAN_PAGE_LIST)
 312   JDK_TARGETS += $(JDK_MAN_PAGE_LIST)
 313 endif # Windows
 314 
 315 ################################################################################
 316 # /include dir
 317 
 318 $(eval $(call SetupCopyFiles,COPY_INCLUDES, \
 319     SRC := $(JDK_OUTPUTDIR)/include, \
 320     DEST := $(JDK_IMAGE_DIR)/include, \
 321     FILES := $(call CacheFind,$(JDK_OUTPUTDIR)/include)))
 322 
 323 JDK_TARGETS += $(COPY_INCLUDES)
 324 
 325 ################################################################################
 326 # doc files
 327 
 328 JRE_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
 329 JDK_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
 330 JRE_DOC_LOCATION ?= $(JDK_TOPDIR)
 331 JDK_DOC_LOCATION ?= $(JDK_TOPDIR)
 332 
 333 JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/, $(JRE_DOC_FILES))
 334 JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES))
 335 
 336 # Processing license files from source area to image area
 337 # These are modified to have the platform specific EOL chars.
 338 define process-doc-file
 339         $(call LogInfo, Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@))
 340         $(MKDIR) -p $(@D)
 341         $(RM) $@
 342         LC_ALL=C $(SED) 's/$$//g' $< > $@
 343         $(CHMOD) 444 $@
 344 endef
 345

 114 JLINK_JLI_CLASSES :=
 115 ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
 116   JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/classlist/classlist
 117   JLINK_JLI_CLASSES := --generate-jli-classes=@$(SUPPORT_OUTPUTDIR)/classlist/jli_trace.out
 118 endif
 119 JLINK_ORDER_RESOURCES += \
 120     /java.base/java/** \
 121     /java.base/jdk/** \
 122     /java.base/sun/** \
 123     /java.base/com/** \
 124     /jdk.localedata/** \
 125     #
 126 
 127 JLINK_TOOL := $(JLINK) --module-path $(IMAGES_OUTPUTDIR)/jmods \
 128     --endian $(OPENJDK_BUILD_CPU_ENDIAN) \
 129     --release-info $(BASE_RELEASE_FILE) \
 130     --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
 131     $(JLINK_JLI_CLASSES) \
 132     #
 133 
 134 JLINK_JRE_EXTRA_OPTS := --no-man-pages --no-header-files
 135 
 136 ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true)
 137   JLINK_JDK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods
 138 endif
 139 
 140 $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 141     $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE)
 142         $(ECHO) Creating jdk jimage
 143         $(RM) -r $(JDK_IMAGE_DIR)
 144         $(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \
 145             $(JLINK_JDK_EXTRA_OPTS) \
 146             --output $(JDK_IMAGE_DIR)
 147         $(TOUCH) $@
 148 
 149 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 150     $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
 151         $(ECHO) Creating jre jimage
 152         $(RM) -r $(JRE_IMAGE_DIR)
 153         $(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \
 154             $(JLINK_JRE_EXTRA_OPTS) \
 155             --output $(JRE_IMAGE_DIR)
 156         $(TOUCH) $@
 157 
 158 JRE_COMPACT1_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact1
 159 JRE_COMPACT2_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact2
 160 JRE_COMPACT3_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact3
 161 
 162 
 163 $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 164     $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE)
 165         $(ECHO) Creating jre compact1 jimage
 166         $(RM) -r $(JRE_COMPACT1_IMAGE_DIR)
 167         $(JLINK_TOOL) --add-modules $(JRE_COMPACT1_MODULES_LIST) \
 168             $(JLINK_JRE_EXTRA_OPTS) \
 169             --output $(JRE_COMPACT1_IMAGE_DIR)
 170         $(TOUCH) $@
 171 
 172 $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 173     $(call DependOnVariable, JRE_COMPACT2_MODULES_LIST) $(BASE_RELEASE_FILE)
 174         $(ECHO) Creating jre compact2 jimage
 175         $(RM) -r $(JRE_COMPACT2_IMAGE_DIR)
 176         $(JLINK_TOOL) --add-modules $(JRE_COMPACT2_MODULES_LIST) \
 177             $(JLINK_JRE_EXTRA_OPTS) \
 178             --output $(JRE_COMPACT2_IMAGE_DIR)
 179         $(TOUCH) $@
 180 
 181 $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 182     $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(BASE_RELEASE_FILE)
 183         $(ECHO) Creating jre compact3 jimage
 184         $(RM) -r $(JRE_COMPACT3_IMAGE_DIR)
 185         $(JLINK_TOOL) --add-modules $(JRE_COMPACT3_MODULES_LIST) \
 186             $(JLINK_JRE_EXTRA_OPTS) \
 187             --output $(JRE_COMPACT3_IMAGE_DIR)
 188         $(TOUCH) $@
 189 
 190 TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 191 TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 192 TOOL_JRE_COMPACT1_TARGETS := $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 193 TOOL_JRE_COMPACT2_TARGETS := $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 194 TOOL_JRE_COMPACT3_TARGETS := $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 195 
 196 ################################################################################
 197 # /man dir
 198 #
 199 # All variables in this section are assigned with simple =, without :, to enable
 200 # more selective overriding from the custom version of this file.
 201 #
 202 # Avoid evaluating this whole section on windows for speed and stability
 203 ifneq ($(OPENJDK_TARGET_OS), windows)
 204   JRE_MAN_PAGES += \
 205       java.1 \
 206       jjs.1 \

 304         $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \
 305         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
 306         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
 307   endif
 308 
 309   ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
 310     JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
 311         $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
 312         $(JRE_IMAGE_DIR)/man/ja
 313 
 314     JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
 315         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
 316         $(JDK_IMAGE_DIR)/man/ja
 317   endif
 318 
 319   JRE_TARGETS += $(JRE_MAN_PAGE_LIST)
 320   JDK_TARGETS += $(JDK_MAN_PAGE_LIST)
 321 endif # Windows
 322 
 323 ################################################################################










 324 # doc files
 325 
 326 JRE_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
 327 JDK_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
 328 JRE_DOC_LOCATION ?= $(JDK_TOPDIR)
 329 JDK_DOC_LOCATION ?= $(JDK_TOPDIR)
 330 
 331 JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/, $(JRE_DOC_FILES))
 332 JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES))
 333 
 334 # Processing license files from source area to image area
 335 # These are modified to have the platform specific EOL chars.
 336 define process-doc-file
 337         $(call LogInfo, Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@))
 338         $(MKDIR) -p $(@D)
 339         $(RM) $@
 340         LC_ALL=C $(SED) 's/$$//g' $< > $@
 341         $(CHMOD) 444 $@
 342 endef
 343

< prev index next >