# HG changeset patch
# User Andreas Woess <andreas.woess@jku.at>
# Date 1372084832 -7200
# Node ID 9d995ba8b82c708fafc3176594bff988721122a1
# Parent  fcc5fb4e2b9ea442e50ce3064efb7c119555aee4# Parent  f40010b67b6e668c8b6772cdc19ae56f77a2bea6
Merge

diff -r fcc5fb4e2b9e -r 9d995ba8b82c make/windows/makefiles/projectcreator.make
--- a/make/windows/makefiles/projectcreator.make	Mon Jun 24 13:40:46 2013 +0200
+++ b/make/windows/makefiles/projectcreator.make	Mon Jun 24 16:40:32 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 \
diff -r fcc5fb4e2b9e -r 9d995ba8b82c src/share/tools/ProjectCreator/BuildConfig.java
--- a/src/share/tools/ProjectCreator/BuildConfig.java	Mon Jun 24 13:40:46 2013 +0200
+++ b/src/share/tools/ProjectCreator/BuildConfig.java	Mon Jun 24 16:40:32 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);