Fix the build schema : add a library version, expat.lib, for static

  linkage.  Also depreciate the libexpat.def with some export magic.

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

diff --git a/srclib/expat-lite/expat.dsp b/srclib/expat-lite/expat.dsp
new file mode 100644 (file)
index 0000000..a2932f2
--- /dev/null
+++ b/srclib/expat-lite/expat.dsp
@@ -0,0 +1,110 @@
+# Microsoft Developer Studio Project File - Name="expat" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=expat - 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 "expat.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 "expat.mak" CFG="expat - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "expat - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "expat - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+
+!IF  "$(CFG)" == "expat - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "LibR"
+# PROP BASE Intermediate_Dir "LibR"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "LibR"
+# PROP Intermediate_Dir "LibR"
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "XML_MIN_SIZE" /Fd"LibR\expat" /FD /c
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "expat - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "LibD"
+# PROP BASE Intermediate_Dir "LibD"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "LibD"
+# PROP Intermediate_Dir "LibD"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+# 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 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "XML_MIN_SIZE" /Fd"LibD\expat" /FD /c
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "expat - Win32 Release"
+# Name "expat - Win32 Debug"
+# Begin Source File
+
+SOURCE=".\dllmain.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hashtable.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\xmlparse.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\xmlparse.h"
+# End Source File
+# Begin Source File
+
+SOURCE=".\xmlrole.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\xmltok.c"
+# End Source File
+# End Target
+# End Project

diff --git a/srclib/expat-lite/libexpat.def b/srclib/expat-lite/libexpat.def
deleted file mode 100644 (file)
index d7b7205..0000000
--- a/srclib/expat-lite/libexpat.def
+++ /dev/null
@@ -1,51 +0,0 @@
-; libexpat.def
-
-LIBRARY libexpat
-DESCRIPTION 'expat-lite XML Parsing Library'
-
-EXPORTS
-   XmlGetUtf16InternalEncoding
-   XmlGetUtf8InternalEncoding
-   XmlInitEncoding
-   XmlInitUnknownEncoding
-   XmlParseXmlDecl
-   XmlPrologStateInit
-   XmlSizeOfUnknownEncoding
-   XmlUtf16Encode
-   XmlUtf8Encode
-
-   XML_DefaultCurrent
-   XML_ErrorString
-   XML_ExternalEntityParserCreate
-   XML_GetBase
-   XML_GetBuffer
-   XML_GetCurrentByteCount
-   XML_GetCurrentByteIndex
-   XML_GetCurrentColumnNumber
-   XML_GetCurrentLineNumber
-   XML_GetErrorCode
-   XML_GetSpecifiedAttributeCount
-   XML_Parse
-   XML_ParseBuffer
-   XML_ParserCreate
-   XML_ParserCreateNS
-   XML_ParserFree
-   XML_SetBase
-   XML_SetCdataSectionHandler
-   XML_SetCharacterDataHandler
-   XML_SetCommentHandler
-   XML_SetDefaultHandler
-   XML_SetDefaultHandlerExpand
-   XML_SetElementHandler
-   XML_SetEncoding
-   XML_SetExternalEntityRefHandler
-   XML_SetExternalEntityRefHandlerArg
-   XML_SetNamespaceDeclHandler
-   XML_SetNotStandaloneHandler
-   XML_SetNotationDeclHandler
-   XML_SetProcessingInstructionHandler
-   XML_SetUnknownEncodingHandler
-   XML_SetUnparsedEntityDeclHandler
-   XML_SetUserData
-   XML_UseParserAsHandlerArg
-

diff --git a/srclib/expat-lite/libexpat.dsp b/srclib/expat-lite/libexpat.dsp
index 0b9713d3ac59927d6822225ccc4ab2307235fdab..c90ac73f5e72d34613678735414f7cff1a2715ef 100644 (file)
--- a/srclib/expat-lite/libexpat.dsp
+++ b/srclib/expat-lite/libexpat.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLTOK_EXPORTS" /D "XMLPARSE_EXPORTS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLTOK_EXPORTS" /D "XMLPARSE_EXPORTS" /Fd"Release/libexpat" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "XML_MIN_SIZE" /D XMLTOKAPI="__declspec(dllexport)" /D XMLPARSEAPI="__declspec(dllexport)" /Fd"Release/libexpat" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -52,8 +52,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 /nologo /base:"0x6EC00000" /dll /incremental:no /map /dll /machine:I386
-# ADD LINK32 /nologo /base:"0x6EC00000" /dll /incremental:no /map /dll /machine:I386
+# ADD BASE LINK32 /nologo /base:"0x6EC00000" /dll /map /machine:I386
+# ADD LINK32 /nologo /base:"0x6EC00000" /dll /map /machine:I386
 
 !ELSEIF  "$(CFG)" == "libexpat - Win32 Debug"
 
