< prev index next >

make/Main.gmk

Print this page
@@ -70,13 +70,10 @@
  	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ToolsLangtools.gmk)
  
  interim-langtools:
  	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimLangtools.gmk)
  
- interim-rmic:
- 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
- 
  interim-tzdb:
  	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimTZDB.gmk)
  
  
  buildtools-jdk:

@@ -87,11 +84,11 @@
  
  buildtools-hotspot:
  	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsHotspot.gmk)
  
  ALL_TARGETS += buildtools-langtools interim-langtools \
-     interim-rmic interim-tzdb buildtools-jdk buildtools-modules \
+     interim-tzdb buildtools-jdk buildtools-modules \
      buildtools-hotspot
  
  ################################################################################
  # Special targets for certain modules
  

@@ -192,20 +189,10 @@
  $(foreach m, $(JAVA_MODULES), $(eval $(call DeclareCompileJavaRecipe,$m)))
  
  ALL_TARGETS += $(JAVA_TARGETS)
  
  ################################################################################
- # Targets for running rmic.
- $(eval $(call DeclareRecipesForPhase, RMIC, \
-     TARGET_SUFFIX := rmic, \
-     FILE_PREFIX := Rmic, \
-     MAKE_SUBDIR := rmic, \
-     CHECK_MODULES := $(ALL_MODULES)))
- 
- ALL_TARGETS += $(RMIC_TARGETS)
- 
- ################################################################################
  # Targets for compiling native libraries
  $(eval $(call DeclareRecipesForPhase, LIBS, \
      TARGET_SUFFIX := libs, \
      FILE_PREFIX := Lib, \
      MAKE_SUBDIR := lib, \

@@ -686,14 +673,10 @@
  
    $(GENSRC_MODULEINFO_TARGETS): buildtools-jdk
  
    $(GENDATA_TARGETS): interim-langtools buildtools-jdk
  
-   interim-rmic: interim-langtools
- 
-   $(RMIC_TARGETS): interim-langtools interim-rmic
- 
    $(JAVA_TARGETS): interim-langtools
  
    # Declare dependencies between hotspot-<variant>* targets
    $(foreach v, $(JVM_VARIANTS), \
        $(eval hotspot-$v-gensrc: java.base-copy) \

@@ -730,13 +713,10 @@
        $(eval $m-java: $(addsuffix -java, $(filter $(JAVA_MODULES), \
        $(call FindDepsForModule,$m)))))
    # Declare dependencies between the module meta targets
    $(foreach m, $(ALL_MODULES), $(eval $m: $(call FindDepsForModule,$m)))
  
-   # Declare dependencies between <module>-rmic to <module>-java
-   $(foreach m, $(RMIC_MODULES), $(eval $m-rmic: $m-java))
- 
    # Declare dependencies from <module>-lib to <module>-java
    # Skip modules that do not have java source.
    $(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs: $m-java))
  
    # Declare dependencies from all other <module>-lib to java.base-lib

@@ -766,11 +746,11 @@
    # For these modules, the gensrc step is generating a module-info.java.extra
    # file to be processed by the gensrc-moduleinfo target.
    jdk.internal.vm.compiler-gensrc-moduleinfo: jdk.internal.vm.compiler-gensrc-src
    jdk.internal.vm.compiler.management-gensrc-moduleinfo: jdk.internal.vm.compiler.management-gensrc-src
  
-   jdk.jdeps-gendata: java rmic
+   jdk.jdeps-gendata: java
  
    # The ct.sym generation uses all the moduleinfos as input
    jdk.compiler-gendata: $(GENSRC_MODULEINFO_TARGETS)
  
    # Declare dependencies between jmod targets.

@@ -788,11 +768,10 @@
    java.base-jmod: $(JVM_MAIN_TARGETS)
  
    # Declare dependencies from <module>-jmod to all other module targets
    $(foreach m, $(JAVA_MODULES), $(eval $m_JMOD_DEPS += $m-java))
    $(foreach m, $(GENDATA_MODULES), $(eval $m_JMOD_DEPS += $m-gendata))
-   $(foreach m, $(RMIC_MODULES), $(eval $m_JMOD_DEPS += $m-rmic))
    $(foreach m, $(LIBS_MODULES), $(eval $m_JMOD_DEPS += $m-libs))
    $(foreach m, $(LAUNCHER_MODULES), $(eval $m_JMOD_DEPS += $m-launchers))
    $(foreach m, $(COPY_MODULES), $(eval $m_JMOD_DEPS += $m-copy))
    $(foreach m, $(ALL_MODULES), $(eval $m-jmod: $($(m)_JMOD_DEPS)))
    $(foreach m, $(INTERIM_IMAGE_MODULES), $(eval $m-interim-jmod: $($(m)_JMOD_DEPS)))

@@ -854,11 +833,11 @@
    $(JMOD_TARGETS): java.base-copy
  
    zip-security: java.base-java java.security.jgss-java java.security.jgss-libs \
        $(filter jdk.crypto%, $(JAVA_TARGETS))
  
-   zip-source: gensrc rmic
+   zip-source: gensrc
  
    jrtfs-jar: interim-langtools
  
    build-microbenchmark: interim-langtools exploded-image
  

@@ -901,15 +880,15 @@
    exploded-image-optimize: java copy gendata java.base-libs java.base-launchers \
        buildtools-modules
  
    bootcycle-images: jdk-image
  
-   docs-jdk-api-javadoc: $(GENSRC_TARGETS) rmic
+   docs-jdk-api-javadoc: $(GENSRC_TARGETS)
  
-   docs-javase-api-javadoc: $(GENSRC_TARGETS) rmic
+   docs-javase-api-javadoc: $(GENSRC_TARGETS)
  
-   docs-reference-api-javadoc: $(GENSRC_TARGETS) rmic
+   docs-reference-api-javadoc: $(GENSRC_TARGETS)
  
    docs-jdk-api-modulegraph: exploded-image buildtools-modules
  
    docs-javase-api-modulegraph: exploded-image buildtools-modules
  

@@ -987,11 +966,11 @@
  ################################################################################
  # Virtual targets without recipes
  
  # If not already set, set the JVM specific tools targets
  JVM_TOOLS_TARGETS ?= buildtools-hotspot
- buildtools: buildtools-langtools interim-langtools interim-rmic \
+ buildtools: buildtools-langtools interim-langtools \
      buildtools-jdk $(JVM_TOOLS_TARGETS)
  
  # Declare dependencies from hotspot-<variant> targets
  $(foreach v, $(JVM_VARIANTS), \
    $(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \

@@ -1010,12 +989,10 @@
  
  copy: $(ALL_COPY_TARGETS)
  
  java: $(JAVA_TARGETS)
  
- rmic: $(RMIC_TARGETS)
- 
  libs: $(LIBS_TARGETS)
  
  static-libs: $(STATIC_LIBS_TARGETS)
  
  launchers: $(LAUNCHER_TARGETS)

@@ -1029,11 +1006,10 @@
  # Declare dependencies from <module> to all the individual targets specific
  # to that module <module>-*, that are needed for the exploded image.
  $(foreach m, $(GENSRC_MODULES), $(eval $m: $m-gensrc))
  $(foreach m, $(JAVA_MODULES), $(eval $m: $m-java))
  $(foreach m, $(GENDATA_MODULES), $(eval $m: $m-gendata))
- $(foreach m, $(RMIC_MODULES), $(eval $m: $m-rmic))
  $(foreach m, $(LIBS_MODULES), $(eval $m: $m-libs))
  $(foreach m, $(LAUNCHER_MODULES), $(eval $m: $m-launchers))
  $(foreach m, $(ALL_COPY_MODULES), $(eval $m: $m-copy))
  
  # Building java.base includes building all of hotspot.

@@ -1129,11 +1105,11 @@
  
  # all-bundles packages all our deliverables as tar.gz bundles.
  all-bundles: product-bundles test-bundles docs-bundles static-libs-bundles
  
  ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
-     copy java rmic libs static-libs launchers jmods \
+     copy java libs static-libs launchers jmods \
      jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
      exploded-image-base exploded-image \
      create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \
      docs-javase docs-reference docs-javadoc mac-bundles product-images legacy-images \
      docs-image test-image all-images \
< prev index next >