You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2006/04/24 21:48:31 UTC
svn commit: r396670 - /httpd/httpd/trunk/modules/ssl/mod_ssl.dsp
Author: wrowe
Date: Mon Apr 24 12:48:30 2006
New Revision: 396670
URL: http://svn.apache.org/viewcvs?rev=396670&view=rev
Log:
Move flex/bison/sed steps into a "mod_ssl - Win32 Lexical" grammer
build, outside of the normal "mod_ssl - Win32 Debug|Release" builds.
Continues on the path of eliminating external dependencies, we
strongly expect users to never modify the grammers during normal
builds.
Modified:
httpd/httpd/trunk/modules/ssl/mod_ssl.dsp
Modified: httpd/httpd/trunk/modules/ssl/mod_ssl.dsp
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ssl/mod_ssl.dsp?rev=396670&r1=396669&r2=396670&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/mod_ssl.dsp (original)
+++ httpd/httpd/trunk/modules/ssl/mod_ssl.dsp Mon Apr 24 12:48:30 2006
@@ -19,6 +19,7 @@
!MESSAGE
!MESSAGE "mod_ssl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "mod_ssl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_ssl - Win32 Lexical" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -81,12 +82,39 @@
# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_ssl.so" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl.so
# ADD LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib advapi32.lib gdi32.lib libeay32.lib ssleay32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_ssl.so" /libpath:"../../srclib/openssl/out32dll.dbg" /libpath:"../../srclib/openssl/out32.dbg" /libpath:"../../srclib/openssl/out32dll" /libpath:"../../srclib/openssl/out32" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl.so
+!ELSEIF "$(CFG)" == "mod_ssl - 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 "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../generators" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../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=1" /Fd"Release\mod_ssl_src" /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/mod_ssl.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_ssl.so" /d LONG_NAME="proxy_ssl_module for Apache"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_ssl.so" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl.so
+# ADD LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib advapi32.lib gdi32.lib libeay32.lib ssleay32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_ssl.so" /libpath:"../../srclib/openssl/out32dll" /libpath:"../../srclib/openssl/out32" /base:@..\..\os\win32\BaseAddr.ref,mod_ssl.so /opt:ref
+
!ENDIF
# Begin Target
# Name "mod_ssl - Win32 Release"
# Name "mod_ssl - Win32 Debug"
+# Name "mod_ssl - Win32 Lexical"
# Begin Group "Source Files"
# PROP Default_Filter "*.c"
@@ -174,8 +202,8 @@
SOURCE=.\ssl_util_ssl.c
# End Source File
-# End Group
- # Begin Group "Header Files"
+# End Group
+# Begin Group "Header Files"
# PROP Default_Filter "*.h"
# Begin Source File
@@ -216,26 +244,15 @@
!IF "$(CFG)" == "mod_ssl - Win32 Release"
-# Begin Custom Build - Generating ssl_expr_parse.c/.h from ssl_expr_parse.y
-InputPath=.\ssl_expr_parse.y
+# PROP Exclude_From_Build 1
-BuildCmds= \
- bison -y -d ssl_expr_parse.y \
- sed -e "s;yy;ssl_expr_yy;g" -e "/#if defined(c_plusplus) || defined(__cplusplus)/,/#endif/d" <y.tab.c >ssl_expr_parse.c \
- del y.tab.c \
- sed -e "s;yy;ssl_expr_yy;g" <y.tab.h >ssl_expr_parse.h \
- del y.tab.h \
-
+!ELSEIF "$(CFG)" == "mod_ssl - Win32 Debug"
-"ssl_expr_parse.c" : $(SOURCE)
- $(BuildCmds)
+# PROP Exclude_From_Build 1
-"ssl_expr_parse.h" : $(SOURCE)
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "mod_ssl - Win32 Debug"
+!ELSEIF "$(CFG)" == "mod_ssl - Win32 Lexical"
+# PROP Ignore_Default_Tool 1
# Begin Custom Build - Generating ssl_expr_parse.c/.h from ssl_expr_parse.y
InputPath=.\ssl_expr_parse.y
@@ -244,13 +261,12 @@
sed -e "s;yy;ssl_expr_yy;g" -e "/#if defined(c_plusplus) || defined(__cplusplus)/,/#endif/d" <y.tab.c >ssl_expr_parse.c \
del y.tab.c \
sed -e "s;yy;ssl_expr_yy;g" <y.tab.h >ssl_expr_parse.h \
- del y.tab.h \
+ del y.tab.h
-
-"ssl_expr_parse.c" : $(SOURCE)
+"ssl_expr_parse.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"ssl_expr_parse.h" : $(SOURCE)
+"ssl_expr_parse.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -263,24 +279,19 @@
!IF "$(CFG)" == "mod_ssl - Win32 Release"
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Generating ssl_expr_scan.c from ssl_expr_scan.l
-InputPath=.\ssl_expr_scan.l
-
-"ssl_expr_scan.c" : $(SOURCE)
- flex -Pssl_expr_yy -s -B ssl_expr_scan.l
- sed -e "/$$Header:/d" <lex.ssl_expr_yy.c >ssl_expr_scan.c
- del lex.ssl_expr_yy.c
-
-# End Custom Build
+# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "mod_ssl - Win32 Debug"
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "mod_ssl - Win32 Lexical"
+
# PROP Ignore_Default_Tool 1
# Begin Custom Build - Generating ssl_expr_scan.c from ssl_expr_scan.l
InputPath=.\ssl_expr_scan.l
-"ssl_expr_scan.c" : $(SOURCE)
+"ssl_expr_scan.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
flex -Pssl_expr_yy -s -B ssl_expr_scan.l
sed -e "/$$Header:/d" <lex.ssl_expr_yy.c >ssl_expr_scan.c
del lex.ssl_expr_yy.c