You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2006/03/01 07:14:29 UTC
svn commit: r381918 - in /apr/apr/branches/0.9.x: apr.dsp build/apr_app.dsp
build/cvtdsp.pl build/libapr_app.dsp libapr.dsp test/testapp.dsp
test/testappnt.dsp
Author: wrowe
Date: Tue Feb 28 22:14:26 2006
New Revision: 381918
URL: http://svn.apache.org/viewcvs?rev=381918&view=rev
Log:
Quiet the only warning in apr build on Studio 2005, /GX deprecated.
/EHsc has always meant the same thing. However, I'm reverting this
to /GX for VC 5.0 (if anyone still uses it) when invoking the
build/cvtdsp.pl -5 command to convert these projects to Visual 5.0.
Backports 381915
Modified:
apr/apr/branches/0.9.x/apr.dsp
apr/apr/branches/0.9.x/build/apr_app.dsp
apr/apr/branches/0.9.x/build/cvtdsp.pl
apr/apr/branches/0.9.x/build/libapr_app.dsp
apr/apr/branches/0.9.x/libapr.dsp
apr/apr/branches/0.9.x/test/testapp.dsp
apr/apr/branches/0.9.x/test/testappnt.dsp
Modified: apr/apr/branches/0.9.x/apr.dsp
URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/apr.dsp?rev=381918&r1=381917&r2=381918&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/apr.dsp (original)
+++ apr/apr/branches/0.9.x/apr.dsp Tue Feb 28 22:14:26 2006
@@ -64,8 +64,8 @@
# PROP Intermediate_Dir "LibD"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibD\apr_src" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibD\apr_src" /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
Modified: apr/apr/branches/0.9.x/build/apr_app.dsp
URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/build/apr_app.dsp?rev=381918&r1=381917&r2=381918&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/build/apr_app.dsp (original)
+++ apr/apr/branches/0.9.x/build/apr_app.dsp Tue Feb 28 22:14:26 2006
@@ -64,8 +64,8 @@
# PROP Intermediate_Dir "LibD"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /D "APR_DECLARE_STATIC" /Fd"LibD\apr_app_src" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /D "APR_DECLARE_STATIC" /Fd"LibD\apr_app_src" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
Modified: apr/apr/branches/0.9.x/build/cvtdsp.pl
URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/build/cvtdsp.pl?rev=381918&r1=381917&r2=381918&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/build/cvtdsp.pl (original)
+++ apr/apr/branches/0.9.x/build/cvtdsp.pl Tue Feb 28 22:14:26 2006
@@ -54,6 +54,12 @@
if ($src =~ s|^(# ADD BASE CPP .*)/ZI (.*)|$1/Zi $2|) {
$verchg = -1;
}
+ if ($src =~ s|^(# ADD CPP .*)/EHsc (.*)|$1/GX $2|) {
+ $verchg = -1;
+ }
+ if ($src =~ s|^(# ADD BASE CPP .*)/EHsc (.*)|$1/GX $2|) {
+ $verchg = -1;
+ }
if ($src !~ m|^# PROP AllowPerConfigDependencies|) {
print $dstfl $src; }
else {
@@ -88,6 +94,12 @@
if ($src =~ s|^(!MESSAGE .*)\\\n|$1|) {
$cont = <$srcfl>;
$src = $src . $cont;
+ $verchg = -1;
+ }
+ if ($src =~ s|^(# ADD CPP .*)/GX (.*)|$1/EHsc $2|) {
+ $verchg = -1;
+ }
+ if ($src =~ s|^(# ADD BASE CPP .*)/GX (.*)|$1/EHsc $2|) {
$verchg = -1;
}
print $dstfl $src;
Modified: apr/apr/branches/0.9.x/build/libapr_app.dsp
URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/build/libapr_app.dsp?rev=381918&r1=381917&r2=381918&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/build/libapr_app.dsp (original)
+++ apr/apr/branches/0.9.x/build/libapr_app.dsp Tue Feb 28 22:14:26 2006
@@ -64,8 +64,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" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fd"Debug\libapr_app_src" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fd"Debug\libapr_app_src" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
Modified: apr/apr/branches/0.9.x/libapr.dsp
URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/libapr.dsp?rev=381918&r1=381917&r2=381918&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/libapr.dsp (original)
+++ apr/apr/branches/0.9.x/libapr.dsp Tue Feb 28 22:14:26 2006
@@ -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" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Debug\libapr_src" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Debug\libapr_src" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "_DEBUG"
Modified: apr/apr/branches/0.9.x/test/testapp.dsp
URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/test/testapp.dsp?rev=381918&r1=381917&r2=381918&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/test/testapp.dsp (original)
+++ apr/apr/branches/0.9.x/test/testapp.dsp Tue Feb 28 22:14:26 2006
@@ -65,8 +65,8 @@
# PROP Intermediate_Dir "."
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"./testapp" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"./testapp" /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
Modified: apr/apr/branches/0.9.x/test/testappnt.dsp
URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/test/testappnt.dsp?rev=381918&r1=381917&r2=381918&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/test/testappnt.dsp (original)
+++ apr/apr/branches/0.9.x/test/testappnt.dsp Tue Feb 28 22:14:26 2006
@@ -65,8 +65,8 @@
# PROP Intermediate_Dir "."
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../include" /D "_DEBUG" /D "WIN32" /D "WINNT" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"./testappnt" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /D "_DEBUG" /D "WIN32" /D "WINNT" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"./testappnt" /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe