make/windows/create.bat

rev 2073 : imported patch vcproj-64

*** 48,60 ****
  echo Make sure grep.exe is in your PATH before running this script. Either cygwin or MKS should work.
  goto end
  
  
  :testit
! cl 2>&1 | grep "IA-64" >NUL
! if %errorlevel% == 0 goto isia64
! cl 2>&1 | grep "AMD64" >NUL
  if %errorlevel% == 0 goto amd64
  set ARCH=x86
  set BUILDARCH=i486
  set Platform_arch=x86
  set Platform_arch_model=x86_32
--- 48,58 ----
  echo Make sure grep.exe is in your PATH before running this script. Either cygwin or MKS should work.
  goto end
  
  
  :testit
! cl 2>&1 | grep "x64" >NUL
  if %errorlevel% == 0 goto amd64
  set ARCH=x86
  set BUILDARCH=i486
  set Platform_arch=x86
  set Platform_arch_model=x86_32
*** 62,77 ****
  :amd64
  set ARCH=x86
  set BUILDARCH=amd64
  set Platform_arch=x86
  set Platform_arch_model=x86_64
- goto done
- :isia64
- set ARCH=ia64
- set BUILDARCH=ia64
- set Platform_arch=ia64
- set Platform_arch_model=ia64
  :done
  
  setlocal
  
  if "%1" == "" goto usage
--- 60,69 ----
*** 79,99 ****
  if not "%2" == "" goto usage
  
  REM Set HotSpotWorkSpace to the directy two steps above this script
  for %%i in ("%~dp0..") do ( set HotSpotWorkSpace=%%~dpi)
  set HotSpotBuildRoot=%HotSpotWorkSpace%build
! set HotSpotBuildSpace=%HotSpotBuildRoot%\vs
  set HotSpotJDKDist=%1
  
  
  REM figure out MSC version
  for /F %%i in ('sh %HotSpotWorkSpace%/make/windows/get_msc_ver.sh') do set %%i
  
  echo **************************************************************
! set ProjectFile=jvm.vcproj
  if "%MSC_VER%" == "1200" (
! set ProjectFile=jvm.dsp
  echo Will generate VC6 project {unsupported}
  ) else (
  if "%MSC_VER%" == "1400" (
  echo Will generate VC8 {Visual Studio 2005}
  ) else (
--- 71,91 ----
  if not "%2" == "" goto usage
  
  REM Set HotSpotWorkSpace to the directy two steps above this script
  for %%i in ("%~dp0..") do ( set HotSpotWorkSpace=%%~dpi)
  set HotSpotBuildRoot=%HotSpotWorkSpace%build
! set HotSpotBuildSpace=%HotSpotBuildRoot%\vs-%BUILDARCH%
  set HotSpotJDKDist=%1
  
  
  REM figure out MSC version
  for /F %%i in ('sh %HotSpotWorkSpace%/make/windows/get_msc_ver.sh') do set %%i
  
  echo **************************************************************
! set ProjectFile=%HotSpotBuildSpace%\jvm.vcproj
  if "%MSC_VER%" == "1200" (
! set ProjectFile=%HotSpotBuildSpace%\jvm.dsp
  echo Will generate VC6 project {unsupported}
  ) else (
  if "%MSC_VER%" == "1400" (
  echo Will generate VC8 {Visual Studio 2005}
  ) else (
*** 161,171 ****
  if NOT EXIST %HotSpotBuildSpace%\%%i\generated mkdir %HotSpotBuildSpace%\%%i\generated
  copy %HotSpotWorkSpace%\make\windows\projectfiles\%%i\* %HotSpotBuildSpace%\%%i\generated > NUL
  )
  
  REM force regneration of ProjectFile
! if exist %HotSpotBuildSpace%\%ProjectFile% del %HotSpotBuildSpace%\%ProjectFile%
  
  for /D %%i in (compiler1, compiler2, tiered, core, kernel) do (
  echo -- %%i --
  echo # Generated file!                                                        >    %HotSpotBuildSpace%\%%i\local.make
  echo # Changing a variable below and then deleting %ProjectFile% will cause  >>    %HotSpotBuildSpace%\%%i\local.make
--- 153,163 ----
  if NOT EXIST %HotSpotBuildSpace%\%%i\generated mkdir %HotSpotBuildSpace%\%%i\generated
  copy %HotSpotWorkSpace%\make\windows\projectfiles\%%i\* %HotSpotBuildSpace%\%%i\generated > NUL
  )
  
  REM force regneration of ProjectFile
! if exist %ProjectFile% del %ProjectFile%
  
  for /D %%i in (compiler1, compiler2, tiered, core, kernel) do (
  echo -- %%i --
  echo # Generated file!                                                        >    %HotSpotBuildSpace%\%%i\local.make
  echo # Changing a variable below and then deleting %ProjectFile% will cause  >>    %HotSpotBuildSpace%\%%i\local.make
*** 180,189 ****
--- 172,182 ----
  echo HOTSPOTJDKDIST=%HotSpotJDKDist%       >>    %HotSpotBuildSpace%\%%i\local.make
  echo ARCH=%ARCH%                           >>    %HotSpotBuildSpace%\%%i\local.make
  echo BUILDARCH=%BUILDARCH%                 >>    %HotSpotBuildSpace%\%%i\local.make
  echo Platform_arch=%Platform_arch%         >>    %HotSpotBuildSpace%\%%i\local.make
  echo Platform_arch_model=%Platform_arch_model% >>    %HotSpotBuildSpace%\%%i\local.make
+ echo MSC_VER=%MSC_VER%                     >>    %HotSpotBuildSpace%\%%i\local.make
  
  for /D %%j in (debug, fastdebug, product) do (
  if NOT EXIST %HotSpotBuildSpace%\%%i\%%j mkdir %HotSpotBuildSpace%\%%i\%%j
  )
  
*** 194,204 ****
  )
  
  pushd %HotSpotBuildRoot%
  
  REM It doesn't matter which variant we use here, "compiler1" is as good as any of the others - we need the common variables
! nmake /nologo /F %HotSpotWorkSpace%/make/windows/projectfiles/common/Makefile LOCAL_MAKE=%HotSpotBuildSpace%\compiler1\local.make %HotSpotBuildRoot%/%ProjectFile%
  
  popd
  
  goto end
  
--- 187,197 ----
  )
  
  pushd %HotSpotBuildRoot%
  
  REM It doesn't matter which variant we use here, "compiler1" is as good as any of the others - we need the common variables
! nmake /nologo /F %HotSpotWorkSpace%/make/windows/projectfiles/common/Makefile LOCAL_MAKE=%HotSpotBuildSpace%\compiler1\local.make %ProjectFile%
  
  popd
  
  goto end