wrowe 01/03/08 10:43:58
Modified: . aprutil.dsp libaprutil.dsp
xml apr_xml.c
xml/expat/lib expat.h.in xml.dsp xml.mak
Log:
Ugly hack gone... now need some new goodies
Revision Changes Path
1.21 +29 -0 apr-util/aprutil.dsp
Index: aprutil.dsp
===================================================================
RCS file: /home/cvs/apr-util/aprutil.dsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- aprutil.dsp 2001/02/25 02:24:19 1.20
+++ aprutil.dsp 2001/03/08 18:43:25 1.21
@@ -252,6 +252,35 @@
# End Source File
# Begin Source File
+SOURCE=.\include\private\apu_config.hw
+
+!IF "$(CFG)" == "libaprutil - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\include\private\apu_config.hw
+
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy .\include\private\apu_config.hw .\include\private\apu_config.h >
nul
+ echo Created apu_config.h from apu_config.hw
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\include\private\apu_config.hw
+
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy .\include\private\apu_config.hw .\include\private\apu_config.h >
nul
+ echo Created apu_config.h from apu_config.hw
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\include\private\apu_select_dbm.hw
!IF "$(CFG)" == "aprutil - Win32 Release"
1.13 +29 -0 apr-util/libaprutil.dsp
Index: libaprutil.dsp
===================================================================
RCS file: /home/cvs/apr-util/libaprutil.dsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libaprutil.dsp 2001/02/25 02:24:20 1.12
+++ libaprutil.dsp 2001/03/08 18:43:28 1.13
@@ -257,6 +257,35 @@
# End Source File
# Begin Source File
+SOURCE=.\include\private\apu_config.hw
+
+!IF "$(CFG)" == "libaprutil - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\include\private\apu_config.hw
+
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy .\include\private\apu_config.hw .\include\private\apu_config.h >
nul
+ echo Created apu_config.h from apu_config.hw
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\include\private\apu_config.hw
+
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy .\include\private\apu_config.hw .\include\private\apu_config.h >
nul
+ echo Created apu_config.h from apu_config.hw
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\include\private\apu_select_dbm.hw
!IF "$(CFG)" == "libaprutil - Win32 Release"
1.20 +0 -7 apr-util/xml/apr_xml.c
Index: apr_xml.c
===================================================================
RCS file: /home/cvs/apr-util/xml/apr_xml.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- apr_xml.c 2001/02/28 16:58:34 1.19
+++ apr_xml.c 2001/03/08 18:43:39 1.20
@@ -61,19 +61,12 @@
#include "apr_xml.h"
-#ifdef WIN32
-/* Quick ugly hack to get win32 building ... until I discover
- * the hidden purpose in life for apu_config.h
- */
-#include "xmlparse.h"
-#else
#include "apu_config.h"
#ifdef APR_HAVE_OLD_EXPAT
#include "xmlparse.h"
#else
#include "expat.h"
-#endif
#endif
#define DEBUG_CR "\r\n"
1.2 +6 -0 apr-util/xml/expat/lib/expat.h.in
Index: expat.h.in
===================================================================
RCS file: /home/cvs/apr-util/xml/expat/lib/expat.h.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expat.h.in 2001/02/28 14:41:26 1.1
+++ expat.h.in 2001/03/08 18:43:47 1.2
@@ -725,9 +725,15 @@
XML_Expat_Version XMLPARSEAPI
XML_ExpatVersionInfo(void);
+#ifndef XML_MAJOR_VERSION
#define XML_MAJOR_VERSION @EXPAT_MAJOR_VERSION@
+#endif
+#ifndef XML_MINOR_VERSION
#define XML_MINOR_VERSION @EXPAT_MINOR_VERSION@
+#endif
+#ifndef XML_MICRO_VERSION
#define XML_MICRO_VERSION @EXPAT_EDIT@
+#endif
#ifdef __cplusplus
}
1.2 +2 -2 apr-util/xml/expat/lib/xml.dsp
Index: xml.dsp
===================================================================
RCS file: /home/cvs/apr-util/xml/expat/lib/xml.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml.dsp 2001/03/08 15:54:03 1.1
+++ xml.dsp 2001/03/08 18:43:50 1.2
@@ -43,7 +43,7 @@
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D VERSION=\"expat_1.95.1\" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1 /D
XML_MINOR_VERSION=95 /D XML_MICRO_VERSION=1 /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -68,7 +68,7 @@
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.1\" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1 /D
XML_MINOR_VERSION=95 /D XML_MICRO_VERSION=1 /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
1.2 +4 -2 apr-util/xml/expat/lib/xml.mak
Index: xml.mak
===================================================================
RCS file: /home/cvs/apr-util/xml/expat/lib/xml.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml.mak 2001/03/08 15:54:04 1.1
+++ xml.mak 2001/03/08 18:43:52 1.2
@@ -56,7 +56,8 @@
RSC=rc.exe
CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
- "_MBCS" /D VERSION=\"expat_1.95.1\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD
/c
+ "_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1 /D
XML_MINOR_VERSION=95\
+ /D XML_MICRO_VERSION=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\LibR/
CPP_SBRS=.
@@ -138,7 +139,8 @@
RSC=rc.exe
CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D\
- "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.1\" /Fo"$(INTDIR)\\"\
+ "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1\
+ /D XML_MINOR_VERSION=95 /D XML_MICRO_VERSION=1 /Fo"$(INTDIR)\\"\
/Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\LibD/
CPP_SBRS=.
