Changeset 20183

Timestamp:

2009-08-07T20:16:34+12:00 (15 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:

• common-src/win32.mak (modified) (1 diff)
• makegs2.bat (modified) (7 diffs)
• runtime-src/packages/apache-httpd/win32.mak (modified) (2 diffs)
• runtime-src/win32.mak (modified) (1 diff)

gsdl/trunk/common-src/win32.mak

@@ -141 +141 @@
     cd "$(SQLITE_DIR)"
     $(MAKECLEANCMD)
+    del "$(COMMONHOME)\packages\sqlite\lib\sqlite3.lib"
 !ENDIF
     cd "$(COMMONHOME)"

gsdl/trunk/makegs2.bat

@@ -8 +8 @@
 set VCVARS=""
 
-
+:: Path to Microsoft Platform SDK's SetEnv.cmd -- You can set this variable manually if needed
+set SDK_ENV=""
 
 
@@ -31 +32 @@
 
 rem Checking for existance of the packages extracted / zipped
-IF NOT EXIST .\common-src\packages\windows\crypt\crypt\*.* IF NOT EXIST .\common-src\packages\windows\crypt\crypt.zip GOTO ENDNOWINPACK
-
-IF NOT EXIST .\common-src\packages\windows\expat\expat\*.* IF NOT EXIST .\common-src\packages\windows\expat\expat.zip GOTO ENDNOWINPACK
-
-:: IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm\*.* IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm.zip GOTO ENDNOWINPACK
-
-IF NOT EXIST .\common-src\packages\windows\stlport\stlport\*.* IF NOT EXIST .\common-src\packages\windows\stlport\stlport.zip GOTO ENDNOWINPACK
-
-IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv\*.* IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv.zip GOTO ENDNOICONV
+IF NOT EXIST .\common-src\packages\windows\crypt\crypt\nul IF NOT EXIST .\common-src\packages\windows\crypt\crypt.zip GOTO ENDNOWINPACK
+
+IF NOT EXIST .\common-src\packages\windows\expat\expat\nul IF NOT EXIST .\common-src\packages\windows\expat\expat.zip GOTO ENDNOWINPACK
+
+:: IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm\nul IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm.zip GOTO ENDNOWINPACK
+
+IF NOT EXIST .\common-src\packages\windows\stlport\stlport\nul IF NOT EXIST .\common-src\packages\windows\stlport\stlport.zip GOTO ENDNOWINPACK
+
+IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv\nul IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv.zip GOTO ENDNOICONV
 
 IF NOT EXIST .\common-src\packages\sqlite\sqlite* IF NOT EXIST .\common-src\packages\sqlite\sqlite*.tar.gz GOTO ENDNOSQLITE
@@ -68 +69 @@
 
 IF 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
+
+
 echo.
 echo.
@@ -82 +85 @@
 rem Check some known paths to VCVARS32.BAT
 :: if the user has set VCVARS32 don't look in the default places at all
-IF NOT %VCVARS%=="" GOTO CALLVCVARS
+IF NOT %VCVARS%=="" GOTO PROMPT
 
 :: Visual Studio 2005 Pro --- NOT READY YET
-::IF EXIST "%programfiles%\Microsoft Visual Studio 8\VC\bin\vcvars32.bat" set VCVARS="%programfiles%\Microsoft Visual Studio 8\VC\bin\vcvars32.bat"
+IF EXIST "%programfiles%\Microsoft Visual Studio 8\VC\bin\vcvars32.bat" set VCVARS="%programfiles%\Microsoft Visual Studio 8\VC\bin\vcvars32.bat"
 
 :: Visual Studio 2003 \ VS7
-IF EXIST "%programfiles%\Microsoft Visual Studio .NET 2003\Vc7\bin\vcvars32.bat" set VCVARS="%programfiles%\Microsoft Visual Studio .NET 2003\Vc7\bin\vcvars32.bat"
+IF %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"
 
 :: Visual Studio 6 \ VS6
-IF EXIST "%programfiles%\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT" set VCVARS="%programfiles%\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT"
-
+IF %VCVARS%=="" IF EXIST "%programfiles%\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT" set VCVARS="%programfiles%\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT"
 
 IF %VCVARS%=="" GOTO ENDNOVCVARS32
-
-:CALLVCVARS
-call %VCVARS%
-echo.
-echo.
+:: Now VCVARS has been set so it can be used when we need it
+
+
+:PROMPT
 echo.
 rem Ask the user what to compile
@@ -107 +108 @@
 echo 2. Web library only
 echo 3. Both
-echo 4. Quit
+echo 4. Apache local library (needs Microsoft Platform SDK)
+echo 5. Quit
 echo.
 echo Please choose a number from the menu. Otherwise both libraries will be compiled in 15 seconds.
-.\bin\windows\choice.exe /N /T:3,15 /C:1234
-    IF errorlevel 4 GOTO END
+.\bin\windows\choice.exe /N /T:3,15 /C:12345
+    IF errorlevel 5 GOTO END
+    IF errorlevel 4 GOTO WITHAPACHE
     IF errorlevel 3 GOTO WITHBOTH
     IF errorlevel 2 GOTO WITHOUTLOCALLIB
@@ -118 +121 @@
 
 
+:WITHAPACHE
+:: Only compile up the Apache web server if we're asked to
+
+rem Check known path(s) to SetEnv.cmd
+:: if the user has set SDK_ENV don't look in the default places at all
+IF NOT %SDK_ENV%=="" GOTO CALL_SDK
+
+IF EXIST "%programfiles%\Microsoft Platform SDK\SetEnv.cmd" set SDK_ENV="%programfiles%\Microsoft Platform SDK\SetEnv.cmd"
+
+IF %SDK_ENV%=="" GOTO ENDNOSDKENV
+
+:CALL_SDK
+call %SDK_ENV%
+echo.
+echo.
+
+call %VCVARS%
+echo.
+echo.
+
+:: Now unpack the custom GS2 apache web server tar.gz file
+IF 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
+
+nmake /f win32.mak APACHE_HTTPD=1
+GOTO ENDOK
+
+
 :WITHOUTLOCALLIB
+call %VCVARS%
+echo.
+echo.
 nmake /f win32.mak
 GOTO ENDOK
 
 :WITHLOCALLIB
+call %VCVARS%
+echo.
+echo.
 nmake /f win32.mak LOCAL_LIBRARY=1
 GOTO ENDOK
 
 :WITHBOTH
+call %VCVARS%
+echo.
+echo.
 nmake /f win32.mak
 nmake /f win32.mak LOCAL_LIBRARY=1
@@ -194 +233 @@
 GOTO END
 
+:ENDNOSDKENV
+echo.
+echo /!\ Error /!\ - Not able to find 'SetEnv.cmd'.
+echo You need Microsoft Platform SDK to compile up the Apache web server
+echo but we were unable to find the SDK file SetEnv.cmd on your system.
+echo.
+echo Please edit the makegs2.bat file and manually set the full path to 
+echo SetEnv.cmd then run this script again.
+GOTO END
+
 :ENDOK
 echo.

gsdl/trunk/runtime-src/packages/apache-httpd/win32.mak

@@ -30 +30 @@
 compile: 
     cd "$(APACHEHOME)"
-    nmake /f Makefile.win _apacher PORT=8282 
+    copy "$(GSDLHOME)\bin\windows\awk.exe" "$(APACHEHOME)\."
+    set APACHEHOME=$(APACHEHOME)
+    nmake /f Makefile.win _apacher
     cd "$(GSDLHOME)"
 
@@ -36 +38 @@
     cd "$(APACHEHOME)"
     nmake /f Makefile.win installr INSTDIR=$(GSDLHOME)\apache-httpd\windows
+    copy "$(MAKEDIR)\windows-httpd.conf.in" "$(GSDLHOME)\apache-httpd\windows\conf\httpd.conf.in
     cd "$(GSDLHOME)"
 

gsdl/trunk/runtime-src/win32.mak

@@ -106 +106 @@
     cd src\w32apachectl
     $(MAKECLEANCMD)
+    cd "$(RUNTIMEHOME)"
+    cd packages\apache-httpd
+    $(MAKECLEANCMD)
     cd "$(GSDLHOME)"