Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Received-SPF: pass (nike.apache.org: local policy)
From: Stefan Fritsch <sf@sfritsch.de>
To: dev@httpd.apache.org,
 "Gregg L. Smith" <lists@glewis.com>
Subject: Re: httpd-2.3.9-alpha test tarballs
Date: Tue, 23 Nov 2010 21:47:05 +0100
User-Agent: KMail/1.13.5 (Linux/2.6.32-5-amd64; KDE/4.4.5; x86_64; ; )
References: <1eh734v32tvkffk.231120100826@glsnet.net>
In-Reply-To: <1eh734v32tvkffk.231120100826@glsnet.net>
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_JhC7MFYygL/U7Tr"
Message-Id: <201011232147.05905.sf@sfritsch.de>

--Boundary-00=_JhC7MFYygL/U7Tr
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

On Tuesday 23 November 2010, Gregg L. Smith wrote:
> Original Message -----------------------
> Pre-test tarballs of httpd-2.3.9-alpha are available at:
> 
> 	http://people.apache.org/~jim/httpd-2.3.9-alpha/
> 
> Please try 'em out and I'll make them official test tarballs...
> 
> -1, does not build on Windows.

Based on pure guesswork, I have produced the attached diff.

> Libhttpd - Cannot find util_expr.c
> 
> No problem, but then there is util_expr_scan.c, which must be
> Flexed with what looks like Flex 2.5.35. It is unfortunate that
> the GNUWin32 version of Flex is still back at 2.5.4a.
> 
> C:\buildprep\httpd-2.3.8>flex -Putil_expr_yy -s -B
> .\server\util_expr_scan.l ".\server\util_expr_scan.l", line 32:
> unrecognized %option: reentrant ".\server\util_expr_scan.l", line
> 33: unrecognized %option: bison-bridge
> 
> The alternative is a MinGW or Cygwin version, which will require
> Cygwin at the least.

The generated .c and .h files are also provided in the tarball. There 
should be not need to regenerate them unless you want to change the .y 
or .l file.

> If we now have this requirement, might as well scrap Visual Studio
> and go with MinGW/GCC.

IMHO it is completely acceptable if the the generated files can only 
be re-generated on unix, as long as the result can be compiled under 
Windows.

--Boundary-00=_JhC7MFYygL/U7Tr
Content-Type: text/x-patch;
  charset="ISO-8859-1";
  name="win.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="win.diff"

diff --git a/libhttpd.dsp b/libhttpd.dsp
index 13a5b1d..11cf9ec 100644
=2D-- a/libhttpd.dsp
+++ b/libhttpd.dsp
@@ -97,6 +97,41 @@ PostBuild_Desc=3DEmbed .manifest
 PostBuild_Cmds=3Dif exist $(TargetPath).manifest mt.exe -manifest $(Target=
Path).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
=20
+!ELSEIF  "$(CFG)" =3D=3D "libhttpd - Win32 Lexical"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D=
 "AP_DECLARE_EXPORT" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/inc=
lude" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN=
32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd_cl" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/libhttpd.res" /i "./include" /i "./srclib/a=
pr/include" /d "NDEBUG" /d BIN_NAME=3D"libhttpd.dll" /d LONG_NAME=3D"Apache=
 HTTP Server Core"
+BSC32=3Dbscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=3Dlink.exe
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.=
lib /nologo /subsystem:windows /dll
+# ADD LINK32 pcre.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib msws=
ock.lib "Release\buildmark.obj" /nologo /subsystem:windows /dll /debug /lib=
path:"./srclib/pcre" /base:@"os\win32\BaseAddr.ref",libhttpd.dll /opt:ref
+# Begin Special Build Tool
+TargetPath=3D.\Release\libhttpd.dll
+SOURCE=3D"$(InputPath)"
+PreLink_Desc=3DCompiling buildmark
+PreLink_Cmds=3Dcl.exe /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./sr=
clib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDE=
BUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" =
/FD /c server\buildmark.c /Fo"Release\buildmark.obj"
+PostBuild_Desc=3DEmbed .manifest
+PostBuild_Cmds=3Dif exist $(TargetPath).manifest mt.exe -manifest $(Target=
Path).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+
 !ENDIF=20
=20
 # Begin Target
@@ -479,7 +514,27 @@ SOURCE=3D.\include\util_ebcdic.h
 # End Source File
 # Begin Source File
=20
=2DSOURCE=3D.\server\util_expr.c
+SOURCE=3D.\server\util_expr_private.h
+# End Source File
+# Begin Source File
+
+SOURCE=3D.\server\util_expr_eval.c
+# End Source File
+# Begin Source File
+
+SOURCE=3D.\server\util_expr_scan.h
+# End Source File
+# Begin Source File
+
+SOURCE=3D.\server\util_expr_scan.c
+# End Source File
+# Begin Source File
+
+SOURCE=3D.\server\util_expr_parse.h
+# End Source File
+# Begin Source File
+
+SOURCE=3D.\server\util_expr_parse.c
 # End Source File
 # Begin Source File
