Author: chrisz
Date: Sun Jul 31 05:53:58 2011
New Revision: 8183
Log:
Adapted make file for Windows to run with VS 2010.
Modified:
Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit1/make.bat
Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit2/README
Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit2/make.bat
Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit2/mod_webkit.dll
Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit2/mod_webkit64.dll
Webware/branches/Branch-1_0/WebKit/Docs/RelNotes-X.Y.phtml
Modified: Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit1/make.bat
==============================================================================
--- Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit1/make.bat Sun Jul 31 05:53:23 2011 (r8182)
+++ Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit1/make.bat Sun Jul 31 05:53:58 2011 (r8183)
@@ -6,13 +6,11 @@
rem It seems that Microsoft Visual C++ 2005 or 2008 Express Edition
rem cannot be used to create modules for the Apache 1.3 binaries.
-rem Set environment variables
-
-set VC=%ProgramFiles%\Microsoft Visual C++ Toolkit 2003
+rem Set paths to Apache, SDK and Visual Studio
+set Apache=%ProgramFiles%\Apache Group\Apache
set SDK=%ProgramFiles%\Microsoft Platform SDK for Windows Server 2003 R2
-set APACHE=%ProgramFiles%\Apache Group\Apache
-call "%VC%\vcvars32"
+rem Setup the environment
call "%SDK%\setenv"
Set PATH=%Apache%\bin;%PATH%
@@ -20,7 +18,6 @@
Set LIB=%Apache%\libexec;%LIB%
rem Compile and link mod_webkit
-
cl /W3 /O2 /EHsc /LD /MT ^
/D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL ^
/D _CRT_SECURE_NO_DEPRECATE ^
@@ -29,14 +26,11 @@
/link ApacheCore.lib ws2_32.lib
rem Remove all intermediate results
-
del /Q *.exp *.ilk *.lib *.obj *.pdb
rem Install mod_webkit
-
copy mod_webkit.dll "%Apache%\modules\mod_webkit.so"
rem Wait for keypress before leaving
-
echo.
pause
Modified: Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit2/README
==============================================================================
--- Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit2/README Sun Jul 31 05:53:23 2011 (r8182)
+++ Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit2/README Sun Jul 31 05:53:58 2011 (r8183)
@@ -2,7 +2,7 @@
Author: Jay Love (jsliv@...)
February 2, 2001
Updated for Apache2 November 2002
-Last Update April 9, 2010
+Last Update July 31, 2011
This is a native Apache 2.2 module for communicating with the Webware WebKit
AppServer (you can find a module for Apache 1.3 in the mod_webkit1 directory).
@@ -38,7 +38,7 @@
in the Makefile as indicated.
To build and install on Microsoft Windows, you can use the make.bat batch file
-with the free Microsoft Visual C++ 2008 Express Edition. For your convenience,
+with the free Microsoft Visual C++ 2010 Express Edition. For your convenience,
a pre-compiled mod_webkit.dll module for Apache 2.2 on Windows is already
included in this directory, so you can just place it into your Apache modules
directory under the name mod_webkit.so. If you are running a 64bit Apache,
Modified: Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit2/make.bat
==============================================================================
--- Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit2/make.bat Sun Jul 31 05:53:23 2011 (r8182)
+++ Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit2/make.bat Sun Jul 31 05:53:58 2011 (r8183)
@@ -1,30 +1,28 @@
@echo off
rem Batch file for generating the mod_webkit Apache 2.2 DSO module.
-rem You can either use the full Microsoft Visual Studio 2008
-rem or the free Microsoft Visual C++ 2008 Express Edition
+rem You can either use the full Microsoft Visual Studio 2010
+rem or the free Microsoft Visual C++ 2010 Express Edition
rem (download at http://www.microsoft.com/express/download/).
-rem Creating a 64bit module with the Express Edition also requires
-rem the Windows SDK and some tweaking of the configuration.
+rem We also use the free Microsoft Windows 7 SDK to configure
+rem the environment variables and for building the 64bit version
+rem (at http://www.microsoft.com/download/en/details.aspx?id=8442).
+
+rem The path to your Apache 2.2 installation
+rem (32bit version may be under %ProgramFiles(x86)% on 64bit systems)
+set Apache=%ProgramFiles%\Apache Software Foundation\Apache2.2
-rem Set environment variables
+rem The path to your Windows SDK installation
+set SDK=%ProgramFiles%\Microsoft SDKs\Windows\v7.1
-rem VC will be under %ProgramFiles(x86)% on a 64bit system
-set VC=%ProgramFiles%\Microsoft Visual Studio 9.0\VC
-set APACHE=%ProgramFiles%\Apache Software Foundation\Apache2.2
-
-rem You can use x86_amd64 or amd64 to build a 64bit module
-set BUILD=x86
-
-call "%VC%\vcvarsall" %BUILD%
+rem Setup the environment (use /x64 to build a 64bit module)
+call "%SDK%\bin\setenv" /Release /x86 /win7
set PATH=%Apache%\bin;%PATH%
set INCLUDE=%Apache%\include;%INCLUDE%
set LIB=%Apache%\lib;%LIB%
rem Compile and link mod_webkit
-
-rem You should add /D WIN64 for a 64bit module
cl /W3 /O2 /EHsc /LD /MT ^
/D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL ^
/D MOD_WEBKIT_EXPORTS /D NDEBUG ^
@@ -32,14 +30,11 @@
/link libhttpd.lib libapr-1.lib libaprutil-1.lib ws2_32.lib
rem Remove all intermediate results
-
del /Q *.exp *.ilk *.lib *.obj *.pdb
rem Install mod_webkit
-
copy mod_webkit.dll "%Apache%\modules\mod_webkit.so"
rem Wait for keypress before leaving
-
echo.
pause
Modified: Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit2/mod_webkit.dll
==============================================================================
Binary file (source and/or target). No diff available.
Modified: Webware/branches/Branch-1_0/WebKit/Adapters/mod_webkit2/mod_webkit64.dll
==============================================================================
Binary file (source and/or target). No diff available.
Modified: Webware/branches/Branch-1_0/WebKit/Docs/RelNotes-X.Y.phtml
==============================================================================
--- Webware/branches/Branch-1_0/WebKit/Docs/RelNotes-X.Y.phtml Sun Jul 31 05:53:23 2011 (r8182)
+++ Webware/branches/Branch-1_0/WebKit/Docs/RelNotes-X.Y.phtml Sun Jul 31 05:53:58 2011 (r8183)
@@ -9,6 +9,8 @@
be told to quit their work. This can be changed via the new
<span class="filename">AppServer.config</span> setting
<code>UseDaemonThreads</span>.</li>
+ <li>The mod_webkit2 adapter now also works with 64bit builds of Apache 2.2;
+ we have included pre-compiled 32bit and 64bit dll files for Windows.</li>
</ul>
<a name="Improvements"></a><h2>Improvements and Refinements</h2>
|