You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_ftp-commits@incubator.apache.org by wr...@apache.org on 2006/09/28 00:02:36 UTC
svn commit: r450642 - in /incubator/mod_ftp/trunk:
modules/mod_ftp_cmd_pwd.dsp src/mod_ftp.dsp
Author: wrowe
Date: Wed Sep 27 17:02:35 2006
New Revision: 450642
URL: http://svn.apache.org/viewvc?view=rev&rev=450642
Log:
Simplifying. FTP_NO_GLOB will become FTP_HAS_GLOB defined
in ftp_config.h, internally.
Modified:
incubator/mod_ftp/trunk/modules/mod_ftp_cmd_pwd.dsp
incubator/mod_ftp/trunk/src/mod_ftp.dsp
Modified: incubator/mod_ftp/trunk/modules/mod_ftp_cmd_pwd.dsp
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/modules/mod_ftp_cmd_pwd.dsp?view=diff&rev=450642&r1=450641&r2=450642
==============================================================================
--- incubator/mod_ftp/trunk/modules/mod_ftp_cmd_pwd.dsp (original)
+++ incubator/mod_ftp/trunk/modules/mod_ftp_cmd_pwd.dsp Wed Sep 27 17:02:35 2006
@@ -41,8 +41,8 @@
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "SRC_EXPORTS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../include" /I "$(APACHE_TMPINSTALL_WINNT)/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fd"Release/mod_ftp_cmd_pwd" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "SRC_EXPORTS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../include" /I "$(APACHE2_HOME)/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fd"Release/mod_ftp_cmd_pwd_src" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -52,7 +52,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /machine:I386
-# ADD LINK32 libapr.lib libhttpd.lib libaprutil.lib /nologo /dll /debug /machine:I386 /out:"Release/mod_ftp_cmd_pwd.so" /libpath:"$(APACHE_TMPINSTALL_WINNT)\lib" /base:@"$(SRCROOT)/dev-bin/cov_dll.ref",ftp_module /opt:ref
+# ADD LINK32 libapr.lib libhttpd.lib libaprutil.lib /nologo /dll /debug /incremental:no /out:"Release/mod_ftp_cmd_pwd.so" /libpath:"$(APACHE2_HOME)\lib" /base:"0x46530000" /opt:ref
!ELSEIF "$(CFG)" == "mod_ftp_cmd_pwd - Win32 Debug"
@@ -67,8 +67,8 @@
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SRC_EXPORTS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../include" /I "$(APACHE_TMPINSTALL_WINNT)/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fd"Debug\mod_ftp_cmd_pwd" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /GX /Od /Zi /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SRC_EXPORTS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Od /Zi /I "../include" /I "$(APACHE2_HOME)/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fd"Debug\mod_ftp_cmd_pwd_src" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libapr.lib libhttpd.lib libaprutil.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_ftp_cmd_pwd.so" /libpath:"$(APACHE_TMPINSTALL_WINNT)\lib" /base:@"$(SRCROOT)/dev-bin/cov_dll.ref",ftp_module
+# ADD LINK32 libapr.lib libhttpd.lib libaprutil.lib /nologo /dll /debug /incremental:no /out:"Debug/mod_ftp_cmd_pwd.so" /libpath:"$(APACHE2_HOME)\lib" /base:"0x46530000"
!ENDIF
Modified: incubator/mod_ftp/trunk/src/mod_ftp.dsp
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/src/mod_ftp.dsp?view=diff&rev=450642&r1=450641&r2=450642
==============================================================================
--- incubator/mod_ftp/trunk/src/mod_ftp.dsp (original)
+++ incubator/mod_ftp/trunk/src/mod_ftp.dsp Wed Sep 27 17:02:35 2006
@@ -42,8 +42,8 @@
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "SRC_EXPORTS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../include" /I "$(APACHE_TMPINSTALL_WINNT)/include" /D "FTP_NO_GLOB" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "FTP_DECLARE_EXPORT" /Fd"Release/mod_ftp" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "SRC_EXPORTS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../include" /I "$(APACHE2_HOME)/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "FTP_DECLARE_EXPORT" /Fd"Release/mod_ftp_src" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /machine:I386
-# ADD LINK32 libapr.lib libhttpd.lib libaprutil.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Release/mod_ftp.so" /libpath:"$(APACHE_TMPINSTALL_WINNT)\lib" /base:@"$(SRCROOT)/dev-bin/cov_dll.ref",ftp_module
+# ADD LINK32 libapr.lib libhttpd.lib libaprutil.lib wsock32.lib /nologo /dll /debug /incremental:no /out:"Release/mod_ftp.so" /libpath:"$(APACHE2_HOME)\lib" /base:"0x46540000" /opt:ref
!ELSEIF "$(CFG)" == "mod_ftp - Win32 Debug"
@@ -68,8 +68,8 @@
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SRC_EXPORTS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../include" /I "$(APACHE_TMPINSTALL_WINNT)/include" /D "FTP_NO_GLOB" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "FTP_DECLARE_EXPORT" /Fd"Debug\mod_ftp" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /GX /Od /Zi /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SRC_EXPORTS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Od /Zi /I "../include" /I "$(APACHE2_HOME)/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "FTP_DECLARE_EXPORT" /Fd"Debug/mod_ftp_src" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libapr.lib libhttpd.lib libaprutil.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/mod_ftp.so" /libpath:"$(APACHE_TMPINSTALL_WINNT)\lib" /base:@"$(SRCROOT)/dev-bin/cov_dll.ref",ftp_module
+# ADD LINK32 libapr.lib libhttpd.lib libaprutil.lib wsock32.lib /nologo /dll /debug /incremental:no /out:"Debug/mod_ftp.so" /libpath:"$(APACHE2_HOME)\lib" /base:"0x46540000"
!ENDIF
@@ -157,27 +157,25 @@
# End Group
# Begin Source File
-SOURCE="..\config-win32.awk"
+SOURCE="..\include\ftp_config.h.in"
!IF "$(CFG)" == "mod_ftp - Win32 Release"
-USERDEP__CONFI="..\configure.in"
# Begin Custom Build - Generating ftp_config.h
-InputPath="..\config-win32.awk"
+InputPath="..\include\ftp_config.h.in"
"..\include\ftp_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f $(InputPath) < ..\configure.in > ..\include\ftp_config.h
+ echo /* No configuration */ > ..\include\ftp_config.h
# End Custom Build
!ELSEIF "$(CFG)" == "mod_ftp - Win32 Debug"
-USERDEP__CONFI="..\configure.in"
# Begin Custom Build - Generating ftp_config.h
-InputPath="..\config-win32.awk"
+InputPath="..\include\ftp_config.h.in"
"..\include\ftp_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f $(InputPath) < ..\configure.in > ..\include\ftp_config.h
+ echo /* No configuration */ > ..\include\ftp_config.h
# End Custom Build