=20
@@ -651,9 +706,82 @@ InputPath=3D.\server\gen_test_char.exe
=20
 # End Custom Build
=20
+!ELSEIF  "$(CFG)" =3D=3D "libhttpd - Win32 Lexical"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__GEN_T=3D".\include\os.h"
+# Begin Custom Build - Generating test_char.h from gen_test_char.exe
+InputPath=3D.\server\gen_test_char.exe
+
+".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	.\server\gen_test_char.exe >.\server\test_char.h
+
+# End Custom Build
+
 !ENDIF=20
=20
 # End Source File
+# Begin Group "Generated Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=3D.\server\util_expr_parse.y
+
+!IF  "$(CFG)" =3D=3D "libhttpd - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" =3D=3D "libhttpd - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" =3D=3D "libhttpd - Win32 Lexical"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating util_expr_parse.c/.h from util_expr_pars=
e.y
+InputPath=3D.\server\util_expr_parse.y
+
+BuildCmds=3D \
+	bison -pap_expr_yy --defines=3D.\server\util_expr_parse.h -o .\server\uti=
l_expr_parse.c .\server\util_expr_parse.y
+
+".\server\util_expr_parse.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+".\server\util_expr_parse.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=3D.\server\util_expr_scan.l
+
+!IF  "$(CFG)" =3D=3D "libhttpd - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" =3D=3D "libhttpd - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" =3D=3D "libhttpd - Win32 Lexical"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating util_expr_scan.c from util_expr_scan.l
+InputPath=3D.\server\util_expr_scan.l
+
+".\server\util_expr_scan.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -Pap_expr_yy -o .\server\util_expr_scan.c .\server\util_expr_scan.l
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
 # Begin Source File
=20
 SOURCE=3D.\build\win32\httpd.rc
diff --git a/modules/ssl/mod_ssl.dsp b/modules/ssl/mod_ssl.dsp
index d7ab3fc..6d738fe 100644
=2D-- a/modules/ssl/mod_ssl.dsp
+++ b/modules/ssl/mod_ssl.dsp
@@ -19,7 +19,6 @@ CFG=3Dmod_ssl - Win32 Release
 !MESSAGE=20
 !MESSAGE "mod_ssl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Lib=
rary")
 !MESSAGE "mod_ssl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Libra=
