575 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \ |
575 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \ |
576 $(INTERIM_LANGTOOLS_MODULES)))) |
576 $(INTERIM_LANGTOOLS_MODULES)))) |
577 INTERIM_LANGTOOLS_ARGS := \ |
577 INTERIM_LANGTOOLS_ARGS := \ |
578 --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \ |
578 --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \ |
579 --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \ |
579 --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \ |
580 --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_modules \ |
580 --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \ |
581 $(INTERIM_LANGTOOLS_ADD_EXPORTS) \ |
581 $(INTERIM_LANGTOOLS_ADD_EXPORTS) \ |
582 # |
582 # |
583 JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main |
583 JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main |
584 JAVADOC_MAIN_CLASS = -m jdk.javadoc.interim/jdk.javadoc.internal.tool.Main |
584 JAVADOC_MAIN_CLASS = -m jdk.javadoc.interim/jdk.javadoc.internal.tool.Main |
585 |
585 |
586 INTERIM_RMIC_BASE_MODULES := jdk.rmic |
586 INTERIM_RMIC_BASE_MODULES := jdk.rmic |
587 INTERIM_RMIC_MODULES := $(addsuffix .interim, $(INTERIM_RMIC_BASE_MODULES)) |
587 INTERIM_RMIC_MODULES := $(addsuffix .interim, $(INTERIM_RMIC_BASE_MODULES)) |
588 INTERIM_RMIC_ADD_EXPORTS := \ |
588 INTERIM_RMIC_ADD_EXPORTS := \ |
589 --add-exports java.corba/com.sun.corba.se.impl.util=jdk.rmic.interim \ |
589 --add-exports java.corba/com.sun.corba.se.impl.util=jdk.rmic.interim \ |
590 # |
590 # |
591 INTERIM_RMIC_ARGS := --limit-modules java.base,jdk.compiler,jdk.javadoc,java.corba \ |
591 # Use = to delay expansion of PathList since it's not available in this file. |
592 --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_modules \ |
592 INTERIM_RMIC_ARGS = --limit-modules java.base,jdk.compiler,jdk.javadoc,java.corba \ |
|
593 --module-path $(call PathList, $(BUILDTOOLS_OUTPUTDIR)/interim_rmic_modules \ |
|
594 $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules) \ |
593 $(INTERIM_RMIC_ADD_EXPORTS) \ |
595 $(INTERIM_RMIC_ADD_EXPORTS) \ |
594 # |
596 # |
595 |
597 |
596 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... |
598 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... |
597 # Use = assignment to be able to override in bootcycle-spec.gmk |
599 # Use = assignment to be able to override in bootcycle-spec.gmk |