Changeset 20183

Show
Ignore:
Timestamp:
07.08.2009 20:16:34 (11 years ago)
Author:
ak19
Message:

1. Updated makefiles to ensure that the local Apache web server gets compiled up on Windows. 2. sqlite3.lib must be deleted upon clean.

Location:
gsdl/trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/common-src/win32.mak

    r19913 r20183  
    141141    cd "$(SQLITE_DIR)" 
    142142    $(MAKECLEANCMD) 
     143    del "$(COMMONHOME)\packages\sqlite\lib\sqlite3.lib" 
    143144!ENDIF 
    144145    cd "$(COMMONHOME)" 
  • gsdl/trunk/makegs2.bat

    r19291 r20183  
    88set VCVARS="" 
    99 
    10  
     10:: Path to Microsoft Platform SDK's SetEnv.cmd -- You can set this variable manually if needed 
     11set SDK_ENV="" 
    1112 
    1213 
     
    3132 
    3233rem Checking for existance of the packages extracted / zipped 
    33 IF NOT EXIST .\common-src\packages\windows\crypt\crypt\*.* IF NOT EXIST .\common-src\packages\windows\crypt\crypt.zip GOTO ENDNOWINPACK 
    34  
    35 IF NOT EXIST .\common-src\packages\windows\expat\expat\*.* IF NOT EXIST .\common-src\packages\windows\expat\expat.zip GOTO ENDNOWINPACK 
    36  
    37 :: IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm\*.* IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm.zip GOTO ENDNOWINPACK 
    38  
    39 IF NOT EXIST .\common-src\packages\windows\stlport\stlport\*.* IF NOT EXIST .\common-src\packages\windows\stlport\stlport.zip GOTO ENDNOWINPACK 
    40  
    41 IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv\*.* IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv.zip GOTO ENDNOICONV 
     34IF NOT EXIST .\common-src\packages\windows\crypt\crypt\nul IF NOT EXIST .\common-src\packages\windows\crypt\crypt.zip GOTO ENDNOWINPACK 
     35 
     36IF NOT EXIST .\common-src\packages\windows\expat\expat\nul IF NOT EXIST .\common-src\packages\windows\expat\expat.zip GOTO ENDNOWINPACK 
     37 
     38:: IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm\nul IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm.zip GOTO ENDNOWINPACK 
     39 
     40IF NOT EXIST .\common-src\packages\windows\stlport\stlport\nul IF NOT EXIST .\common-src\packages\windows\stlport\stlport.zip GOTO ENDNOWINPACK 
     41 
     42IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv\nul IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv.zip GOTO ENDNOICONV 
    4243 
    4344IF NOT EXIST .\common-src\packages\sqlite\sqlite* IF NOT EXIST .\common-src\packages\sqlite\sqlite*.tar.gz GOTO ENDNOSQLITE 
     
    6869 
    6970IF EXIST .\common-src\packages\sqlite\sqlite*.tar.gz .\bin\windows\gunzip.exe -cd .\common-src\packages\sqlite\sqlite*.tar.gz | .\bin\windows\tar.exe xv --directory=./common-src/packages/sqlite 
     71 
     72 
    7073echo. 
    7174echo. 
     
    8285rem Check some known paths to VCVARS32.BAT 
    8386:: if the user has set VCVARS32 don't look in the default places at all 
    84 IF NOT %VCVARS%=="" GOTO CALLVCVARS 
     87IF NOT %VCVARS%=="" GOTO PROMPT 
    8588 
    8689:: Visual Studio 2005 Pro --- NOT READY YET 
    87 ::IF EXIST "%programfiles%\Microsoft Visual Studio 8\VC\bin\vcvars32.bat" set VCVARS="%programfiles%\Microsoft Visual Studio 8\VC\bin\vcvars32.bat" 
     90IF EXIST "%programfiles%\Microsoft Visual Studio 8\VC\bin\vcvars32.bat" set VCVARS="%programfiles%\Microsoft Visual Studio 8\VC\bin\vcvars32.bat" 
    8891 
    8992:: Visual Studio 2003 \ VS7 
    90 IF EXIST "%programfiles%\Microsoft Visual Studio .NET 2003\Vc7\bin\vcvars32.bat" set VCVARS="%programfiles%\Microsoft Visual Studio .NET 2003\Vc7\bin\vcvars32.bat" 
     93IF %VCVARS%=="" IF EXIST "%programfiles%\Microsoft Visual Studio .NET 2003\Vc7\bin\vcvars32.bat" set VCVARS="%programfiles%\Microsoft Visual Studio .NET 2003\Vc7\bin\vcvars32.bat" 
    9194 
    9295:: Visual Studio 6 \ VS6 
    93 IF EXIST "%programfiles%\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT" set VCVARS="%programfiles%\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT" 
    94  
     96IF %VCVARS%=="" IF EXIST "%programfiles%\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT" set VCVARS="%programfiles%\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT" 
    9597 
    9698IF %VCVARS%=="" GOTO ENDNOVCVARS32 
    97  
    98 :CALLVCVARS 
    99 call %VCVARS% 
    100 echo. 
    101 echo. 
     99:: Now VCVARS has been set so it can be used when we need it 
     100 
     101 
     102:PROMPT 
    102103echo. 
    103104rem Ask the user what to compile 
     
    107108echo 2. Web library only 
    108109echo 3. Both 
    109 echo 4. Quit 
     110echo 4. Apache local library (needs Microsoft Platform SDK) 
     111echo 5. Quit 
    110112echo. 
    111113echo Please choose a number from the menu. Otherwise both libraries will be compiled in 15 seconds. 
    112 .\bin\windows\choice.exe /N /T:3,15 /C:1234 
    113     IF errorlevel 4 GOTO END 
     114.\bin\windows\choice.exe /N /T:3,15 /C:12345 
     115    IF errorlevel 5 GOTO END 
     116    IF errorlevel 4 GOTO WITHAPACHE 
    114117    IF errorlevel 3 GOTO WITHBOTH 
    115118    IF errorlevel 2 GOTO WITHOUTLOCALLIB 
     
    118121 
    119122 
     123:WITHAPACHE 
     124:: Only compile up the Apache web server if we're asked to 
     125 
     126rem Check known path(s) to SetEnv.cmd 
     127:: if the user has set SDK_ENV don't look in the default places at all 
     128IF NOT %SDK_ENV%=="" GOTO CALL_SDK 
     129 
     130IF EXIST "%programfiles%\Microsoft Platform SDK\SetEnv.cmd" set SDK_ENV="%programfiles%\Microsoft Platform SDK\SetEnv.cmd" 
     131 
     132IF %SDK_ENV%=="" GOTO ENDNOSDKENV 
     133 
     134:CALL_SDK 
     135call %SDK_ENV% 
     136echo. 
     137echo. 
     138 
     139call %VCVARS% 
     140echo. 
     141echo. 
     142 
     143:: Now unpack the custom GS2 apache web server tar.gz file 
     144IF 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 
     145 
     146nmake /f win32.mak APACHE_HTTPD=1 
     147GOTO ENDOK 
     148 
     149 
    120150:WITHOUTLOCALLIB 
     151call %VCVARS% 
     152echo. 
     153echo. 
    121154nmake /f win32.mak 
    122155GOTO ENDOK 
    123156 
    124157:WITHLOCALLIB 
     158call %VCVARS% 
     159echo. 
     160echo. 
    125161nmake /f win32.mak LOCAL_LIBRARY=1 
    126162GOTO ENDOK 
    127163 
    128164:WITHBOTH 
     165call %VCVARS% 
     166echo. 
     167echo. 
    129168nmake /f win32.mak 
    130169nmake /f win32.mak LOCAL_LIBRARY=1 
     
    194233GOTO END 
    195234 
     235:ENDNOSDKENV 
     236echo. 
     237echo /!\ Error /!\ - Not able to find 'SetEnv.cmd'. 
     238echo You need Microsoft Platform SDK to compile up the Apache web server 
     239echo but we were unable to find the SDK file SetEnv.cmd on your system. 
     240echo. 
     241echo Please edit the makegs2.bat file and manually set the full path to  
     242echo SetEnv.cmd then run this script again. 
     243GOTO END 
     244 
    196245:ENDOK 
    197246echo. 
  • gsdl/trunk/runtime-src/packages/apache-httpd/win32.mak

    r19019 r20183  
    3030compile:  
    3131    cd "$(APACHEHOME)" 
    32     nmake /f Makefile.win _apacher PORT=8282  
     32    copy "$(GSDLHOME)\bin\windows\awk.exe" "$(APACHEHOME)\." 
     33    set APACHEHOME=$(APACHEHOME) 
     34    nmake /f Makefile.win _apacher 
    3335    cd "$(GSDLHOME)" 
    3436 
     
    3638    cd "$(APACHEHOME)" 
    3739    nmake /f Makefile.win installr INSTDIR=$(GSDLHOME)\apache-httpd\windows 
     40    copy "$(MAKEDIR)\windows-httpd.conf.in" "$(GSDLHOME)\apache-httpd\windows\conf\httpd.conf.in 
    3841    cd "$(GSDLHOME)" 
    3942 
  • gsdl/trunk/runtime-src/win32.mak

    r19521 r20183  
    106106    cd src\w32apachectl 
    107107    $(MAKECLEANCMD) 
     108    cd "$(RUNTIMEHOME)" 
     109    cd packages\apache-httpd 
     110    $(MAKECLEANCMD) 
    108111    cd "$(GSDLHOME)" 
    109112