comparison src/share/tools/ProjectCreator/BuildConfig.java @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 0f899c0b7e86 2eeebe4b4213
children e522a00b91aa
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
1 /* 1 /*
2 * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
271 } 271 }
272 272
273 sysDefines.add("_WINDOWS"); 273 sysDefines.add("_WINDOWS");
274 sysDefines.add("HOTSPOT_BUILD_USER=\\\""+System.getProperty("user.name")+"\\\""); 274 sysDefines.add("HOTSPOT_BUILD_USER=\\\""+System.getProperty("user.name")+"\\\"");
275 sysDefines.add("HOTSPOT_BUILD_TARGET=\\\""+get("Build")+"\\\""); 275 sysDefines.add("HOTSPOT_BUILD_TARGET=\\\""+get("Build")+"\\\"");
276 sysDefines.add("INCLUDE_TRACE");
276 sysDefines.add("_JNI_IMPLEMENTATION_"); 277 sysDefines.add("_JNI_IMPLEMENTATION_");
277 if (vars.get("PlatformName").equals("Win32")) { 278 if (vars.get("PlatformName").equals("Win32")) {
278 sysDefines.add("HOTSPOT_LIB_ARCH=\\\"i386\\\""); 279 sysDefines.add("HOTSPOT_LIB_ARCH=\\\"i386\\\"");
279 } else { 280 } else {
280 sysDefines.add("HOTSPOT_LIB_ARCH=\\\"amd64\\\""); 281 sysDefines.add("HOTSPOT_LIB_ARCH=\\\"amd64\\\"");