You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2001/03/08 16:54:08 UTC
cvs commit: apr-util/xml/expat/lib xml.dsp xml.mak
wrowe 01/03/08 07:54:06
Added: xml/expat/lib xml.dsp xml.mak
Log:
As the design decision has been made not to export the xml engine hiding
within Apache, the xml.dsp/.mak files create a private static library
to be bound into aprutil.lib and libaprutil.dll. Nothing is exported.
There seems no good sense in adding more load time to bring in two dlls
(libaprutil/libexpat) so this is a more effective solution.
Revision Changes Path
1.1 apr-util/xml/expat/lib/xml.dsp
Index: xml.dsp
===================================================================
# Microsoft Developer Studio Project File - Name="xml" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=xml - 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 "xml.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 "xml.mak" CFG="xml - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - 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)" == "xml - 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" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /W3 /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.1\" /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)" == "xml - 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" /D "_MBCS" /FD /c
# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.1\" /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 "xml - Win32 Release"
# Name "xml - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\xmlparse.c
# End Source File
# Begin Source File
SOURCE=.\xmlrole.c
# End Source File
# Begin Source File
SOURCE=.\xmltok.c
# End Source File
# Begin Source File
SOURCE=xmltok_impl.c
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
SOURCE=xmltok_ns.c
# PROP Exclude_From_Build 1
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\ascii.h
# End Source File
# Begin Source File
SOURCE=.\asciitab.h
# End Source File
# Begin Source File
SOURCE=.\config.h
# End Source File
# Begin Source File
SOURCE=.\expat.h
# End Source File
# Begin Source File
SOURCE=.\iasciitab.h
# End Source File
# Begin Source File
SOURCE=.\latin1tab.h
# End Source File
# Begin Source File
SOURCE=.\nametab.h
# End Source File
# Begin Source File
SOURCE=.\utf8tab.h
# End Source File
# Begin Source File
SOURCE=.\xmlrole.h
# End Source File
# Begin Source File
SOURCE=.\xmltok.h
# End Source File
# Begin Source File
SOURCE=.\xmltok_impl.h
# End Source File
# End Group
# Begin Group "Generated Header Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\expat.h.in
!IF "$(CFG)" == "xml - Win32 Release"
# Begin Custom Build
InputPath=.\expat.h.in
".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy .\expat.h.in .\expat.h > nul
echo Created expat.h from expat.h.in
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 Debug"
# Begin Custom Build
InputPath=.\expat.h.in
".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy .\expat.h.in .\expat.h > nul
echo Created expat.h from expat.h.in
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\winconfig.h
!IF "$(CFG)" == "xml - Win32 Release"
# Begin Custom Build
InputPath=.\winconfig.h
".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy .\winconfig.h .\config.h > nul
echo Created config.h from winconfig.h
# End Custom Build
!ELSEIF "$(CFG)" == "xml - Win32 Debug"
# Begin Custom Build
InputPath=.\winconfig.h
".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy .\winconfig.h .\config.h > nul
echo Created config.h from winconfig.h
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Source File
SOURCE=.\ReadMe.txt
# End Source File
# End Target
# End Project
1.1 apr-util/xml/expat/lib/xml.mak
Index: xml.mak
===================================================================
# Microsoft Developer Studio Generated NMAKE File, Based on xml.dsp
!IF "$(CFG)" == ""
CFG=xml - Win32 Debug
!MESSAGE No configuration specified. Defaulting to xml - Win32 Debug.
!ENDIF
!IF "$(CFG)" != "xml - Win32 Release" && "$(CFG)" != "xml - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!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 "xml.mak" CFG="xml - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
!IF "$(CFG)" == "xml - Win32 Release"
OUTDIR=.\LibR
INTDIR=.\LibR
# Begin Custom Macros
OutDir=.\LibR
# End Custom Macros
!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\xml.lib"
!ELSE
ALL : "$(OUTDIR)\xml.lib"
!ENDIF
CLEAN :
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(INTDIR)\xmlparse.obj"
-@erase "$(INTDIR)\xmlrole.obj"
-@erase "$(INTDIR)\xmltok.obj"
-@erase "$(OUTDIR)\xml.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
RSC=rc.exe
CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
"_MBCS" /D VERSION=\"expat_1.95.1\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\LibR/
CPP_SBRS=.
.c{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc"
BSC32_SBRS= \
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib"
LIB32_OBJS= \
"$(INTDIR)\xmlparse.obj" \
"$(INTDIR)\xmlrole.obj" \
"$(INTDIR)\xmltok.obj"
"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
<<
!ELSEIF "$(CFG)" == "xml - Win32 Debug"
OUTDIR=.\LibD
INTDIR=.\LibD
# Begin Custom Macros
OutDir=.\LibD
# End Custom Macros
!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\xml.lib"
!ELSE
ALL : "$(OUTDIR)\xml.lib"
!ENDIF
CLEAN :
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(INTDIR)\vc50.pdb"
-@erase "$(INTDIR)\xmlparse.obj"
-@erase "$(INTDIR)\xmlrole.obj"
-@erase "$(INTDIR)\xmltok.obj"
-@erase "$(OUTDIR)\xml.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
RSC=rc.exe
CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D\
"_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.1\" /Fo"$(INTDIR)\\"\
/Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\LibD/
CPP_SBRS=.
.c{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc"
BSC32_SBRS= \
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib"
LIB32_OBJS= \
"$(INTDIR)\xmlparse.obj" \
"$(INTDIR)\xmlrole.obj" \
"$(INTDIR)\xmltok.obj"
"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
<<
!ENDIF
!IF "$(CFG)" == "xml - Win32 Release" || "$(CFG)" == "xml - Win32 Debug"
SOURCE=.\xmlparse.c
!IF "$(CFG)" == "xml - Win32 Release"
DEP_CPP_XMLPA=\
".\config.h"\
".\expat.h"\
".\xmlrole.h"\
".\xmltok.h"\
"$(INTDIR)\xmlparse.obj" : $(SOURCE) $(DEP_CPP_XMLPA) "$(INTDIR)" ".\config.h"\
".\expat.h"
!ELSEIF "$(CFG)" == "xml - Win32 Debug"
DEP_CPP_XMLPA=\
".\config.h"\
".\expat.h"\
".\xmlrole.h"\
".\xmltok.h"\
"$(INTDIR)\xmlparse.obj" : $(SOURCE) $(DEP_CPP_XMLPA) "$(INTDIR)" ".\config.h"
!ENDIF
SOURCE=.\xmlrole.c
!IF "$(CFG)" == "xml - Win32 Release"
DEP_CPP_XMLRO=\
".\ascii.h"\
".\config.h"\
".\xmlrole.h"\
".\xmltok.h"\
"$(INTDIR)\xmlrole.obj" : $(SOURCE) $(DEP_CPP_XMLRO) "$(INTDIR)" ".\config.h"
!ELSEIF "$(CFG)" == "xml - Win32 Debug"
DEP_CPP_XMLRO=\
".\ascii.h"\
".\config.h"\
".\xmlrole.h"\
".\xmltok.h"\
"$(INTDIR)\xmlrole.obj" : $(SOURCE) $(DEP_CPP_XMLRO) "$(INTDIR)" ".\config.h"
!ENDIF
SOURCE=.\xmltok.c
!IF "$(CFG)" == "xml - Win32 Release"
DEP_CPP_XMLTO=\
".\ascii.h"\
".\asciitab.h"\
".\config.h"\
".\iasciitab.h"\
".\latin1tab.h"\
".\nametab.h"\
".\utf8tab.h"\
".\xmltok.h"\
".\xmltok_impl.c"\
".\xmltok_impl.h"\
".\xmltok_ns.c"\
"$(INTDIR)\xmltok.obj" : $(SOURCE) $(DEP_CPP_XMLTO) "$(INTDIR)" ".\config.h"
!ELSEIF "$(CFG)" == "xml - Win32 Debug"
DEP_CPP_XMLTO=\
".\ascii.h"\
".\asciitab.h"\
".\config.h"\
".\iasciitab.h"\
".\latin1tab.h"\
".\nametab.h"\
".\utf8tab.h"\
".\xmltok.h"\
".\xmltok_impl.c"\
".\xmltok_impl.h"\
".\xmltok_ns.c"\
"$(INTDIR)\xmltok.obj" : $(SOURCE) $(DEP_CPP_XMLTO) "$(INTDIR)" ".\config.h"
!ENDIF
SOURCE=xmltok_impl.c
SOURCE=xmltok_ns.c
SOURCE=.\expat.h.in
!IF "$(CFG)" == "xml - Win32 Release"
InputPath=.\expat.h.in
".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy .\expat.h.in .\expat.h > nul
echo Created expat.h from expat.h.in
!ELSEIF "$(CFG)" == "xml - Win32 Debug"
InputPath=.\expat.h.in
".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy .\expat.h.in .\expat.h > nul
echo Created expat.h from expat.h.in
!ENDIF
SOURCE=.\winconfig.h
!IF "$(CFG)" == "xml - Win32 Release"
InputPath=.\winconfig.h
".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy .\winconfig.h .\config.h > nul
echo Created config.h from winconfig.h
!ELSEIF "$(CFG)" == "xml - Win32 Debug"
InputPath=.\winconfig.h
".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy .\winconfig.h .\config.h > nul
echo Created config.h from winconfig.h
!ENDIF
!ENDIF