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/02/25 21:50:22 UTC
cvs commit: httpd-2.0/srclib/expat-lite expat.dsp libexpat.dsp libexpat.mak libexpat.def
wrowe 01/02/25 12:50:22
Modified: srclib/expat-lite libexpat.dsp libexpat.mak
Added: srclib/expat-lite expat.dsp
Removed: srclib/expat-lite libexpat.def
Log:
Fix the build schema : add a library version, expat.lib, for static
linkage. Also depreciate the libexpat.def with some export magic.
Revision Changes Path
1.6 +10 -15 httpd-2.0/srclib/expat-lite/libexpat.dsp
Index: libexpat.dsp
===================================================================
RCS file: /home/cvs/httpd-2.0/srclib/expat-lite/libexpat.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libexpat.dsp 2000/12/21 01:25:04 1.5
+++ libexpat.dsp 2001/02/25 20:50:22 1.6
@@ -43,7 +43,7 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
# 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=".\xmltok.c"
# End Source File
-# Begin Source File
-
-SOURCE=".\libexpat.def"
-# End Source File
-
# End Target
# End Project
1.3 +8 -12 httpd-2.0/srclib/expat-lite/libexpat.mak
Index: libexpat.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/srclib/expat-lite/libexpat.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libexpat.mak 2001/02/25 02:53:30 1.2
+++ libexpat.mak 2001/02/25 20:50:22 1.3
@@ -62,8 +62,9 @@
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 @@
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 @@
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 @@
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" \
1.1 httpd-2.0/srclib/expat-lite/expat.dsp
Index: expat.dsp
===================================================================
# 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