*** old/makefiles/Images.gmk	Tue Jan  8 02:19:48 2013
--- new/makefiles/Images.gmk	Tue Jan  8 02:19:46 2013

*** 39,48 ****
--- 39,50 ----
                 $(JDK_OUTPUTDIR)/sample \
                 $(JDK_OUTPUTDIR)/demo)))
  
  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

*** 82,100 ****
--- 84,103 ----
  # 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 := \
+ ifeq ($(PROFILE),)
+     NOT_JRE_BIN_FILES := \
          appletviewer$(EXE_SUFFIX) \
          extcheck$(EXE_SUFFIX) \
          idlj$(EXE_SUFFIX) \
          jar$(EXE_SUFFIX) \
          jarsigner$(EXE_SUFFIX) \

*** 122,131 ****
--- 125,135 ----
          wsgen$(EXE_SUFFIX) \
          wsimport$(EXE_SUFFIX) \
          schemagen$(EXE_SUFFIX) \
          jsadebugd$(EXE_SUFFIX) \
          jhat$(EXE_SUFFIX)
+ endif
  
  WINDOWS_JDK_BIN_FILES = \
          $(EXE_SUFFIX) \
          $(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \
          $(notdir $(MSVCR_DLL))

*** 193,213 ****
--- 197,219 ----
      JDKJRE_LIB_FILES := \
          $(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
          $(SALIB_NAME)
  endif
  
  NOT_JRE_LIB_FILES := \
+ ifeq ($(PROFILE),)
+     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
  endif
  
  JDK_LIB_FILES := $(NOT_JRE_LIB_FILES)
  ifeq ($(OPENJDK_TARGET_OS), linux)
      JDK_LIB_FILES += jexec

*** 604,613 ****
--- 610,622 ----
    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)
  

*** 645,655 ****
--- 654,664 ----
      # 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, \

*** 685,695 ****
--- 694,704 ----
          $(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)
  

*** 725,732 ****
--- 734,755 ----
  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-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