Mercurial > hg > graal-jvmci-8
changeset 22618:452ef008f3c3
adapt to mx change in terms of where generated output is placed
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Sun, 27 Sep 2015 15:10:30 +0200 |
| parents | e8f298580f99 |
| children | 0f13373f18d0 |
| files | hotspot/.project make/bsd/makefiles/vm.make make/jvmci.make make/linux/makefiles/vm.make make/solaris/makefiles/vm.make make/windows/makefiles/projectcreator.make mx.jvmci/mx_jvmci_makefile.py mx.jvmci/suite.py |
| diffstat | 8 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/.project Fri Sep 25 09:58:47 2015 -0700 +++ b/hotspot/.project Sun Sep 27 15:10:30 2015 +0200 @@ -113,7 +113,7 @@ <link> <name>generated_java_processor</name> <type>2</type> - <locationURI>PARENT-1-PROJECT_LOC/jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot</locationURI> + <locationURI>PARENT-1-PROJECT_LOC/mxbuild/jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot</locationURI> </link> <link> <name>linux</name>
--- a/make/bsd/makefiles/vm.make Fri Sep 25 09:58:47 2015 -0700 +++ b/make/bsd/makefiles/vm.make Sun Sep 27 15:10:30 2015 +0200 @@ -215,7 +215,7 @@ JVMCI_SPECIFIC_FILES := jvmci\* else JVMCI_SPECIFIC_FILES := - Src_Dirs_I += $(HS_COMMON_SRC)/../jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot + Src_Dirs_I += $(HS_COMMON_SRC)/../mxbuild/jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot endif # Always exclude these.
--- a/make/jvmci.make Fri Sep 25 09:58:47 2015 -0700 +++ b/make/jvmci.make Sun Sep 27 15:10:30 2015 +0200 @@ -40,7 +40,7 @@ @# Since all projects are built together with one javac call we cannot determine @# which project contains HotSpotVMConfig.inline.hpp so we hardcode it. $(eval vmconfig := $(1)/hotspot/HotSpotVMConfig.inline.hpp) - $(eval vmconfigDest := $(HS_COMMON_SRC)/../jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot) + $(eval vmconfigDest := $(HS_COMMON_SRC)/../mxbuild/jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot) $(QUIETLY) test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest)) endef
--- a/make/linux/makefiles/vm.make Fri Sep 25 09:58:47 2015 -0700 +++ b/make/linux/makefiles/vm.make Sun Sep 27 15:10:30 2015 +0200 @@ -199,7 +199,7 @@ JVMCI_SPECIFIC_FILES := jvmci\* else JVMCI_SPECIFIC_FILES := - Src_Dirs_I += $(HS_COMMON_SRC)/../jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot + Src_Dirs_I += $(HS_COMMON_SRC)/../mxbuild/jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot endif # Always exclude these.
--- a/make/solaris/makefiles/vm.make Fri Sep 25 09:58:47 2015 -0700 +++ b/make/solaris/makefiles/vm.make Sun Sep 27 15:10:30 2015 +0200 @@ -211,7 +211,7 @@ JVMCI_SPECIFIC_FILES := jvmci\* else JVMCI_SPECIFIC_FILES := - Src_Dirs_I += $(HS_COMMON_SRC)/../jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot + Src_Dirs_I += $(HS_COMMON_SRC)/../mxbuild/jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot endif # Always exclude these.
--- a/make/windows/makefiles/projectcreator.make Fri Sep 25 09:58:47 2015 -0700 +++ b/make/windows/makefiles/projectcreator.make Sun Sep 27 15:10:30 2015 +0200 @@ -56,7 +56,7 @@ -relativeInclude src\os\windows\vm \ -relativeInclude src\os_cpu\windows_$(Platform_arch)\vm \ -relativeInclude src\cpu\$(Platform_arch)\vm \ - -relativeInclude jvmci\jdk.internal.jvmci.hotspot\src_gen\hotspot \ + -relativeInclude mxbuild\jvmci\jdk.internal.jvmci.hotspot\src_gen\hotspot \ -absoluteInclude $(HOTSPOTBUILDSPACE)/%f/generated \ -relativeSrcInclude src \ -absoluteSrcInclude $(HOTSPOTBUILDSPACE) \ @@ -152,7 +152,7 @@ ProjectCreatorIDEOptionsIgnoreJVMCI=\ -ignorePath_TARGET src/share/vm/jvmci \ - -ignorePath_TARGET jvmci\jdk.internal.jvmci.hotspot\src_gen\hotspot \ + -ignorePath_TARGET mxbuild/jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot \ -ignorePath_TARGET vm/jvmci ProjectCreatorIDEOptionsIgnoreCompiler2=\
--- a/mx.jvmci/mx_jvmci_makefile.py Fri Sep 25 09:58:47 2015 -0700 +++ b/mx.jvmci/mx_jvmci_makefile.py Sun Sep 27 15:10:30 2015 +0200 @@ -189,7 +189,7 @@ @# Since all projects are built together with one javac call we cannot determine @# which project contains HotSpotVMConfig.inline.hpp so we hardcode it. $(eval vmconfig := $(1)/hotspot/HotSpotVMConfig.inline.hpp) - $(eval vmconfigDest := $(HS_COMMON_SRC)/../jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot) + $(eval vmconfigDest := $(HS_COMMON_SRC)/../mxbuild/jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot) $(QUIETLY) test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest)) endef