mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 15:24:43 +02:00
8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
Rename jdk.vm.ci and jdk.vm.compiler modules to jdk.internal.vm.ci and jdk.internal.vm.compiler. Reviewed-by: mchung, ihse, dnsimon
This commit is contained in:
Vladimir Kozlov
parent
d0db608122
commit
7d969ccd55
2765 changed files with 359 additions and 354 deletions
|
|
@ -15,10 +15,10 @@
|
||||||
^\.mx.jvmci/hotspot/eclipse/.*
|
^\.mx.jvmci/hotspot/eclipse/.*
|
||||||
^\.idea/
|
^\.idea/
|
||||||
^workingsets.xml
|
^workingsets.xml
|
||||||
^src/jdk.vm.ci/share/classes/\w[\w\.]*/.*\.xml
|
^src/jdk.internal.vm.ci/share/classes/\w[\w\.]*/.*\.xml
|
||||||
^src/jdk.vm.ci/share/classes/\w[\w\.]*/.*\.iml
|
^src/jdk.internal.vm.ci/share/classes/\w[\w\.]*/.*\.iml
|
||||||
^src/jdk.vm.ci/share/classes/\w[\w\.]*/nbproject
|
^src/jdk.internal.vm.ci/share/classes/\w[\w\.]*/nbproject
|
||||||
^src/jdk.vm.ci/share/classes/\w[\w\.]*/\..*
|
^src/jdk.internal.vm.ci/share/classes/\w[\w\.]*/\..*
|
||||||
^test/compiler/jvmci/\w[\w\.]*/.*\.xml
|
^test/compiler/jvmci/\w[\w\.]*/.*\.xml
|
||||||
^test/compiler/jvmci/\w[\w\.]*/.*\.iml
|
^test/compiler/jvmci/\w[\w\.]*/.*\.iml
|
||||||
^test/compiler/jvmci/\w[\w\.]*/nbproject
|
^test/compiler/jvmci/\w[\w\.]*/nbproject
|
||||||
|
|
@ -27,15 +27,15 @@
|
||||||
^test/compiler/aot/\w[\w\.]*/.*\.iml
|
^test/compiler/aot/\w[\w\.]*/.*\.iml
|
||||||
^test/compiler/aot/\w[\w\.]*/nbproject
|
^test/compiler/aot/\w[\w\.]*/nbproject
|
||||||
^test/compiler/aot/\w[\w\.]*/\..*
|
^test/compiler/aot/\w[\w\.]*/\..*
|
||||||
^src/jdk.vm.compiler/\.mx.graal/env
|
^src/jdk.internal.vm.compiler/\.mx.graal/env
|
||||||
^src/jdk.vm.compiler/\.mx.graal/.*\.pyc
|
^src/jdk.internal.vm.compiler/\.mx.graal/.*\.pyc
|
||||||
^src/jdk.vm.compiler/\.mx.graal/eclipse-launches/.*
|
^src/jdk.internal.vm.compiler/\.mx.graal/eclipse-launches/.*
|
||||||
^src/jdk.aot/share/classes/\w[\w\.]*/.*\.xml
|
^src/jdk.aot/share/classes/\w[\w\.]*/.*\.xml
|
||||||
^src/jdk.aot/share/classes/\w[\w\.]*/.*\.iml
|
^src/jdk.aot/share/classes/\w[\w\.]*/.*\.iml
|
||||||
^src/jdk.aot/share/classes/\w[\w\.]*/nbproject
|
^src/jdk.aot/share/classes/\w[\w\.]*/nbproject
|
||||||
^src/jdk.aot/share/classes/\w[\w\.]*/\..*
|
^src/jdk.aot/share/classes/\w[\w\.]*/\..*
|
||||||
^src/jdk.vm.compiler/share/classes/\w[\w\.]*/.*\.xml
|
^src/jdk.internal.vm.compiler/share/classes/\w[\w\.]*/.*\.xml
|
||||||
^src/jdk.vm.compiler/share/classes/\w[\w\.]*/.*\.iml
|
^src/jdk.internal.vm.compiler/share/classes/\w[\w\.]*/.*\.iml
|
||||||
^src/jdk.vm.compiler/share/classes/\w[\w\.]*/nbproject
|
^src/jdk.internal.vm.compiler/share/classes/\w[\w\.]*/nbproject
|
||||||
^src/jdk.vm.compiler/share/classes/\w[\w\.]*/\..*
|
^src/jdk.internal.vm.compiler/share/classes/\w[\w\.]*/\..*
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,9 +38,9 @@ TARGETS :=
|
||||||
$(eval $(call IncludeCustomExtension, hotspot, CompileTools.gmk))
|
$(eval $(call IncludeCustomExtension, hotspot, CompileTools.gmk))
|
||||||
|
|
||||||
ifeq ($(INCLUDE_GRAAL), true)
|
ifeq ($(INCLUDE_GRAAL), true)
|
||||||
VM_CI_SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes
|
VM_CI_SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.internal.vm.ci/share/classes
|
||||||
|
|
||||||
SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.vm.compiler/share/classes
|
SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.internal.vm.compiler/share/classes
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Compile the annotation processors
|
# Compile the annotation processors
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ default: all
|
||||||
include $(SPEC)
|
include $(SPEC)
|
||||||
include MakeBase.gmk
|
include MakeBase.gmk
|
||||||
|
|
||||||
$(eval $(call IncludeCustomExtension, hotspot, gensrc/Gensrc-jdk.vm.compiler.gmk))
|
$(eval $(call IncludeCustomExtension, hotspot, gensrc/Gensrc-jdk.internal.vm.compiler.gmk))
|
||||||
|
|
||||||
GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)
|
GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)
|
||||||
SRC_DIR := $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes
|
SRC_DIR := $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes
|
||||||
|
|
@ -81,23 +81,23 @@ PROCESSOR_JARS := \
|
||||||
PROCESSOR_PATH := $(call PathList, $(PROCESSOR_JARS))
|
PROCESSOR_PATH := $(call PathList, $(PROCESSOR_JARS))
|
||||||
|
|
||||||
ADD_EXPORTS := \
|
ADD_EXPORTS := \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.aarch64=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.amd64=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.code=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.code.site=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.code.stack=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.common=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.common=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.hotspot=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.hotspot.aarch64=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.hotspot.amd64=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.hotspot.events=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.events=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.hotspot.sparc=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.hotspotvmconfig=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspotvmconfig=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.inittimer=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.inittimer=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.runtime=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.services=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.services=ALL-UNNAMED \
|
||||||
--add-exports jdk.vm.ci/jdk.vm.ci.sparc=ALL-UNNAMED \
|
--add-exports jdk.internal.vm.ci/jdk.vm.ci.sparc=ALL-UNNAMED \
|
||||||
#
|
#
|
||||||
|
|
||||||
$(GENSRC_DIR)/_gensrc_proc_done: $(PROC_SRCS) $(PROCESSOR_JARS)
|
$(GENSRC_DIR)/_gensrc_proc_done: $(PROC_SRCS) $(PROCESSOR_JARS)
|
||||||
|
|
@ -138,7 +138,7 @@ $(GENSRC_DIR)/module-info.java.extra: $(GENSRC_DIR)/_gensrc_proc_done
|
||||||
$(ECHO) "uses org.graalvm.compiler.options.OptionDescriptors;" >> $@; \
|
$(ECHO) "uses org.graalvm.compiler.options.OptionDescriptors;" >> $@; \
|
||||||
$(ECHO) "provides org.graalvm.compiler.options.OptionDescriptors with" >> $@; \
|
$(ECHO) "provides org.graalvm.compiler.options.OptionDescriptors with" >> $@; \
|
||||||
for i in $$($(FIND) $(GENSRC_DIR) -name '*_OptionDescriptors.java'); do \
|
for i in $$($(FIND) $(GENSRC_DIR) -name '*_OptionDescriptors.java'); do \
|
||||||
c=$$($(ECHO) $$i | $(SED) 's:.*/jdk\.vm\.compiler/\(.*\)\.java:\1:' | $(TR) '/' '.'); \
|
c=$$($(ECHO) $$i | $(SED) 's:.*/jdk\.internal\.vm\.compiler/\(.*\)\.java:\1:' | $(TR) '/' '.'); \
|
||||||
$(ECHO) " $$c," >> $@; \
|
$(ECHO) " $$c," >> $@; \
|
||||||
done; \
|
done; \
|
||||||
$(ECHO) " ;" >> $@;
|
$(ECHO) " ;" >> $@;
|
||||||
|
|
@ -112,8 +112,10 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||||
-relativeSrcInclude src \
|
-relativeSrcInclude src \
|
||||||
-hidePath .hg \
|
-hidePath .hg \
|
||||||
-hidePath .jcheck \
|
-hidePath .jcheck \
|
||||||
|
-hidePath jdk.aot \
|
||||||
-hidePath jdk.hotspot.agent \
|
-hidePath jdk.hotspot.agent \
|
||||||
-hidePath jdk.vm.ci \
|
-hidePath jdk.internal.vm.ci \
|
||||||
|
-hidePath jdk.internal.vm.compiler \
|
||||||
-hidePath jdk.jfr \
|
-hidePath jdk.jfr \
|
||||||
-compiler VC10 \
|
-compiler VC10 \
|
||||||
-jdkTargetRoot $(call FixPath, $(JDK_OUTPUTDIR)) \
|
-jdkTargetRoot $(call FixPath, $(JDK_OUTPUTDIR)) \
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,6 @@
|
||||||
|
|
||||||
module jdk.aot {
|
module jdk.aot {
|
||||||
requires jdk.management;
|
requires jdk.management;
|
||||||
requires jdk.vm.ci;
|
requires jdk.internal.vm.ci;
|
||||||
requires jdk.vm.compiler;
|
requires jdk.internal.vm.compiler;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue