comparison src/share/tools/ProjectCreator/BuildConfig.java @ 4597:8bc6f680a88d

fixed visual studio project files
author Christian Haeubl <christian.haeubl@oracle.com>
date Tue, 14 Feb 2012 15:01:36 -0800
parents 76841bdd5f3e
children 0f899c0b7e86
comparison
equal deleted inserted replaced
4596:6845b56f7ce0 4597:8bc6f680a88d
66 String outDir = buildBase; 66 String outDir = buildBase;
67 String value = System.getenv("OUT_DIR"); 67 String value = System.getenv("OUT_DIR");
68 if (value != null) { 68 if (value != null) {
69 outDir = value; 69 outDir = value;
70 } 70 }
71 if(outDir.endsWith("fastdebug")) {
72 outDir = outDir.substring(0, outDir.lastIndexOf("fastdebug") - 1);
73 } else if (outDir.endsWith("debug")) {
74 outDir = outDir.substring(0, outDir.lastIndexOf("debug") - 1);
75 }
76 71
77 if (!build.equals("product")) { 72 int lastDirectorySeparator = Math.max(outDir.lastIndexOf("/"), outDir.lastIndexOf("\\"));
78 outDir += Util.sep + build; 73 if (lastDirectorySeparator >= 0) {
79 } 74 outDir = outDir.substring(0, lastDirectorySeparator);
80 outDir += Util.sep + "jre" + Util.sep + "bin"; 75 }
76
77 outDir += Util.sep + build + Util.sep + "bin";
81 if (flavour.equals("graal")) { 78 if (flavour.equals("graal")) {
82 outDir += Util.sep + "graal"; 79 outDir += Util.sep + "graal";
83 } else if (flavour.equals("compiler1")) { 80 } else if (flavour.equals("compiler1")) {
84 outDir += Util.sep + "client"; 81 outDir += Util.sep + "client";
85 } else { 82 } else {