@@ -69,7 +69,7 @@ LINK32=link.exe
 # 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" /FD /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"Debug/libexpat" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "XML_MIN_SIZE" /D XMLTOKAPI="__declspec(dllexport)" /D XMLPARSEAPI="__declspec(dllexport)" /Fd"Debug/libexpat" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -78,8 +78,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 /nologo /base:"0x6EC00000" /dll /incremental:no /map /debug /machine:I386 
-# ADD LINK32 /nologo /base:"0x6EC00000" /dll /incremental:no /map /debug /machine:I386 
+# ADD BASE LINK32 /nologo /base:"0x6EC00000" /dll /incremental:no /map /debug /machine:I386
+# ADD LINK32 /nologo /base:"0x6EC00000" /dll /incremental:no /map /debug /machine:I386
 
 !ENDIF 
 
@@ -89,19 +89,19 @@ LINK32=link.exe
 # Name "libexpat - Win32 Debug"
 # Begin Source File
 
-SOURCE=".\hashtable.c"
+SOURCE=".\dllmain.c"
 # End Source File
 # Begin Source File
 
-SOURCE=".\xmlparse.c"
+SOURCE=".\hashtable.c"
 # End Source File
 # Begin Source File
 
-SOURCE=".\xmlparse.h"
+SOURCE=".\xmlparse.c"
 # End Source File
 # Begin Source File
 
-SOURCE=".\dllmain.c"
+SOURCE=".\xmlparse.h"
 # End Source File
 # Begin Source File
 
@@ -111,10 +111,5 @@ SOURCE=".\xmlrole.c"
 
 SOURCE=".\xmltok.c"
 # End Source File
-# Begin Source File
-
-SOURCE=".\libexpat.def"
-# End Source File
-
 # End Target
 # End Project

diff --git a/srclib/expat-lite/libexpat.mak b/srclib/expat-lite/libexpat.mak
index 7ab0154f6061cbca58f90170e5aa54d0c4fcc078..4dc25253cc16c8ba31ca0c0857692e1155445a2a 100644 (file)
--- a/srclib/expat-lite/libexpat.mak
+++ b/srclib/expat-lite/libexpat.mak
@@ -62,8 +62,9 @@ CLEAN :
 
 CPP=cl.exe
 CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D\
- "_USRDLL" /D "XMLTOK_EXPORTS" /D "XMLPARSE_EXPORTS" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\libexpat" /FD /c 
+ "XML_MIN_SIZE" /D XMLTOKAPI="__declspec(dllexport)" /D\
+ XMLPARSEAPI="__declspec(dllexport)" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libexpat"\
+ /FD /c 
 CPP_OBJS=.\Release/
 CPP_SBRS=.
 
@@ -107,10 +108,7 @@ BSC32_SBRS= \
 LINK32=link.exe
 LINK32_FLAGS=/nologo /base:"0x6EC00000" /dll /incremental:no\
  /pdb:"$(OUTDIR)\libexpat.pdb" /map:"$(INTDIR)\libexpat.map" /machine:I386\
- /def:".\libexpat.def" /out:"$(OUTDIR)\libexpat.dll"\
- /implib:"$(OUTDIR)\libexpat.lib" 
-DEF_FILE= \
-       ".\libexpat.def"
+ /out:"$(OUTDIR)\libexpat.dll" /implib:"$(OUTDIR)\libexpat.lib" 
 LINK32_OBJS= \
        "$(INTDIR)\dllmain.obj" \
        "$(INTDIR)\hashtable.obj" \
@@ -159,8 +157,9 @@ CLEAN :
 
 CPP=cl.exe
 CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
- /D "_MBCS" /D "_USRDLL" /D "XMLTOK_EXPORTS" /D "XMLPARSE_EXPORTS"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libexpat" /FD /c 
+ /D "_MBCS" /D "XML_MIN_SIZE" /D XMLTOKAPI="__declspec(dllexport)" /D\
+ XMLPARSEAPI="__declspec(dllexport)" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libexpat"\
+ /FD /c 
 CPP_OBJS=.\Debug/
 CPP_SBRS=.
 
@@ -204,10 +203,7 @@ BSC32_SBRS= \
 LINK32=link.exe
 LINK32_FLAGS=/nologo /base:"0x6EC00000" /dll /incremental:no\
  /pdb:"$(OUTDIR)\libexpat.pdb" /map:"$(INTDIR)\libexpat.map" /debug\
- /machine:I386 /def:".\libexpat.def" /out:"$(OUTDIR)\libexpat.dll"\
- /implib:"$(OUTDIR)\libexpat.lib" 
-DEF_FILE= \
-       ".\libexpat.def"
+ /machine:I386 /out:"$(OUTDIR)\libexpat.dll" /implib:"$(OUTDIR)\libexpat.lib" 
 LINK32_OBJS= \
        "$(INTDIR)\dllmain.obj" \
        "$(INTDIR)\hashtable.obj" \