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 2001/03/08 17:12:39 UTC
cvs commit: httpd-2.0/srclib/expat-lite .cvsignore CHANGES Makefile.in asciitab.h dllmain.c expat.dsp expat.html expat.mak hashtable.c hashtable.h iasciitab.h latin1tab.h libexpat.dsp libexpat.mak nametab.h utf8tab.h xmldef.h xmlparse.c xmlparse.def xmlparse.dsp xmlparse.h xmlrole.c xmlrole.h xmltok.c xmltok.def xmltok.dsp xmltok.h xmltok_impl.c xmltok_impl.h xmltok_ns.c
wrowe 01/03/08 08:12:37
Modified: . Apache.dsw Makefile.win libhttpd.mak
Removed: srclib/expat-lite .cvsignore CHANGES Makefile.in asciitab.h
dllmain.c expat.dsp expat.html expat.mak
hashtable.c hashtable.h iasciitab.h latin1tab.h
libexpat.dsp libexpat.mak nametab.h utf8tab.h
xmldef.h xmlparse.c xmlparse.def xmlparse.dsp
xmlparse.h xmlrole.c xmlrole.h xmltok.c xmltok.def
xmltok.dsp xmltok.h xmltok_impl.c xmltok_impl.h
xmltok_ns.c
Log:
Goodbye srclib/expat ... completes the build for srclib/apr-util/xml/expat
Revision Changes Path
1.48 +15 -30 httpd-2.0/Apache.dsw
Index: Apache.dsw
===================================================================
RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Apache.dsw 2001/02/25 20:53:42 1.47
+++ Apache.dsw 2001/03/08 16:11:15 1.48
@@ -132,10 +132,10 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name expat
+ Project_Dep_Name apr
End Project Dependency
Begin Project Dependency
- Project_Dep_Name apr
+ Project_Dep_Name xml
End Project Dependency
}}}
@@ -153,18 +153,6 @@
###############################################################################
-Project: "expat"=".\srclib\expat-lite\expat.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
Project: "gen_test_char"=".\server\gen_test_char.dsp" - Package Owner=<4>
Package=<5>
@@ -255,24 +243,12 @@
Project_Dep_Name libapr
End Project Dependency
Begin Project Dependency
- Project_Dep_Name libexpat
+ Project_Dep_Name xml
End Project Dependency
}}}
###############################################################################
-Project: "libexpat"=".\srclib\expat-lite\libexpat.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
Project: "libhttpd"=".\libhttpd.dsp" - Package Owner=<4>
Package=<5>
@@ -288,9 +264,6 @@
Project_Dep_Name libaprutil
End Project Dependency
Begin Project Dependency
- Project_Dep_Name libexpat
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name pcre
End Project Dependency
Begin Project Dependency
@@ -616,6 +589,18 @@
###############################################################################
Project: "rotatelogs"=".\support\rotatelogs.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "xml"=".\srclib\apr-util\xml\expat\lib\xml.dsp" - Package Owner=<4>
Package=<5>
{{{
1.54 +3 -11 httpd-2.0/Makefile.win
Index: Makefile.win
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.win,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Makefile.win 2001/02/25 20:53:42 1.53
+++ Makefile.win 2001/03/08 16:11:17 1.54
@@ -65,11 +65,9 @@
$(MAKE) $(MAKEOPT) -f apr.mak CFG="apr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f libapr.mak CFG="libapr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
- cd srclib\expat-lite
- $(MAKE) $(MAKEOPT) -f expat.mak CFG="expat - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f libexpat.mak CFG="libexpat - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..
- cd srclib\apr-util
+ cd srclib\apr-util\xml\expat\lib
+ $(MAKE) $(MAKEOPT) -f xml.mak CFG="xml - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..\..\..
$(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
@@ -144,7 +142,6 @@
copy $(LONG)\libhttpd.dll "$(INSTDIR)\bin"
copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)\bin"
copy srclib\apr-util\$(LONG)\libaprutil.dll "$(INSTDIR)\bin"
- copy srclib\expat-lite\$(LONG)\libexpat.dll "$(INSTDIR)\bin"
copy modules\aaa\$(LONG)\mod_auth_anon.so "$(INSTDIR)\modules"
copy modules\aaa\$(LONG)\mod_auth_dbm.so "$(INSTDIR)\modules"
copy modules\aaa\$(LONG)\mod_auth_digest.so "$(INSTDIR)\modules"
@@ -181,9 +178,6 @@
xcopy srclib\apr-util\include\*.h "$(INSTDIR)\include" /d < <<
A
<<
- xcopy srclib\expat-lite\*.h "$(INSTDIR)\include\xml" /d < <<
-A
-<<
xcopy srclib\pcre\*.h "$(INSTDIR)\include\pcre" /d < <<
A
<<
@@ -198,8 +192,6 @@
copy srclib\apr\$(LONG)\libapr.exp "$(INSTDIR)\libexec"
copy srclib\apr-util\$(LONG)\libaprutil.lib "$(INSTDIR)\libexec"
copy srclib\apr-util\$(LONG)\libaprutil.exp "$(INSTDIR)\libexec"
- copy srclib\expat-lite\$(LONG)\libexpat.lib "$(INSTDIR)\libexec"
- copy srclib\expat-lite\$(LONG)\libexpat.exp "$(INSTDIR)\libexec"
copy $(LONG)\libhttpd.exp "$(INSTDIR)\libexec"
copy $(LONG)\libhttpd.lib "$(INSTDIR)\libexec"
copy modules\dav\main\$(LONG)\mod_dav.exp "$(INSTDIR)\libexec"
1.7 +8 -40 httpd-2.0/libhttpd.mak
Index: libhttpd.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/libhttpd.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libhttpd.mak 2001/03/08 05:38:16 1.6
+++ libhttpd.mak 2001/03/08 16:11:19 1.7
@@ -42,16 +42,15 @@
!ELSE
ALL : "gen_uri_delims - Win32 Release" "gen_test_char - Win32 Release"\
- "pcreposix - Win32 Release" "pcre - Win32 Release" "libexpat - Win32 Release"\
- "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\libhttpd.dll"
+ "pcreposix - Win32 Release" "pcre - Win32 Release" "libaprutil - Win32 Release"\
+ "libapr - Win32 Release" "$(OUTDIR)\libhttpd.dll"
!ENDIF
!IF "$(RECURSE)" == "1"
CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
- "libexpat - Win32 ReleaseCLEAN" "pcre - Win32 ReleaseCLEAN"\
- "pcreposix - Win32 ReleaseCLEAN" "gen_test_char - Win32 ReleaseCLEAN"\
- "gen_uri_delims - Win32 ReleaseCLEAN"
+ "pcre - Win32 ReleaseCLEAN" "pcreposix - Win32 ReleaseCLEAN"\
+ "gen_test_char - Win32 ReleaseCLEAN" "gen_uri_delims - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -209,7 +208,6 @@
"$(INTDIR)\vhost.obj" \
".\srclib\apr-util\Release\libaprutil.lib" \
".\srclib\apr\Release\libapr.lib" \
- ".\srclib\expat-lite\Release\libexpat.lib" \
".\srclib\pcre\LibR\pcre.lib" \
".\srclib\pcre\LibR\pcreposix.lib"
@@ -233,16 +231,15 @@
!ELSE
ALL : "gen_uri_delims - Win32 Debug" "gen_test_char - Win32 Debug"\
- "pcreposix - Win32 Debug" "pcre - Win32 Debug" "libexpat - Win32 Debug"\
- "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\libhttpd.dll"
+ "pcreposix - Win32 Debug" "pcre - Win32 Debug" "libaprutil - Win32 Debug"\
+ "libapr - Win32 Debug" "$(OUTDIR)\libhttpd.dll"
!ENDIF
!IF "$(RECURSE)" == "1"
CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
- "libexpat - Win32 DebugCLEAN" "pcre - Win32 DebugCLEAN"\
- "pcreposix - Win32 DebugCLEAN" "gen_test_char - Win32 DebugCLEAN"\
- "gen_uri_delims - Win32 DebugCLEAN"
+ "pcre - Win32 DebugCLEAN" "pcreposix - Win32 DebugCLEAN"\
+ "gen_test_char - Win32 DebugCLEAN" "gen_uri_delims - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -402,7 +399,6 @@
"$(INTDIR)\vhost.obj" \
".\srclib\apr-util\Debug\libaprutil.lib" \
".\srclib\apr\Debug\libapr.lib" \
- ".\srclib\expat-lite\Debug\libexpat.lib" \
".\srclib\pcre\LibD\pcre.lib" \
".\srclib\pcre\LibD\pcreposix.lib"
@@ -2552,34 +2548,6 @@
cd ".\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
CFG="libaprutil - Win32 Debug" RECURSE=1
- cd "..\.."
-
-!ENDIF
-
-!IF "$(CFG)" == "libhttpd - Win32 Release"
-
-"libexpat - Win32 Release" :
- cd ".\srclib\expat-lite"
- $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Release"
- cd "..\.."
-
-"libexpat - Win32 ReleaseCLEAN" :
- cd ".\srclib\expat-lite"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak"\
- CFG="libexpat - Win32 Release" RECURSE=1
- cd "..\.."
-
-!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug"
-
-"libexpat - Win32 Debug" :
- cd ".\srclib\expat-lite"
- $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Debug"
- cd "..\.."
-
-"libexpat - Win32 DebugCLEAN" :
- cd ".\srclib\expat-lite"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak" CFG="libexpat - Win32 Debug"\
- RECURSE=1
cd "..\.."
!ENDIF