stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8189183: [AOT] Fix eclipse project generation after repo consolidation

Browse Source 
Reviewed-by: dlong
This commit is contained in:
Igor Veresov 2017-10-11 16:19:09 -07:00
parent d3466f7dce
commit c0c2da94f4
4 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/.mx.jvmci/hotspot/templates/eclipse/cproject
View File

@ -70,7 +70,7 @@
</toolChain> </toolChain>
</folderInfo> </folderInfo>
<sourceEntries> <sourceEntries>
<entry excluding="cpu/vm/templateTable_x86_32.cpp|cpu/vm/templateInterpreter_x86_32.cpp|cpu/vm/stubRoutines_x86_32.cpp|cpu/vm/stubGenerator_x86_32.cpp|cpu/vm/sharedRuntime_x86_32.cpp|cpu/vm/jniFastGetField_x86_32.cpp|cpu/vm/interpreterRT_x86_32.cpp|cpu/vm/interpreter_x86_32.cpp|cpu/vm/interp_masm_x86_32.cpp|cpu/vm/vtableStubs_x86_32.cpp" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/> <entry excluding="cpu/x86/templateTable_x86_32.cpp|cpu/x86/templateInterpreter_x86_32.cpp|cpu/x86/stubRoutines_x86_32.cpp|cpu/x86/stubGenerator_x86_32.cpp|cpu/x86/sharedRuntime_x86_32.cpp|cpu/x86/jniFastGetField_x86_32.cpp|cpu/x86/interpreterRT_x86_32.cpp|cpu/x86/interpreter_x86_32.cpp|cpu/x86/interp_masm_x86_32.cpp|cpu/x86/vtableStubs_x86_32.cpp" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
</sourceEntries> </sourceEntries>
</configuration> </configuration>
</storageModule> </storageModule>

24
src/hotspot/.mx.jvmci/mx_jvmci.py
View File

@ -256,14 +256,10 @@ class HotSpotProject(mx.NativeProject):
""" """
roots = [ roots = [
'ASSEMBLY_EXCEPTION', 'cpu',
'LICENSE', 'os',
'README', 'os_cpu',
'THIRD_PARTY_README', 'share'
'agent',
'make',
'src',
'test'
] ]
for jvmVariant in _jdkJvmVariants: for jvmVariant in _jdkJvmVariants:
@ -605,6 +601,16 @@ def _get_openjdk_cpu():
def _get_openjdk_os_cpu(): def _get_openjdk_os_cpu():
return _get_openjdk_os() + '-' + _get_openjdk_cpu() return _get_openjdk_os() + '-' + _get_openjdk_cpu()
def _get_jdk_dir():
suiteParentDir = dirname(_suite.dir)
# suitParentDir is now something like: /some_prefix/jdk10-hs/open/src
pathComponents = suiteParentDir.split(os.sep)
for i in range(0, len(pathComponents)):
if pathComponents[i] in ["open", "src"]:
del pathComponents[i:]
break
return os.path.join(os.sep, *pathComponents)
def _get_jdk_build_dir(debugLevel=None): def _get_jdk_build_dir(debugLevel=None):
""" """
Gets the directory into which the JDK is built. This directory contains Gets the directory into which the JDK is built. This directory contains
@ -613,7 +619,7 @@ def _get_jdk_build_dir(debugLevel=None):
if debugLevel is None: if debugLevel is None:
debugLevel = _vm.debugLevel debugLevel = _vm.debugLevel
name = '{}-{}-{}-{}'.format(_get_openjdk_os_cpu(), 'normal', _vm.jvmVariant, debugLevel) name = '{}-{}-{}-{}'.format(_get_openjdk_os_cpu(), 'normal', _vm.jvmVariant, debugLevel)
return join(dirname(_suite.dir), 'build', name) return join(_get_jdk_dir(), 'build', name)
_jvmci_bootclasspath_prepends = [] _jvmci_bootclasspath_prepends = []

42
src/hotspot/.mx.jvmci/suite.py
View File

