make/Main.gmk

*** 80,93 ****
    interim-cldrconverter:
          +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
  
    buildtools-jdk:
          +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk)
  endif
  
  ALL_TARGETS += buildtools-langtools interim-langtools \
!     interim-rmic interim-cldrconverter buildtools-jdk
  
  ################################################################################
  # Special targets for certain modules
  
  import-hotspot:
--- 80,96 ----
    interim-cldrconverter:
          +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
  
    buildtools-jdk:
          +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk)
+ 
+   buildtools-modules:
+         +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
  endif
  
  ALL_TARGETS += buildtools-langtools interim-langtools \
!     interim-rmic interim-cldrconverter buildtools-jdk buildtools-modules
  
  ################################################################################
  # Special targets for certain modules
  
  import-hotspot:
*** 338,349 ****
          +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk profiles)
  
  mac-bundles-jdk:
          +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
  
  ALL_TARGETS += source-tips create-hgtip-files bootcycle-images zip-security \
!      zip-source jrtfs-jar jimages profiles mac-bundles-jdk
  
  ################################################################################
  # Docs targets
  
  docs-javadoc:
--- 341,356 ----
          +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk profiles)
  
  mac-bundles-jdk:
          +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
  
+ exploded-image-optimize:
+         +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk)
+ 
  ALL_TARGETS += source-tips create-hgtip-files bootcycle-images zip-security \
!     zip-source jrtfs-jar jimages profiles mac-bundles-jdk \
!     exploded-image-optimize
  
  ################################################################################
  # Docs targets
  
  docs-javadoc:
*** 519,528 ****
--- 526,537 ----
  
    interim-langtools: $(LANGTOOLS_GENSRC_TARGETS)
  
    buildtools-jdk: interim-langtools interim-cldrconverter
  
+   buildtools-modules: exploded-image-base
+ 
    $(CORBA_GENSRC_TARGETS): interim-langtools
  
    $(HOTSPOT_GENSRC_TARGETS): interim-langtools
  
    $(JDK_GENSRC_TARGETS): interim-langtools buildtools-jdk
*** 675,684 ****
--- 684,695 ----
  
    profiles: jmods zip-source source-tips jrtfs-jar
  
    mac-bundles-jdk: jimages
  
+   exploded-image-optimize: exploded-image-base buildtools-modules
+ 
    bootcycle-images: jimages
  
    docs-javadoc: $(GENSRC_TARGETS) rmic
  
    docs-jvmtidoc: hotspot
*** 726,736 ****
  
    test-bundles: test-image
  
    docs-bundles: docs-image
  
!   generate-summary: jmods
  
  endif
  
  ################################################################################
  # Virtual targets without recipes
--- 737,747 ----
  
    test-bundles: test-image
  
    docs-bundles: docs-image
  
!   generate-summary: jmods buildtools-modules
  
  endif
  
  ################################################################################
  # Virtual targets without recipes
*** 772,782 ****
  demos: demos-jdk
  
  samples: samples-jdk
  
  # The "exploded image" is a locally runnable JDK in $(BUILD_OUTPUT)/jdk.
! exploded-image: $(ALL_MODULES)
  
  create-buildjdk: create-buildjdk-copy create-buildjdk-interim-image
  
  mac-bundles: mac-bundles-jdk
  
--- 783,794 ----
  demos: demos-jdk
  
  samples: samples-jdk
  
  # The "exploded image" is a locally runnable JDK in $(BUILD_OUTPUT)/jdk.
! exploded-image-base: $(ALL_MODULES)
! exploded-image: exploded-image-base exploded-image-optimize
  
  create-buildjdk: create-buildjdk-copy create-buildjdk-interim-image
  
  mac-bundles: mac-bundles-jdk
  
*** 813,823 ****
  
  # all-bundles packages all our deliverables as tar.gz bundles.
  all-bundles: product-bundles test-bundles docs-bundles
  
  ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers jmods \
!     jdk.jdwp.agent-gensrc $(ALL_MODULES) demos samples exploded-image \
      create-buildjdk mac-bundles product-images docs-image test-image all-images \
      all-bundles
  
  ################################################################################
  
--- 825,836 ----
  
  # all-bundles packages all our deliverables as tar.gz bundles.
  all-bundles: product-bundles test-bundles docs-bundles
  
  ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers jmods \
!     jdk.jdwp.agent-gensrc $(ALL_MODULES) demos samples \
!     exploded-image-base exploded-image \
      create-buildjdk mac-bundles product-images docs-image test-image all-images \
      all-bundles
  
  ################################################################################