Changeset 20431

Show
Ignore:
Timestamp:
28.08.2009 16:54:32 (10 years ago)
Author:
ak19
Message:

Changed makegs2.bat to always run Microsoft Platform SDK's Setenv.Cmd first since this is now necessary for Visual Studio 8 and onwards (version 8 does not come with windows.h anymore).

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/makegs2.bat

    r20183 r20431  
    66:: Path to VCVARS32.bat -- You can set this variable manually if needed 
    77:: e.g. set VCVARS="C:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT" 
    8 set VCVARS="" 
     8set VCVARS="C:\Program Files\Microsoft Visual Studio 8\VC\bin\vcvars32.bat" 
    99 
    1010:: Path to Microsoft Platform SDK's SetEnv.cmd -- You can set this variable manually if needed 
    11 set SDK_ENV="" 
     11set SDK_ENV="C:\Program Files\Microsoft Platform SDK\SetEnv.Cmd" 
    1212 
    1313 
     
    8585rem Check some known paths to VCVARS32.BAT 
    8686:: if the user has set VCVARS32 don't look in the default places at all 
    87 IF NOT %VCVARS%=="" GOTO PROMPT 
     87IF NOT %VCVARS%=="" echo ******* VCVARS set, checking for MS Platform SDK...& GOTO SET_SDK 
    8888 
    8989:: Visual Studio 2005 Pro --- NOT READY YET 
     
    9999:: Now VCVARS has been set so it can be used when we need it 
    100100 
     101:SET_SDK 
     102rem Check known path(s) to SetEnv.cmd 
     103:: if the user has set SDK_ENV don't look in the default places at all 
     104IF NOT %SDK_ENV%=="" GOTO CALL_SDK 
     105 
     106IF EXIST "%programfiles%\Microsoft Platform SDK\SetEnv.cmd" set SDK_ENV="%programfiles%\Microsoft Platform SDK\SetEnv.cmd" 
     107 
     108IF %SDK_ENV%=="" GOTO ENDNOSDKENV 
     109 
     110:CALL_SDK 
     111call %SDK_ENV% 
     112echo. 
     113echo. 
     114 
     115call %VCVARS% 
     116echo. 
     117echo. 
    101118 
    102119:PROMPT 
     
    124141:: Only compile up the Apache web server if we're asked to 
    125142 
    126 rem Check known path(s) to SetEnv.cmd 
    127 :: if the user has set SDK_ENV don't look in the default places at all 
    128 IF NOT %SDK_ENV%=="" GOTO CALL_SDK 
    129  
    130 IF EXIST "%programfiles%\Microsoft Platform SDK\SetEnv.cmd" set SDK_ENV="%programfiles%\Microsoft Platform SDK\SetEnv.cmd" 
    131  
    132 IF %SDK_ENV%=="" GOTO ENDNOSDKENV 
    133  
    134 :CALL_SDK 
    135 call %SDK_ENV% 
    136 echo. 
    137 echo. 
    138  
    139 call %VCVARS% 
    140 echo. 
    141 echo. 
    142  
    143143:: Now unpack the custom GS2 apache web server tar.gz file 
    144144IF NOT EXIST .\runtime-src\packages\apache-httpd\httpd-2.2.11\nul .\bin\windows\gunzip.exe -cd .\runtime-src\packages\apache-httpd\httpd-*.tar.gz | .\bin\windows\tar.exe xv --directory=./runtime-src/packages/apache-httpd 
     
    149149 
    150150:WITHOUTLOCALLIB 
    151 call %VCVARS% 
    152151echo. 
    153152echo. 
     
    156155 
    157156:WITHLOCALLIB 
    158 call %VCVARS% 
    159157echo. 
    160158echo. 
     
    163161 
    164162:WITHBOTH 
    165 call %VCVARS% 
    166163echo. 
    167164echo. 
     
    236233echo. 
    237234echo /!\ Error /!\ - Not able to find 'SetEnv.cmd'. 
    238 echo You need Microsoft Platform SDK to compile up the Apache web server 
    239 echo but we were unable to find the SDK file SetEnv.cmd on your system. 
    240 echo. 
    241 echo Please edit the makegs2.bat file and manually set the full path to  
    242 echo SetEnv.cmd then run this script again. 
     235echo We were unable to find the SDK file SetEnv.cmd on your system. 
     236echo You need Microsoft Platform SDK (which is available for free) to compile  
     237echo up the Apache web server. You also need it if you're working with 
     238echo Microsoft Visual Studio 8 or higher. 
     239echo. 
     240echo If you already have it installed, please edit the makegs2.bat file and 
     241echo manually set the full path to SetEnv.cmd, then run this script again. 
     242echo If you have an older version of Visual Studio, then you do not need the 
     243echo Platform SDK and can compile the Web and/or Local libraries up from the 
     244echo DOS command prompt using: 
     245echo    nmake /f win32.mak 
     246echo and/or 
     247echo    nmake /f win32.mak LOCAL_LIBRARY=1 
    243248GOTO END 
    244249