ry")
=2D!MESSAGE "mod_ssl - Win32 Lexical" (based on "Win32 (x86) Dynamic-Link L=
ibrary")
 !MESSAGE=20
=20
 # Begin Project
@@ -94,45 +93,12 @@ PostBuild_Desc=3DEmbed .manifest
 PostBuild_Cmds=3Dif exist $(TargetPath).manifest mt.exe -manifest $(Target=
Path).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
=20
=2D!ELSEIF  "$(CFG)" =3D=3D "mod_ssl - Win32 Lexical"
=2D
=2D# PROP BASE Use_MFC 0
=2D# PROP BASE Use_Debug_Libraries 0
=2D# PROP BASE Output_Dir "Release"
=2D# PROP BASE Intermediate_Dir "Release"
=2D# PROP BASE Target_Dir ""
=2D# PROP Use_MFC 0
=2D# PROP Use_Debug_Libraries 0
=2D# PROP Output_Dir "Release"
=2D# PROP Intermediate_Dir "Release"
=2D# PROP Ignore_Export_Lib 0
=2D# PROP Target_Dir ""
=2D# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" =
/FD /c
=2D# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../generat=
ors" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I ".=
=2E/../srclib/openssl/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32=
_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" =
/D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D "HAVE_SSL_SET=
_STATE" /D "HAVE_OPENSSL_ENGINE_H" /D "HAVE_ENGINE_INIT" /D "HAVE_ENGINE_LO=
AD_BUILTIN_ENGINES" /Fd"Release\mod_ssl_src" /FD /c
=2D# ADD BASE MTL /nologo /D "NDEBUG" /win32
=2D# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
=2D# ADD BASE RSC /l 0x409 /d "NDEBUG"
=2D# ADD RSC /l 0x409 /fo"Release/mod_ssl.res" /i "../../include" /i "../..=
/srclib/apr/include" /d "NDEBUG" /d BIN_NAME=3D"mod_ssl.so" /d LONG_NAME=3D=
"proxy_ssl_module for Apache"
=2DBSC32=3Dbscmake.exe
=2D# ADD BASE BSC32 /nologo
=2D# ADD BSC32 /nologo
=2DLINK32=3Dlink.exe
=2D# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /out:".\R=
elease\mod_ssl.so" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl.so
=2D# ADD LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib advapi32.lib=
 gdi32.lib libeay32.lib ssleay32.lib /nologo /subsystem:windows /dll /incre=
mental:no /debug /out:".\Release\mod_ssl.so" /libpath:"../../srclib/openssl=
/out32dll" /libpath:"../../srclib/openssl/out32" /base:@..\..\os\win32\Base=
Addr.ref,mod_ssl.so /opt:ref
=2D# Begin Special Build Tool
=2DTargetPath=3D.\Release\mod_ssl.so
=2DSOURCE=3D"$(InputPath)"
=2DPostBuild_Desc=3DEmbed .manifest
=2DPostBuild_Cmds=3Dif exist $(TargetPath).manifest mt.exe -manifest $(Targ=
etPath).manifest -outputresource:$(TargetPath);2
=2D# End Special Build Tool
=2D
 !ENDIF=20
=20
 # Begin Target
=20
 # Name "mod_ssl - Win32 Release"
 # Name "mod_ssl - Win32 Debug"
=2D# Name "mod_ssl - Win32 Lexical"
 # Begin Group "Source Files"
=20
 # PROP Default_Filter "*.c"
@@ -182,22 +148,6 @@ SOURCE=3D.\ssl_engine_vars.c
 # End Source File
 # Begin Source File
=20
=2DSOURCE=3D.\ssl_expr.c
=2D# End Source File
=2D# Begin Source File
=2D
=2DSOURCE=3D.\ssl_expr_eval.c
=2D# End Source File
=2D# Begin Source File
=2D
=2DSOURCE=3D.\ssl_expr_parse.c
=2D# End Source File
=2D# Begin Source File
=2D
=2DSOURCE=3D.\ssl_expr_scan.c
=2D# End Source File
=2D# Begin Source File
=2D
 SOURCE=3D.\ssl_engine_ocsp.c
 # End Source File
 # Begin Source File
@@ -230,18 +180,10 @@ SOURCE=3D.\mod_ssl.h
 # End Source File
 # Begin Source File
=20
=2DSOURCE=3D.\ssl_expr.h
=2D# End Source File
=2D# Begin Source File
=2D
 SOURCE=3D.\ssl_private.h
 # End Source File
 # Begin Source File
=20
=2DSOURCE=3D.\ssl_expr_parse.h
=2D# End Source File
=2D# Begin Source File
=2D
 SOURCE=3D.\ssl_toolkit_compat.h
 # End Source File
 # Begin Source File
@@ -253,73 +195,6 @@ SOURCE=3D.\ssl_util_ssl.h
 SOURCE=3D.\ssl_util_table.h
 # End Source File
 # End Group
=2D# Begin Group "Generated Files"
=2D
=2D# PROP Default_Filter ""
=2D# Begin Source File
=2D
=2DSOURCE=3D.\ssl_expr_parse.y
=2D
=2D!IF  "$(CFG)" =3D=3D "mod_ssl - Win32 Release"
=2D
=2D# PROP Exclude_From_Build 1
=2D
=2D!ELSEIF  "$(CFG)" =3D=3D "mod_ssl - Win32 Debug"
=2D
=2D# PROP Exclude_From_Build 1
=2D
=2D!ELSEIF  "$(CFG)" =3D=3D "mod_ssl - Win32 Lexical"
=2D
=2D# PROP Ignore_Default_Tool 1
=2D# Begin Custom Build - Generating ssl_expr_parse.c/.h from ssl_expr_pars=
e.y
=2DInputPath=3D.\ssl_expr_parse.y
=2D
=2DBuildCmds=3D \
=2D	bison -y -d ssl_expr_parse.y \
=2D	sed -e "s;yy;ssl_expr_yy;g" -e  "/#if defined(c_plusplus) || defined(__=
cplusplus)/,/#endif/d" <y.tab.c  >ssl_expr_parse.c \
=2D	del y.tab.c \
=2D	sed -e "s;yy;ssl_expr_yy;g" <y.tab.h >ssl_expr_parse.h \
=2D	del y.tab.h
=2D=09
=2D"ssl_expr_parse.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
=2D   $(BuildCmds)
=2D
=2D"ssl_expr_parse.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
=2D   $(BuildCmds)
=2D# End Custom Build
=2D
=2D!ENDIF=20
=2D
=2D# End Source File
=2D# Begin Source File
=2D
=2DSOURCE=3D.\ssl_expr_scan.l
=2D
=2D!IF  "$(CFG)" =3D=3D "mod_ssl - Win32 Release"
=2D
=2D# PROP Exclude_From_Build 1
=2D
=2D!ELSEIF  "$(CFG)" =3D=3D "mod_ssl - Win32 Debug"
=2D
=2D# PROP Exclude_From_Build 1
=2D
=2D!ELSEIF  "$(CFG)" =3D=3D "mod_ssl - Win32 Lexical"
=2D
=2D# PROP Ignore_Default_Tool 1
=2D# Begin Custom Build - Generating ssl_expr_scan.c from ssl_expr_scan.l
=2DInputPath=3D.\ssl_expr_scan.l
=2D
=2D"ssl_expr_scan.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
=2D	flex -Pssl_expr_yy -s -B ssl_expr_scan.l=20
=2D	sed -e "/$$Header:/d" <lex.ssl_expr_yy.c >ssl_expr_scan.c=20
=2D	del lex.ssl_expr_yy.c=20
=2D=09
=2D# End Custom Build
=2D
=2D!ENDIF=20
=2D
=2D# End Source File
=2D# End Group
 # Begin Source File
=20
 SOURCE=3D..\..\build\win32\httpd.rc

--Boundary-00=_JhC7MFYygL/U7Tr--