Mercurial > hg > truffle
comparison src/share/tools/ProjectCreator/BuildConfig.java @ 2184:5d801e6b9a80
Imported build system changes from other repository.
author | Thomas Wuerthinger <thomas.wuerthinger@gmail.com> |
---|---|
date | Mon, 21 Feb 2011 19:17:10 +0100 |
parents | 06f017f7daa7 |
children | 2ab52cda08e5 |
comparison
equal
deleted
inserted
replaced
2183:eed52202caea | 2184:5d801e6b9a80 |
---|---|
59 put("Build", build); | 59 put("Build", build); |
60 | 60 |
61 // ones mentioned above were needed to expand format | 61 // ones mentioned above were needed to expand format |
62 String buildBase = expandFormat(getFieldString(null, "BuildBase")); | 62 String buildBase = expandFormat(getFieldString(null, "BuildBase")); |
63 String sourceBase = getFieldString(null, "SourceBase"); | 63 String sourceBase = getFieldString(null, "SourceBase"); |
64 String outDir = buildBase; | 64 String outDir = sourceBase + Util.sep + "java"; |
65 if (Util.os().equals("x64")) { | |
66 outDir += "64"; | |
67 } | |
68 if (!build.equals("product")) { | |
69 outDir += Util.sep + "fastdebug"; | |
70 } | |
71 outDir += Util.sep + "jre" + Util.sep + "bin"; | |
72 if (flavour.equals("compiler1")) { | |
73 outDir += Util.sep + "client"; | |
74 } else { | |
75 outDir += Util.sep + "server"; | |
76 } | |
77 buildBase = outDir; | |
65 | 78 |
66 put("Id", flavourBuild); | 79 put("Id", flavourBuild); |
67 put("OutputDir", outDir); | 80 put("OutputDir", outDir); |
68 put("SourceBase", sourceBase); | 81 put("SourceBase", sourceBase); |
69 put("BuildBase", buildBase); | 82 put("BuildBase", buildBase); |
250 return rv; | 263 return rv; |
251 } | 264 } |
252 | 265 |
253 void initDefaultDefines(Vector defines) { | 266 void initDefaultDefines(Vector defines) { |
254 Vector sysDefines = new Vector(); | 267 Vector sysDefines = new Vector(); |
268 | |
255 if( Util.os().equals("Win32")) { | 269 if( Util.os().equals("Win32")) { |
256 sysDefines.add("WIN32"); | 270 sysDefines.add("WIN32"); |
257 sysDefines.add("HOTSPOT_LIB_ARCH=\\\"i386\\\""); | 271 sysDefines.add("HOTSPOT_LIB_ARCH=\\\"i386\\\""); |
258 } else { | 272 } else { |
259 sysDefines.add("_AMD64_"); | 273 sysDefines.add("_AMD64_"); |
260 sysDefines.add("AMD64"); | 274 sysDefines.add("AMD64"); |
261 sysDefines.add("_WIN64"); | 275 sysDefines.add("_WIN64"); |
262 sysDefines.add("_LP64"); | 276 sysDefines.add("_LP64"); |
263 if (System.getenv("MSC_VER") != null) | 277 if (System.getenv("MSC_VER") != null) |
264 sysDefines.add("MSC_VER=" + System.getenv("MSC_VER")); | 278 sysDefines.add("MSC_VER=" + System.getenv("MSC_VER")); |
265 sysDefines.add("HOTSPOT_LIB_ARCH=\\\"amd64\\\""); | 279 sysDefines.add("HOTSPOT_LIB_ARCH=\\\"amd64\\\""); |
266 } | 280 } |
281 | |
267 sysDefines.add("_WINDOWS"); | 282 sysDefines.add("_WINDOWS"); |
268 sysDefines.add("HOTSPOT_BUILD_USER="+System.getProperty("user.name")); | 283 sysDefines.add("HOTSPOT_BUILD_USER=\\\""+System.getProperty("user.name")+"\\\""); |
269 sysDefines.add("HOTSPOT_BUILD_TARGET=\\\""+get("Build")+"\\\""); | 284 sysDefines.add("HOTSPOT_BUILD_TARGET=\\\""+get("Build")+"\\\""); |
270 sysDefines.add("_JNI_IMPLEMENTATION_"); | 285 sysDefines.add("_JNI_IMPLEMENTATION_"); |
286 sysDefines.add("HOTSPOT_LIB_ARCH=\\\"i386\\\""); | |
271 | 287 |
272 sysDefines.addAll(defines); | 288 sysDefines.addAll(defines); |
273 | 289 |
274 put("Define", sysDefines); | 290 put("Define", sysDefines); |
275 } | 291 } |
329 return get("Flavour"); | 345 return get("Flavour"); |
330 } | 346 } |
331 | 347 |
332 String build() { | 348 String build() { |
333 return get("Build"); | 349 return get("Build"); |
350 } | |
351 | |
352 String outputDir() { | |
353 return get("OutputDir"); | |
334 } | 354 } |
335 | 355 |
336 Object getSpecificField(String field) { | 356 Object getSpecificField(String field) { |
337 return getField(get("Id"), field); | 357 return getField(get("Id"), field); |
338 } | 358 } |
519 sb.append(build()); | 539 sb.append(build()); |
520 break; | 540 break; |
521 case 'f': | 541 case 'f': |
522 sb.append(flavour()); | 542 sb.append(flavour()); |
523 break; | 543 break; |
544 case 'o': | |
545 sb.append(outputDir()); | |
546 break; | |
524 default: | 547 default: |
525 sb.append(ch); | 548 sb.append(ch); |
526 sb.append(ch1); | 549 sb.append(ch1); |
527 } | 550 } |
528 i++; | 551 i++; |