makefiles/Images.gmk
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File
*** old/makefiles/Images.gmk	Sun Dec 23 06:00:25 2012
--- new/makefiles/Images.gmk	Sun Dec 23 06:00:24 2012

*** 30,39 **** --- 30,41 ---- default: images include Tools.gmk + include Profiles.gmk + # Note: This double-colon rule is intentional, to support # custom make file integration. images:: jre-image jdk-image overlay-images: jre-overlay-image jdk-overlay-image
*** 79,129 **** --- 81,98 ---- # JRE and JDK build rules # ################################################################################ # # Variable prefixes explained: ! # JRE_ refers to files in the j2re-*-image. # JDK_ refers to files in the j2sdk-image outside of the jre subdir. # JDKJRE_ refers to files in the j2sdk-image inside the jre subdir. # ################################################################################ # /bin dir NOT_JRE_BIN_FILES := \ appletviewer$(EXE_SUFFIX) \ extcheck$(EXE_SUFFIX) \ idlj$(EXE_SUFFIX) \ jar$(EXE_SUFFIX) \ jarsigner$(EXE_SUFFIX) \ java-rmi.cgi \ javac$(EXE_SUFFIX) \ javadoc$(EXE_SUFFIX) \ javah$(EXE_SUFFIX) \ javap$(EXE_SUFFIX) \ jcmd$(EXE_SUFFIX) \ jdb$(EXE_SUFFIX) \ jps$(EXE_SUFFIX) \ jrunscript$(EXE_SUFFIX) \ jstat$(EXE_SUFFIX) \ jstatd$(EXE_SUFFIX) \ jstack$(EXE_SUFFIX) \ packagebean$(SCRIPT_SUFFIX) \ rmic$(EXE_SUFFIX) \ serialver$(EXE_SUFFIX) \ unregbean$(EXE_SUFFIX) \ jconsole$(EXE_SUFFIX) \ jinfo$(EXE_SUFFIX) \ jmap$(EXE_SUFFIX) \ native2ascii$(EXE_SUFFIX) \ xjc$(EXE_SUFFIX) \ wsgen$(EXE_SUFFIX) \ wsimport$(EXE_SUFFIX) \ schemagen$(EXE_SUFFIX) \ jsadebugd$(EXE_SUFFIX) \ jhat$(EXE_SUFFIX) WINDOWS_JDK_BIN_FILES = \ $(EXE_SUFFIX) \ $(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \ $(notdir $(MSVCR_DLL))
*** 190,212 **** --- 159,168 ---- JDKJRE_LIB_FILES := \ $(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \ $(SALIB_NAME) endif NOT_JRE_LIB_FILES := \ tools.jar \ jconsole.jar \ sa-jdi.jar \ dt.jar \ orb.idl \ ir.idl \ ct.sym ifeq ($(OPENJDK_TARGET_OS), windows) NOT_JRE_LIB_FILES += jawt.lib jvm.lib endif JDK_LIB_FILES := $(NOT_JRE_LIB_FILES) ifeq ($(OPENJDK_TARGET_OS), linux) JDK_LIB_FILES += jexec endif
*** 601,610 **** --- 557,569 ---- fi) $(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(call create-info-file) + ifneq ($(PROFILE),) + $(call info-file-item, "JAVA_PROFILE", "$(call profile_name, $(call profile_number, $(PROFILE)))") + endif $(JDK_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(call create-info-file)
*** 643,653 **** --- 602,612 ---- # Filter out the overlay specific bin files EXEC_LIST:=$(filter-out $(OVERLAY_FILTER),$(EXEC_LIST_BIN)) $(EXEC_LIST_LIB) EXEC_LIST_OVERLAY:=$(filter $(OVERLAY_FILTER),$(EXEC_LIST_BIN)) $(EXEC_LIST_LIB) # Filter out non JRE files and convert to unique touch files to depend on ! JRE_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%,$(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped,\ $(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\ $(EXEC_LIST))) JDKJRE_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \ $(IMAGES_OUTPUTDIR)/_strip_jdk/jre/%.stripped, \
*** 683,693 **** --- 642,652 ---- $(MKDIR) -p $(@D) $(TOUCH) $@ endef # Setup a rule for stripping files based on touch files ! $(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped: $(JRE_IMAGE_DIR)/% $(call strip-file) $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped: $(JDK_IMAGE_DIR)/% $(call strip-file)
*** 723,730 **** --- 682,707 ---- jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \ $(JDK_OVERLAY_LIB_TARGETS) $(JDKJRE_OVERLAY_LIB_TARGETS) \ $(JDK_OVERLAY_DEMO_TARGETS) $(JDK_OVERLAY_INFO_FILE) \ $(JDKJRE_OVERLAY_STRIP_LIST) $(JDK_OVERLAY_BIN_STRIP_LIST) + ifneq ($(PROFILE),) + # Files in lib$(PROFILE) are excluded from the generic copying routines so + # we have to add them back in here + $(foreach f,$(CUSTOM_PROFILE_JARS),\ + $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR)/lib$(PROFILE),$(JRE_IMAGE_DIR)/lib,$f,JRE_LIB_TARGETS))) + + profile-image1: + @$(ECHO) JRE_BIN_LIST = $(JRE_BIN_LIST) + @$(ECHO) NOT_JRE_BIN_FILES = $(NOT_JRE_BIN_FILES) + + profile-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) \ + $(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \ + $(JRE_INFO_FILE) $(JRE_STRIP_LIST) + + .PHONY: profile-image + + endif # Profile + ################################################################################ .PHONY: default images jre-image jdk-image

makefiles/Images.gmk
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File