@ -24,9 +24,7 @@ suite = {
"defaultLicense" : "GPLv2-CPE", "defaultLicense" : "GPLv2-CPE",
# This puts mx/ as a sibling of the JDK build configuration directories "outputRoot" : "../../build/mx/hotspot",
# (e.g., macosx-x86_64-normal-server-release).
"outputRoot" : "../build/mx/hotspot",
# ------------- Libraries ------------- # ------------- Libraries -------------
@ -43,7 +41,7 @@ suite = {
# ------------- JVMCI:Service ------------- # ------------- JVMCI:Service -------------
"jdk.vm.ci.services" : { "jdk.vm.ci.services" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"javaCompliance" : "9", "javaCompliance" : "9",
"workingSets" : "API,JVMCI", "workingSets" : "API,JVMCI",
@ -52,7 +50,7 @@ suite = {
# ------------- JVMCI:API ------------- # ------------- JVMCI:API -------------
"jdk.vm.ci.common" : { "jdk.vm.ci.common" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"checkstyle" : "jdk.vm.ci.services", "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "9", "javaCompliance" : "9",
@ -60,7 +58,7 @@ suite = {
}, },
"jdk.vm.ci.meta" : { "jdk.vm.ci.meta" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"checkstyle" : "jdk.vm.ci.services", "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "9", "javaCompliance" : "9",
@ -68,7 +66,7 @@ suite = {
}, },
"jdk.vm.ci.code" : { "jdk.vm.ci.code" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"dependencies" : ["jdk.vm.ci.meta"], "dependencies" : ["jdk.vm.ci.meta"],
"checkstyle" : "jdk.vm.ci.services", "checkstyle" : "jdk.vm.ci.services",
@ -77,7 +75,7 @@ suite = {
}, },
"jdk.vm.ci.code.test" : { "jdk.vm.ci.code.test" : {
"subDir" : "test/compiler/jvmci", "subDir" : "../../test/hotspot/jtreg/compiler/jvmci",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"dependencies" : [ "dependencies" : [
"mx:JUNIT", "mx:JUNIT",
@ -92,7 +90,7 @@ suite = {
}, },
"jdk.vm.ci.runtime" : { "jdk.vm.ci.runtime" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"dependencies" : [ "dependencies" : [
"jdk.vm.ci.code", "jdk.vm.ci.code",
@ -104,7 +102,7 @@ suite = {
}, },
"jdk.vm.ci.runtime.test" : { "jdk.vm.ci.runtime.test" : {
"subDir" : "test/compiler/jvmci", "subDir" : "../../test/hotspot/jtreg/compiler/jvmci",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"dependencies" : [ "dependencies" : [
"mx:JUNIT", "mx:JUNIT",
@ -119,7 +117,7 @@ suite = {
# ------------- JVMCI:HotSpot ------------- # ------------- JVMCI:HotSpot -------------
"jdk.vm.ci.aarch64" : { "jdk.vm.ci.aarch64" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"dependencies" : ["jdk.vm.ci.code"], "dependencies" : ["jdk.vm.ci.code"],
"checkstyle" : "jdk.vm.ci.services", "checkstyle" : "jdk.vm.ci.services",
@ -128,7 +126,7 @@ suite = {
}, },
"jdk.vm.ci.amd64" : { "jdk.vm.ci.amd64" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"dependencies" : ["jdk.vm.ci.code"], "dependencies" : ["jdk.vm.ci.code"],
"checkstyle" : "jdk.vm.ci.services", "checkstyle" : "jdk.vm.ci.services",
@ -137,7 +135,7 @@ suite = {
}, },
"jdk.vm.ci.sparc" : { "jdk.vm.ci.sparc" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"dependencies" : ["jdk.vm.ci.code"], "dependencies" : ["jdk.vm.ci.code"],
"checkstyle" : "jdk.vm.ci.services", "checkstyle" : "jdk.vm.ci.services",
@ -146,7 +144,7 @@ suite = {
}, },
"jdk.vm.ci.hotspot" : { "jdk.vm.ci.hotspot" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"dependencies" : [ "dependencies" : [
"jdk.vm.ci.common", "jdk.vm.ci.common",
@ -163,7 +161,7 @@ suite = {
}, },
"jdk.vm.ci.hotspot.test" : { "jdk.vm.ci.hotspot.test" : {
"subDir" : "test/compiler/jvmci", "subDir" : "../../test/hotspot/jtreg/compiler/jvmci",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"dependencies" : [ "dependencies" : [
"TESTNG", "TESTNG",
@ -175,7 +173,7 @@ suite = {
}, },
"jdk.vm.ci.hotspot.aarch64" : { "jdk.vm.ci.hotspot.aarch64" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"dependencies" : [ "dependencies" : [
"jdk.vm.ci.aarch64", "jdk.vm.ci.aarch64",
@ -187,7 +185,7 @@ suite = {
}, },
"jdk.vm.ci.hotspot.amd64" : { "jdk.vm.ci.hotspot.amd64" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"dependencies" : [ "dependencies" : [
"jdk.vm.ci.amd64", "jdk.vm.ci.amd64",
@ -199,7 +197,7 @@ suite = {
}, },
"jdk.vm.ci.hotspot.sparc" : { "jdk.vm.ci.hotspot.sparc" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"dependencies" : [ "dependencies" : [
"jdk.vm.ci.sparc", "jdk.vm.ci.sparc",
@ -221,12 +219,12 @@ suite = {
# ------------- Distributions ------------- # ------------- Distributions -------------
"JVMCI_SERVICES" : { "JVMCI_SERVICES" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"dependencies" : ["jdk.vm.ci.services"], "dependencies" : ["jdk.vm.ci.services"],
}, },
"JVMCI_API" : { "JVMCI_API" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"dependencies" : [ "dependencies" : [
"jdk.vm.ci.runtime", "jdk.vm.ci.runtime",
"jdk.vm.ci.common", "jdk.vm.ci.common",
@ -240,7 +238,7 @@ suite = {
}, },
"JVMCI_HOTSPOT" : { "JVMCI_HOTSPOT" : {
"subDir" : "src/jdk.internal.vm.ci/share/classes", "subDir" : "../jdk.internal.vm.ci/share/classes",
"dependencies" : [ "dependencies" : [
"jdk.vm.ci.hotspot.aarch64", "jdk.vm.ci.hotspot.aarch64",
"jdk.vm.ci.hotspot.amd64", "jdk.vm.ci.hotspot.amd64",
@ -253,7 +251,7 @@ suite = {
}, },
"JVMCI_TEST" : { "JVMCI_TEST" : {
"subDir" : "test/compiler/jvmci", "subDir" : "../../test/hotspot/jtreg/compiler/jvmci",
"dependencies" : [ "dependencies" : [
"jdk.vm.ci.runtime.test", "jdk.vm.ci.runtime.test",
], ],

2
src/jdk.internal.vm.compiler/.mx.graal/suite.py
View File

@ -6,7 +6,7 @@ suite = {
# This puts mx/ as a sibling of the JDK build configuration directories # This puts mx/ as a sibling of the JDK build configuration directories
# (e.g., macosx-x86_64-normal-server-release). # (e.g., macosx-x86_64-normal-server-release).
"outputRoot" : "../../../build/mx/hotspot", "outputRoot" : "../../build/mx/hotspot",
"jdklibraries" : { "jdklibraries" : {
"JVMCI_SERVICES" : { "JVMCI_SERVICES" : {