comparison make/windows/create.bat @ 12044:6aef5b6bbdd8

Merge.
author Doug Simon <doug.simon@oracle.com>
date Thu, 10 Oct 2013 18:26:09 +0200
parents 3cce976666d9
children cefad50507d8
comparison
equal deleted inserted replaced
12043:e6fd83e09082 12044:6aef5b6bbdd8
1 @echo off 1 @echo off
2 REM 2 REM
3 REM Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. 3 REM Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
4 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5 REM 5 REM
6 REM This code is free software; you can redistribute it and/or modify it 6 REM This code is free software; you can redistribute it and/or modify it
7 REM under the terms of the GNU General Public License version 2 only, as 7 REM under the terms of the GNU General Public License version 2 only, as
8 REM published by the Free Software Foundation. 8 REM published by the Free Software Foundation.
150 echo HotSpotJDKDist=%HotSpotJDKDist% 150 echo HotSpotJDKDist=%HotSpotJDKDist%
151 151
152 152
153 REM This is now safe to do. 153 REM This is now safe to do.
154 :copyfiles 154 :copyfiles
155 for /D %%i in (graal, compiler1, compiler2, tiered, core) do ( 155 for /D %%i in (graal, compiler1, compiler2, tiered) do (
156 if NOT EXIST %HotSpotBuildSpace%\%%i\generated mkdir %HotSpotBuildSpace%\%%i\generated 156 if NOT EXIST %HotSpotBuildSpace%\%%i\generated mkdir %HotSpotBuildSpace%\%%i\generated
157 copy %HotSpotWorkSpace%\make\windows\projectfiles\%%i\* %HotSpotBuildSpace%\%%i\generated > NUL 157 copy %HotSpotWorkSpace%\make\windows\projectfiles\%%i\* %HotSpotBuildSpace%\%%i\generated > NUL
158 ) 158 )
159 159
160 REM force regneration of ProjectFile 160 REM force regneration of ProjectFile
161 if exist %ProjectFile% del %ProjectFile% 161 if exist %ProjectFile% del %ProjectFile%
162 162
163 for /D %%i in (graal, compiler1, compiler2, tiered, core) do ( 163 for /D %%i in (graal, compiler1, compiler2, tiered) do (
164 echo -- %%i -- 164 echo -- %%i --
165 echo # Generated file! > %HotSpotBuildSpace%\%%i\local.make 165 echo # Generated file! > %HotSpotBuildSpace%\%%i\local.make
166 echo # Changing a variable below and then deleting %ProjectFile% will cause >> %HotSpotBuildSpace%\%%i\local.make 166 echo # Changing a variable below and then deleting %ProjectFile% will cause >> %HotSpotBuildSpace%\%%i\local.make
167 echo # %ProjectFile% to be regenerated with the new values. Changing the >> %HotSpotBuildSpace%\%%i\local.make 167 echo # %ProjectFile% to be regenerated with the new values. Changing the >> %HotSpotBuildSpace%\%%i\local.make
168 echo # version requires rerunning create.bat. >> %HotSpotBuildSpace%\%%i\local.make 168 echo # version requires rerunning create.bat. >> %HotSpotBuildSpace%\%%i\local.make