Commit c6bf8f76 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Goodbye srclib/expat ... completes the build for srclib/apr-util/xml/expat


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88474 13f79535-47bb-0310-9956-ffa450edef68
parent de3098b2

Apache.dsw

+15 −30
Original line number Diff line number Diff line
@@ -132,10 +132,10 @@ Package=<5> 
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 @@ Package=<4> 


###############################################################################



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 @@ Package=<4> 
    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 @@ Package=<4> 
    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
@@ -627,6 +600,18 @@ Package=<4> 


###############################################################################



Project: "xml"=".\srclib\apr-util\xml\expat\lib\xml.dsp" - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

}}}



###############################################################################



Global:



Package=<5>

Makefile.win

+3 −11
Original line number Diff line number Diff line
@@ -65,11 +65,9 @@ _build: 
	 $(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 @@ _install: 
	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"
@@ -180,9 +177,6 @@ A 
<<

	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 @@ A 
	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"

libhttpd.mak

+8 −40
Original line number Diff line number Diff line
@@ -42,16 +42,15 @@ ALL : "$(OUTDIR)\libhttpd.dll" 
!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 @@ LINK32_OBJS= \ 
	"$(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 @@ ALL : "$(OUTDIR)\libhttpd.dll" 
!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 @@ LINK32_OBJS= \ 
	"$(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"
@@ -2558,34 +2554,6 @@ NODEP_CPP_SERVI=\ 


!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 



!IF  "$(CFG)" == "libhttpd - Win32 Release"



"pcre - Win32 Release" : 

   cd ".\srclib\pcre"

   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.mak" CFG="pcre - Win32 Release"

srclib/expat-lite/.cvsignore

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
.deps

.libs

*.la

Makefile

*.lo

*.slo

*.so

*.dll

*.def

*.plg

Debug

Release

LibD

LibR
 
 No newline at end of file

srclib/expat-lite/CHANGES

deleted100644 → 0
+0 −65
Original line number Diff line number Diff line 
=== PURPOSE ===



This file documents the changes made by the Apache Group to James

Clark's Expat parser. The original Expat distribution can be found at

http://www.jclark.com/xml/expat.html.





=== SUBSET INFORMATION ===



Apache does not choose (or need) to use the entire Expat parser

distribution. The subset that Apache will use will be referred to as

"expat-lite". In particular, this directory contains the files from

the following Expat distribution subdirectories:



  expat/xmltok/*

  expat/xmlparse/*



We also retain expat/expat.html for attribution to James Clark and

licensing information.



Note that Apache has replaced (with custom versions) the .dsp files

normally distributed with Expat. Other changes are detailed further

below.





=== FILES ADDED ===



This file (CHANGES) has been added to document changes from the

original Expat distribution.



Makefile.tmpl has been created from scratch to provide build

instructions to the Apache build system.



xmlparse.def and xmltok.def have been added.



.cvsignore has been added.





=== CHANGES TO ORIGINAL ===



The files, in their original state from the Expat distribution, have

been tagged within CVS with the "EXPAT_1_1" tag. That tag may be used

as a reference for changes made by the Apache Group.



The following changes have been made:



June, 1999:



  - modified xmldef.h to define XML_BYTE_ORDER in terms of the

    AP_BYTE_ORDER symbol.

  - removed compilation warnings from: xmlparse.c, xmltok.c, xmltok.h, 

    xmltok_impl.c, xmltok_ns.c



November, 1999:



  - xmlparse.{def,dsp,mak} and xmltok.{def,dsp,mak} were added.

    NOTE: the .dsp files are different from the standard Expat

	  distribution.

  - dllmain.c (from the Expat distribution) was added



January, 2000:



  - Renamed lookup() in hashtable.[ch] to hashTableLookup() to prevent

    possible conflicts with third-party libraries and modules. Updated

    calls in xmlparse.c accordingly.