comparison make/windows/create.bat @ 8883:b9a918201d47

Merge with hsx25
author Gilles Duboscq <duboscq@ssw.jku.at>
date Sat, 06 Apr 2013 20:04:06 +0200
parents 76841bdd5f3e 6b748c9e1845
children 6cae606d563f
comparison
equal deleted inserted replaced
8660:d47b52b0ff68 8883:b9a918201d47
35 REM 35 REM
36 REM Note: Running this batch file from the Windows command shell requires 36 REM Note: Running this batch file from the Windows command shell requires
37 REM that "grep" be accessible on the PATH. An MKS install does this. 37 REM that "grep" be accessible on the PATH. An MKS install does this.
38 REM 38 REM
39 39
40 rem cl 2>NUL >NUL 40 cl 2>NUL >NUL
41 rem if %errorlevel% == 0 goto nexttest 41 if %errorlevel% == 0 goto nexttest
42 rem echo Make sure cl.exe is in your PATH before running this script. 42 echo Make sure cl.exe is in your PATH before running this script.
43 rem goto end 43 goto end
44 44
45 :nexttest 45 :nexttest
46 grep -V 2>NUL >NUL 46 grep -V 2>NUL >NUL
47 if %errorlevel% == 0 goto testit 47 if %errorlevel% == 0 goto testit
48 echo Make sure grep.exe is in your PATH before running this script. Either cygwin or MKS should work. 48 echo Make sure grep.exe is in your PATH before running this script. Either cygwin or MKS should work.
49 goto end 49 goto end
50 50
51 51
52 :testit 52 :testit
53 cl 2>&1 | grep "x64" >NUL
54 if %errorlevel% == 0 goto amd64
55 cl 2>&1 | grep "x64" >NUL 53 cl 2>&1 | grep "x64" >NUL
56 if %errorlevel% == 0 goto amd64 54 if %errorlevel% == 0 goto amd64
57 set ARCH=x86 55 set ARCH=x86
58 set BUILDARCH=i486 56 set BUILDARCH=i486
59 set Platform_arch=x86 57 set Platform_arch=x86
148 echo HotSpotJDKDist=%HotSpotJDKDist% 146 echo HotSpotJDKDist=%HotSpotJDKDist%
149 147
150 148
151 REM This is now safe to do. 149 REM This is now safe to do.
152 :copyfiles 150 :copyfiles
153 for /D %%i in (graal, compiler1, compiler2, tiered, core, kernel) do ( 151 for /D %%i in (graal, compiler1, compiler2, tiered, core) do (
154 if NOT EXIST %HotSpotBuildSpace%\%%i\generated mkdir %HotSpotBuildSpace%\%%i\generated 152 if NOT EXIST %HotSpotBuildSpace%\%%i\generated mkdir %HotSpotBuildSpace%\%%i\generated
155 copy %HotSpotWorkSpace%\make\windows\projectfiles\%%i\* %HotSpotBuildSpace%\%%i\generated > NUL 153 copy %HotSpotWorkSpace%\make\windows\projectfiles\%%i\* %HotSpotBuildSpace%\%%i\generated > NUL
156 ) 154 )
157 155
158 REM force regneration of ProjectFile 156 REM force regneration of ProjectFile
159 if exist %ProjectFile% del %ProjectFile% 157 if exist %ProjectFile% del %ProjectFile%
160 158
161 for /D %%i in (graal, compiler1, compiler2, tiered, core, kernel) do ( 159 for /D %%i in (graal, compiler1, compiler2, tiered, core) do (
162 echo -- %%i -- 160 echo -- %%i --
163 echo # Generated file! > %HotSpotBuildSpace%\%%i\local.make 161 echo # Generated file! > %HotSpotBuildSpace%\%%i\local.make
164 echo # Changing a variable below and then deleting %ProjectFile% will cause >> %HotSpotBuildSpace%\%%i\local.make 162 echo # Changing a variable below and then deleting %ProjectFile% will cause >> %HotSpotBuildSpace%\%%i\local.make
165 echo # %ProjectFile% to be regenerated with the new values. Changing the >> %HotSpotBuildSpace%\%%i\local.make 163 echo # %ProjectFile% to be regenerated with the new values. Changing the >> %HotSpotBuildSpace%\%%i\local.make
166 echo # version requires rerunning create.bat. >> %HotSpotBuildSpace%\%%i\local.make 164 echo # version requires rerunning create.bat. >> %HotSpotBuildSpace%\%%i\local.make