Mercurial > hg > truffle
changeset 10510:f40010b67b6e
fix windows build directory
author | Andreas Woess <andreas.woess@jku.at> |
---|---|
date | Mon, 24 Jun 2013 12:57:44 +0200 |
parents | 329c22feda1f |
children | 9d995ba8b82c |
files | make/windows/makefiles/projectcreator.make src/share/tools/ProjectCreator/BuildConfig.java |
diffstat | 2 files changed, 20 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/windows/makefiles/projectcreator.make Mon Jun 24 11:56:24 2013 +0200 +++ b/make/windows/makefiles/projectcreator.make Mon Jun 24 12:57:44 2013 +0200 @@ -104,8 +104,8 @@ -jdkTargetRoot $(HOTSPOTJDKDIST) \ -define ALIGN_STACK_FRAMES \ -define VM_LITTLE_ENDIAN \ - -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LD_VER)" \ - -postbuild "" "Building hotspot.exe..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) nmake -f $(HOTSPOTWORKSPACE)\make\windows\projectfiles\common\Makefile LOCAL_MAKE=$(HOTSPOTBUILDSPACE)\%f\local.make JAVA_HOME=$(HOTSPOTJDKDIST) launcher" \ + -prelink "" "Generating vm.def..." "cd %o set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LD_VER)" \ + -postbuild "" "Building hotspot.exe..." "cd %o set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) nmake -f $(HOTSPOTWORKSPACE)\make\windows\projectfiles\common\Makefile LOCAL_MAKE=$(HOTSPOTBUILDSPACE)\%f\local.make JAVA_HOME=$(HOTSPOTJDKDIST) launcher" \ -ignoreFile jsig.c \ -ignoreFile jvmtiEnvRecommended.cpp \ -ignoreFile jvmtiEnvStub.cpp \
--- a/src/share/tools/ProjectCreator/BuildConfig.java Mon Jun 24 11:56:24 2013 +0200 +++ b/src/share/tools/ProjectCreator/BuildConfig.java Mon Jun 24 12:57:44 2013 +0200 @@ -67,6 +67,24 @@ String outDir = buildBase; String jdkTargetRoot = getFieldString(null, "JdkTargetRoot"); + String value = System.getenv("OUT_DIR"); + if (value != null) { + outDir = value; + int lastDirectorySeparator = Math.max(outDir.lastIndexOf("/"), outDir.lastIndexOf("\\")); + if (lastDirectorySeparator >= 0) { + outDir = outDir.substring(0, lastDirectorySeparator); + } + outDir += Util.sep + build + Util.sep + "jre" + Util.sep + "bin"; + if (flavour.equals("graal")) { + outDir += Util.sep + "graal"; + } else if (flavour.equals("compiler1")) { + outDir += Util.sep + "client"; + } else { + outDir += Util.sep + "server"; + } + buildBase = outDir; + } + put("Id", flavourBuild); put("OutputDir", outDir); put("SourceBase", sourceBase);