From: William A. Rowe Jr Date: Wed, 18 Oct 2000 17:37:05 +0000 (+0000) Subject: expatlib is definately more in sync with the Unix build, so we now X-Git-Tag: APACHE_2_0_ALPHA_8~324 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fead05f0bf63dcdf93cdecc8f2b4755ff1ebef24;p=apache expatlib is definately more in sync with the Unix build, so we now build the expatlib.dsp rather than seperate xmltok/xmlparse .dsp's. Submitted by: Greg Stein Reviewed by: William Rowe git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86644 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/Apache.dsw b/Apache.dsw index bf15d44c89..dbdf12fde1 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -60,10 +60,7 @@ Package=<4> Project_Dep_Name ApacheCore End Project Dependency Begin Project Dependency - Project_Dep_Name xmlparse - End Project Dependency - Begin Project Dependency - Project_Dep_Name xmltok + Project_Dep_Name expatlib End Project Dependency }}} @@ -141,14 +138,14 @@ Package=<4> Project_Dep_Name pcreposix End Project Dependency Begin Project Dependency - Project_Dep_Name xmlparse - End Project Dependency - Begin Project Dependency Project_Dep_Name mod_dav End Project Dependency Begin Project Dependency Project_Dep_Name mod_dav_fs End Project Dependency + Begin Project Dependency + Project_Dep_Name expatlib + End Project Dependency }}} ############################################################################### @@ -210,6 +207,18 @@ Package=<4> ############################################################################### +Project: "expatlib"=".\lib\expat-lite\expatlib.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "gen_test_char"=".\main\gen_test_char.dsp" - Package Owner=<4> Package=<5> @@ -404,9 +413,6 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name xmlparse - End Project Dependency Begin Project Dependency Project_Dep_Name ApacheCoreDll End Project Dependency @@ -419,6 +425,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name mod_dav End Project Dependency + Begin Project Dependency + Project_Dep_Name expatlib + End Project Dependency }}} ############################################################################### @@ -639,33 +648,6 @@ Package=<4> ############################################################################### -Project: "xmlparse"=".\lib\expat-lite\xmlparse.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name xmltok - End Project Dependency -}}} - -############################################################################### - -Project: "xmltok"=".\lib\expat-lite\xmltok.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Global: Package=<5> diff --git a/Makefile.win b/Makefile.win index 5c0c71076b..866568ceac 100644 --- a/Makefile.win +++ b/Makefile.win @@ -69,8 +69,7 @@ _build: $(MAKE) $(MAKEOPT) -f aprlibdll.mak CFG="aprlibdll - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. cd lib\expat-lite - $(MAKE) $(MAKEOPT) -f xmltok.mak CFG="xmltok - Win32 $(LONG)" RECURSE=0 $(CTARGET) - $(MAKE) $(MAKEOPT) -f xmlparse.mak CFG="xmlparse - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f expatlib.mak CFG="expatlib - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. cd lib\pcre $(MAKE) $(MAKEOPT) -f dftables.mak CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -123,9 +122,8 @@ _install: copy Apache$(SHORT)\Apache.exe $(INSTDIR) copy Core$(SHORT)\ApacheCore.dll $(INSTDIR) copy lib\apr\$(LONG)\aprlib.dll $(INSTDIR) - copy lib\expat-lite\XMLParse$(SHORT)\xmlparse.dll $(INSTDIR) - copy lib\expat-lite\XMLTok$(SHORT)\xmltok.dll $(INSTDIR) - copy os\win32\mod_auth_anon$(SHORT)\mod_auth_anon.dll $(INSTDIR)\modules + copy lib\expat-lite\expatlib$(SHORT)\expatlib.dll $(INSTDIR) + copy os\win32\mod_auth_anon$(SHORT)\mod_auth_anon.dll $(INSTDIR)\modules copy os\win32\mod_auth_dbm$(SHORT)\mod_auth_dbm.dll $(INSTDIR)\modules copy os\win32\mod_auth_digest$(SHORT)\mod_auth_digest.dll $(INSTDIR)\modules copy os\win32\mod_cern_meta$(SHORT)\mod_cern_meta.dll $(INSTDIR)\modules diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref index 81ba3f06f4..7271b816a2 100644 --- a/os/win32/BaseAddr.ref +++ b/os/win32/BaseAddr.ref @@ -25,5 +25,4 @@ mod_file_cache 0x6FE00000 0x00020000 mod_auth_dbm 0x6FDF0000 0x00010000 mod_dav_fs 0x6FDE0000 0x00010000 mod_dav 0x6FDC0000 0x00020000 -xmltok 0x6FDA0000 0x00020000 -xmlparse 0x6FD90000 0x00010000 \ No newline at end of file +expatlib 0x6FD00000 0x00030000 diff --git a/srclib/expat-lite/expatlib.def b/srclib/expat-lite/expatlib.def new file mode 100644 index 0000000000..67d1c50f6f --- /dev/null +++ b/srclib/expat-lite/expatlib.def @@ -0,0 +1,51 @@ +; expatlib.def + +LIBRARY expatlib +DESCRIPTION '' + +EXPORTS + XmlGetUtf16InternalEncoding @1 + XmlGetUtf8InternalEncoding @2 + XmlInitEncoding @3 + XmlInitUnknownEncoding @4 + XmlParseXmlDecl @5 + XmlPrologStateInit @6 + XmlSizeOfUnknownEncoding @7 + XmlUtf16Encode @8 + XmlUtf8Encode @9 + + XML_DefaultCurrent @11 + XML_ErrorString @12 + XML_ExternalEntityParserCreate @13 + XML_GetBase @14 + XML_GetBuffer @15 + XML_GetCurrentByteCount @16 + XML_GetCurrentByteIndex @17 + XML_GetCurrentColumnNumber @18 + XML_GetCurrentLineNumber @19 + XML_GetErrorCode @20 + XML_GetSpecifiedAttributeCount @21 + XML_Parse @22 + XML_ParseBuffer @23 + XML_ParserCreate @24 + XML_ParserCreateNS @25 + XML_ParserFree @26 + XML_SetBase @27 + XML_SetCdataSectionHandler @28 + XML_SetCharacterDataHandler @29 + XML_SetCommentHandler @30 + XML_SetDefaultHandler @31 + XML_SetDefaultHandlerExpand @32 + XML_SetElementHandler @33 + XML_SetEncoding @34 + XML_SetExternalEntityRefHandler @35 + XML_SetExternalEntityRefHandlerArg @36 + XML_SetNamespaceDeclHandler @37 + XML_SetNotStandaloneHandler @38 + XML_SetNotationDeclHandler @39 + XML_SetProcessingInstructionHandler @40 + XML_SetUnknownEncodingHandler @41 + XML_SetUnparsedEntityDeclHandler @42 + XML_SetUserData @43 + XML_UseParserAsHandlerArg @44 + diff --git a/srclib/expat-lite/expatlib.dsp b/srclib/expat-lite/expatlib.dsp new file mode 100644 index 0000000000..66b3f40dbf --- /dev/null +++ b/srclib/expat-lite/expatlib.dsp @@ -0,0 +1,124 @@ +# Microsoft Developer Studio Project File - Name="expatlib" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=expatlib - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "expatlib.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "expatlib.mak" CFG="expatlib - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "expatlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "expatlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "expatlib - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "expatlibR" +# PROP Intermediate_Dir "expatlibR" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLTOK_EXPORTS" /D "XMLPARSE_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLTOK_EXPORTS" /D "XMLPARSE_EXPORTS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /nologo /dll /machine:I386 +# ADD LINK32 /nologo /dll /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",expatlib +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "expatlib - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "expatlibD" +# PROP Intermediate_Dir "expatlibD" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLTOK_EXPORTS" /D "XMLPARSE_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLTOK_EXPORTS" /D "XMLPARSE_EXPORTS" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /nologo /dll /debug /machine:I386 +# ADD LINK32 /nologo /dll /debug /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",expatlib +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "expatlib - Win32 Release" +# Name "expatlib - Win32 Debug" +# Begin Source File + +SOURCE="..\..\lib\expat-lite\hashtable.c" +# End Source File +# Begin Source File + +SOURCE="..\..\lib\expat-lite\xmlparse.c" +# End Source File +# Begin Source File + +SOURCE="..\..\lib\expat-lite\xmlparse.h" +# End Source File +# Begin Source File + +SOURCE="..\..\lib\expat-lite\dllmain.c" +# End Source File +# Begin Source File + +SOURCE="..\..\lib\expat-lite\xmlrole.c" +# End Source File +# Begin Source File + +SOURCE="..\..\lib\expat-lite\xmltok.c" +# End Source File +# Begin Source File + +SOURCE="..\..\lib\expat-lite\expatlib.def" +# End Source File + +# End Target +# End Project diff --git a/srclib/expat-lite/libexpat.def b/srclib/expat-lite/libexpat.def new file mode 100644 index 0000000000..67d1c50f6f --- /dev/null +++ b/srclib/expat-lite/libexpat.def @@ -0,0 +1,51 @@ +; expatlib.def + +LIBRARY expatlib +DESCRIPTION '' + +EXPORTS + XmlGetUtf16InternalEncoding @1 + XmlGetUtf8InternalEncoding @2 + XmlInitEncoding @3 + XmlInitUnknownEncoding @4 + XmlParseXmlDecl @5 + XmlPrologStateInit @6 + XmlSizeOfUnknownEncoding @7 + XmlUtf16Encode @8 + XmlUtf8Encode @9 + + XML_DefaultCurrent @11 + XML_ErrorString @12 + XML_ExternalEntityParserCreate @13 + XML_GetBase @14 + XML_GetBuffer @15 + XML_GetCurrentByteCount @16 + XML_GetCurrentByteIndex @17 + XML_GetCurrentColumnNumber @18 + XML_GetCurrentLineNumber @19 + XML_GetErrorCode @20 + XML_GetSpecifiedAttributeCount @21 + XML_Parse @22 + XML_ParseBuffer @23 + XML_ParserCreate @24 + XML_ParserCreateNS @25 + XML_ParserFree @26 + XML_SetBase @27 + XML_SetCdataSectionHandler @28 + XML_SetCharacterDataHandler @29 + XML_SetCommentHandler @30 + XML_SetDefaultHandler @31 + XML_SetDefaultHandlerExpand @32 + XML_SetElementHandler @33 + XML_SetEncoding @34 + XML_SetExternalEntityRefHandler @35 + XML_SetExternalEntityRefHandlerArg @36 + XML_SetNamespaceDeclHandler @37 + XML_SetNotStandaloneHandler @38 + XML_SetNotationDeclHandler @39 + XML_SetProcessingInstructionHandler @40 + XML_SetUnknownEncodingHandler @41 + XML_SetUnparsedEntityDeclHandler @42 + XML_SetUserData @43 + XML_UseParserAsHandlerArg @44 + diff --git a/srclib/expat-lite/libexpat.dsp b/srclib/expat-lite/libexpat.dsp new file mode 100644 index 0000000000..66b3f40dbf --- /dev/null +++ b/srclib/expat-lite/libexpat.dsp @@ -0,0 +1,124 @@ +# Microsoft Developer Studio Project File - Name="expatlib" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=expatlib - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "expatlib.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "expatlib.mak" CFG="expatlib - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "expatlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "expatlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "expatlib - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "expatlibR" +# PROP Intermediate_Dir "expatlibR" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLTOK_EXPORTS" /D "XMLPARSE_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLTOK_EXPORTS" /D "XMLPARSE_EXPORTS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /nologo /dll /machine:I386 +# ADD LINK32 /nologo /dll /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",expatlib +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "expatlib - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "expatlibD" +# PROP Intermediate_Dir "expatlibD" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLTOK_EXPORTS" /D "XMLPARSE_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLTOK_EXPORTS" /D "XMLPARSE_EXPORTS" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /nologo /dll /debug /machine:I386 +# ADD LINK32 /nologo /dll /debug /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",expatlib +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "expatlib - Win32 Release" +# Name "expatlib - Win32 Debug" +# Begin Source File + +SOURCE="..\..\lib\expat-lite\hashtable.c" +# End Source File +# Begin Source File + +SOURCE="..\..\lib\expat-lite\xmlparse.c" +# End Source File +# Begin Source File + +SOURCE="..\..\lib\expat-lite\xmlparse.h" +# End Source File +# Begin Source File + +SOURCE="..\..\lib\expat-lite\dllmain.c" +# End Source File +# Begin Source File + +SOURCE="..\..\lib\expat-lite\xmlrole.c" +# End Source File +# Begin Source File + +SOURCE="..\..\lib\expat-lite\xmltok.c" +# End Source File +# Begin Source File + +SOURCE="..\..\lib\expat-lite\expatlib.def" +# End Source File + +# End Target +# End Project