amassari 2004/02/15 12:15:15 Modified: c/Projects/Win32/BCB6/Xerces-all/XercesLib XercesLib.bpr c/Projects/Win32/BCC.551/Xerces-all Xerces-all.mak c/Projects/Win32/BCC.551/Xerces-all/XercesLib XercesLib.mak Added: c/Projects/Win32/BCC.551/Xerces-all/PSVIWriter PSVIWriter.cpp PSVIWriter.mak c/Projects/Win32/BCC.551/Xerces-all/SCMPrint SCMPrint.cpp SCMPrint.mak c/Projects/Win32/BCC.551/Xerces-all/XSerializerTest XSerializerTest.cpp XSerializerTest.mak Log: Updated Borland's makefile; patch by Vitaly Prapirny Revision Changes Path 1.20 +2 -1 xml-xerces/c/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr Index: XercesLib.bpr =================================================================== RCS file: /home/cvs/xml-xerces/c/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- XercesLib.bpr 13 Feb 2004 18:55:00 -0000 1.19 +++ XercesLib.bpr 15 Feb 2004 20:15:15 -0000 1.20 @@ -348,7 +348,8 @@ ..\..\..\..\..\Build\Win32\BCB6\obj\DOMXPathException.obj ..\..\..\..\..\Build\Win32\BCB6\obj\XSObjectFactory.obj ..\..\..\..\..\Build\Win32\BCB6\obj\XMLIBM1047Transcoder.obj - ..\..\..\..\..\Build\Win32\BCB6\obj\XMLCanRepGroup.obj"/> + ..\..\..\..\..\Build\Win32\BCB6\obj\XMLCanRepGroup.obj + ..\..\..\..\..\Build\Win32\BCB6\obj\BinMemOutputStream.obj"/> <RESFILES value="..\..\..\..\..\src\xercesc\util\Platforms\Win32\Version.res"/> <IDLFILES value=""/> <IDLGENFILES value=""/> 1.5 +16 -1 xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/Xerces-all.mak Index: Xerces-all.mak =================================================================== RCS file: /home/cvs/xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/Xerces-all.mak,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Xerces-all.mak 17 Jul 2003 19:10:32 -0000 1.4 +++ Xerces-all.mak 15 Feb 2004 20:15:15 -0000 1.5 @@ -17,7 +17,7 @@ MAKEN = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f PROJECTNAMES = XercesLib DOMCount DOMPrint SAXCount SAXPrint SAX2Count SAX2Print \ DOMTest DOMMemTest DOMRangeTest DOMTraversal EncodingTest InitTermTest \ - ThreadTest MemHandlerTest + ThreadTest MemHandlerTest XSerializerTest PSVIWriter SCMPrint !include ..\..\..\..\version.incl XERCESVER=$(VER) @@ -98,6 +98,21 @@ cd .. MemHandlerTest: MemHandlerTest\MemHandlerTest.mak + cd $< + $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM) + cd .. + +XSerializerTest: XSerializerTest\XSerializerTest.mak + cd $< + $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM) + cd .. + +PSVIWriter: PSVIWriter\PSVIWriter.mak + cd $< + $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM) + cd .. + +SCMPrint: SCMPrint\SCMPrint.mak cd $< $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM) cd .. 1.1 xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/PSVIWriter/PSVIWriter.cpp Index: PSVIWriter.cpp =================================================================== #pragma hdrstop //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- #ifdef NEVER_COMPILE // Dummy entry point to satisfy the BCB IDE int main(int argc, char* argv[]) { return 0; } #endif // The real entry point is in the Samples folder #include <PSVIWriter.cpp> 1.1 xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/PSVIWriter/PSVIWriter.mak Index: PSVIWriter.mak =================================================================== # --------------------------------------------------------------------------- !if !$d(BCB) BCB = $(MAKEDIR)\.. !endif # --------------------------------------------------------------------------- TARGETPATH=..\..\..\..\..\Build\Win32\BCC.551 PROJECT = $(TARGETPATH)\PSVIWriter.exe OBJFILES = $(TARGETPATH)\obj\PSVIWriter.obj \ $(TARGETPATH)\obj\PSVIUni.obj \ $(TARGETPATH)\obj\PSVIWriterHandlers.obj RESFILES = MAINSOURCE = PSVIWriter.cpp RESDEPEN = $(RESFILES) LIBFILES = $(TARGETPATH)\xerces-bor_$(XERCESVER).lib IDLFILES = IDLGENFILES = LIBRARIES = PACKAGES = SPARELIBS = DEFFILE = # --------------------------------------------------------------------------- PATHCPP = .;..\..\..\..\..\samples\PSVIWriter PATHASM = .; PATHPAS = .; PATHRC = .; USERDEFINES = _DEBUG SYSDEFINES = _NO_VCL;NO_STRICT;_VIS_NOLIB;_RTLDLL INCLUDEPATH = ..\..\..\..\..\samples\PSVIWriter;..\..\..\..\..\src LIBPATH = ..\..\..\..\..\samples\PSVIWriter WARNINGS= # --------------------------------------------------------------------------- CFLAG1 = -Od -w -g0 -Tkh30000 -X- -r- -a8 -4 -b -k -y -v -vi- -c -tWM -tWC IDLCFLAGS = -src_suffix cpp -boa PFLAGS = -N2$(TARGETPATH)\obj \ -N0$(TARGETPATH)\obj -$YD -$W -$O- -v -JPHN -M RFLAGS = AFLAGS = /mx /w2 /zd LFLAGS = -I$(TARGETPATH)\obj -ap -Tpe -x -Gn -v # --------------------------------------------------------------------------- ALLOBJ = c0x32.obj $(OBJFILES) ALLRES = $(RESFILES) ALLLIB = $(LIBFILES) import32.lib cw32mti.lib # --------------------------------------------------------------------------- # --------------------------------------------------------------------------- # MAKE SECTION # --------------------------------------------------------------------------- # This section of the project file is not used by the BCB IDE. It is for # the benefit of building from the command-line using the MAKE utility. # --------------------------------------------------------------------------- .autodepend # --------------------------------------------------------------------------- !if "$(USERDEFINES)" != "" AUSERDEFINES = -d$(USERDEFINES:;= -d) !else AUSERDEFINES = !endif !if !$d(BCC32) BCC32 = bcc32 !endif !if !$d(CPP32) CPP32 = cpp32 !endif !if !$d(DCC32) DCC32 = dcc32 !endif !if !$d(TASM32) TASM32 = tasm32 !endif !if !$d(LINKER) LINKER = ilink32 !endif !if !$d(BRCC32) BRCC32 = brcc32 !endif # --------------------------------------------------------------------------- !if $d(PATHCPP) .PATH.CPP = $(PATHCPP) .PATH.C = $(PATHCPP) !endif !if $d(PATHPAS) .PATH.PAS = $(PATHPAS) !endif !if $d(PATHASM) .PATH.ASM = $(PATHASM) !endif !if $d(PATHRC) .PATH.RC = $(PATHRC) !endif # --------------------------------------------------------------------------- $(PROJECT): $(IDLGENFILES) $(OBJFILES) $(RESDEPEN) $(DEFFILE) $(BCB)\BIN\$(LINKER) @&&! $(LFLAGS) -L$(LIBPATH) + $(ALLOBJ), + $(PROJECT),, + $(ALLLIB), + $(DEFFILE), + $(ALLRES) ! # --------------------------------------------------------------------------- .pas.hpp: $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< } .pas.obj: $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< } .cpp.obj: $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< } .c.obj: $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< } .c.i: $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< } .cpp.i: $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< } .asm.obj: $(BCB)\BIN\$(TASM32) $(AFLAGS) -i$(INCLUDEPATH:;= -i) $(AUSERDEFINES) -d$(SYSDEFINES:;= -d) $<, $@ .rc.res: $(BCB)\BIN\$(BRCC32) $(RFLAGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $< # --------------------------------------------------------------------------- 1.1 xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/SCMPrint/SCMPrint.cpp Index: SCMPrint.cpp =================================================================== #pragma hdrstop //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- #ifdef NEVER_COMPILE // Dummy entry point to satisfy the BCB IDE int main(int argc, char* argv[]) { return 0; } #endif // The real entry point is in the Samples folder #include <SCMPrint.cpp> 1.1 xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/SCMPrint/SCMPrint.mak Index: SCMPrint.mak =================================================================== # --------------------------------------------------------------------------- !if !$d(BCB) BCB = $(MAKEDIR)\.. !endif # --------------------------------------------------------------------------- TARGETPATH=..\..\..\..\..\Build\Win32\BCC.551 PROJECT = $(TARGETPATH)\SCMPrint.exe OBJFILES = $(TARGETPATH)\obj\SCMPrint.obj RESFILES = MAINSOURCE = SCMPrint.cpp RESDEPEN = $(RESFILES) LIBFILES = $(TARGETPATH)\xerces-bor_$(XERCESVER).lib IDLFILES = IDLGENFILES = LIBRARIES = PACKAGES = SPARELIBS = DEFFILE = # --------------------------------------------------------------------------- PATHCPP = .; PATHASM = .; PATHPAS = .; PATHRC = .; USERDEFINES = _DEBUG SYSDEFINES = _NO_VCL;NO_STRICT;_VIS_NOLIB;_RTLDLL INCLUDEPATH = ..\..\..\..\..\samples\SCMPrint;..\..\..\..\..\src LIBPATH = WARNINGS= # --------------------------------------------------------------------------- CFLAG1 = -Od -w -g0 -Tkh30000 -X- -r- -a8 -4 -b -k -y -v -vi- -c -tWM -tWC IDLCFLAGS = -src_suffix cpp -boa PFLAGS = -N2$(TARGETPATH)\obj \ -N0$(TARGETPATH)\obj -$YD -$W -$O- -v -JPHN -M RFLAGS = AFLAGS = /mx /w2 /zd LFLAGS = -I$(TARGETPATH)\obj -ap -Tpe -x -Gn -v # --------------------------------------------------------------------------- ALLOBJ = c0x32.obj $(OBJFILES) ALLRES = $(RESFILES) ALLLIB = $(LIBFILES) import32.lib cw32mti.lib # --------------------------------------------------------------------------- # --------------------------------------------------------------------------- # MAKE SECTION # --------------------------------------------------------------------------- # This section of the project file is not used by the BCB IDE. It is for # the benefit of building from the command-line using the MAKE utility. # --------------------------------------------------------------------------- .autodepend # --------------------------------------------------------------------------- !if "$(USERDEFINES)" != "" AUSERDEFINES = -d$(USERDEFINES:;= -d) !else AUSERDEFINES = !endif !if !$d(BCC32) BCC32 = bcc32 !endif !if !$d(CPP32) CPP32 = cpp32 !endif !if !$d(DCC32) DCC32 = dcc32 !endif !if !$d(TASM32) TASM32 = tasm32 !endif !if !$d(LINKER) LINKER = ilink32 !endif !if !$d(BRCC32) BRCC32 = brcc32 !endif # --------------------------------------------------------------------------- !if $d(PATHCPP) .PATH.CPP = $(PATHCPP) .PATH.C = $(PATHCPP) !endif !if $d(PATHPAS) .PATH.PAS = $(PATHPAS) !endif !if $d(PATHASM) .PATH.ASM = $(PATHASM) !endif !if $d(PATHRC) .PATH.RC = $(PATHRC) !endif # --------------------------------------------------------------------------- $(PROJECT): $(IDLGENFILES) $(OBJFILES) $(RESDEPEN) $(DEFFILE) $(BCB)\BIN\$(LINKER) @&&! $(LFLAGS) -L$(LIBPATH) + $(ALLOBJ), + $(PROJECT),, + $(ALLLIB), + $(DEFFILE), + $(ALLRES) ! # --------------------------------------------------------------------------- .pas.hpp: $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< } .pas.obj: $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< } .cpp.obj: $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< } .c.obj: $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< } .c.i: $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< } .cpp.i: $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< } .asm.obj: $(BCB)\BIN\$(TASM32) $(AFLAGS) -i$(INCLUDEPATH:;= -i) $(AUSERDEFINES) -d$(SYSDEFINES:;= -d) $<, $@ .rc.res: $(BCB)\BIN\$(BRCC32) $(RFLAGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $< # --------------------------------------------------------------------------- 1.1 xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/XSerializerTest/XSerializerTest.cpp Index: XSerializerTest.cpp =================================================================== #pragma hdrstop //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- #ifdef NEVER_COMPILE // Dummy entry point to satisfy the BCB IDE int main(int argc, char* argv[]) { return 0; } #endif // The real entry point is in the Samples folder #include <XSerializerTest.cpp> 1.1 xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/XSerializerTest/XSerializerTest.mak Index: XSerializerTest.mak =================================================================== # --------------------------------------------------------------------------- !if !$d(BCB) BCB = $(MAKEDIR)\.. !endif # --------------------------------------------------------------------------- TARGETPATH=..\..\..\..\..\Build\Win32\BCC.551 PROJECT = $(TARGETPATH)\XSerializerTest.exe OBJFILES = $(TARGETPATH)\obj\XSerializerTest.obj \ $(TARGETPATH)\obj\XSerializerHandlers.obj RESFILES = MAINSOURCE = XSerializerTest.cpp RESDEPEN = $(RESFILES) LIBFILES = $(TARGETPATH)\xerces-bor_$(XERCESVER).lib IDLFILES = IDLGENFILES = LIBRARIES = PACKAGES = SPARELIBS = DEFFILE = # --------------------------------------------------------------------------- PATHCPP = .;..\..\..\..\..\tests\XSerializerTest PATHASM = .; PATHPAS = .; PATHRC = .; USERDEFINES = _DEBUG SYSDEFINES = _NO_VCL;NO_STRICT;_VIS_NOLIB;_RTLDLL INCLUDEPATH = ..\..\..\..\..\tests\XSerializerTest;..\..\..\..\..\src LIBPATH = ..\..\..\..\..\tests\XSerializerTest WARNINGS= # --------------------------------------------------------------------------- CFLAG1 = -Od -w -g0 -Tkh30000 -X- -r- -a8 -4 -b -k -y -v -vi- -c -tWM -tWC IDLCFLAGS = -src_suffix cpp -boa PFLAGS = -N2$(TARGETPATH)\obj \ -N0$(TARGETPATH)\obj -$YD -$W -$O- -v -JPHN -M RFLAGS = AFLAGS = /mx /w2 /zd LFLAGS = -I$(TARGETPATH)\obj -ap -Tpe -x -Gn -v # --------------------------------------------------------------------------- ALLOBJ = c0x32.obj $(OBJFILES) ALLRES = $(RESFILES) ALLLIB = $(LIBFILES) import32.lib cw32mti.lib # --------------------------------------------------------------------------- # --------------------------------------------------------------------------- # MAKE SECTION # --------------------------------------------------------------------------- # This section of the project file is not used by the BCB IDE. It is for # the benefit of building from the command-line using the MAKE utility. # --------------------------------------------------------------------------- .autodepend # --------------------------------------------------------------------------- !if "$(USERDEFINES)" != "" AUSERDEFINES = -d$(USERDEFINES:;= -d) !else AUSERDEFINES = !endif !if !$d(BCC32) BCC32 = bcc32 !endif !if !$d(CPP32) CPP32 = cpp32 !endif !if !$d(DCC32) DCC32 = dcc32 !endif !if !$d(TASM32) TASM32 = tasm32 !endif !if !$d(LINKER) LINKER = ilink32 !endif !if !$d(BRCC32) BRCC32 = brcc32 !endif # --------------------------------------------------------------------------- !if $d(PATHCPP) .PATH.CPP = $(PATHCPP) .PATH.C = $(PATHCPP) !endif !if $d(PATHPAS) .PATH.PAS = $(PATHPAS) !endif !if $d(PATHASM) .PATH.ASM = $(PATHASM) !endif !if $d(PATHRC) .PATH.RC = $(PATHRC) !endif # --------------------------------------------------------------------------- $(PROJECT): $(IDLGENFILES) $(OBJFILES) $(RESDEPEN) $(DEFFILE) $(BCB)\BIN\$(LINKER) @&&! $(LFLAGS) -L$(LIBPATH) + $(ALLOBJ), + $(PROJECT),, + $(ALLLIB), + $(DEFFILE), + $(ALLRES) ! # --------------------------------------------------------------------------- .pas.hpp: $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< } .pas.obj: $(BCB)\BIN\$(DCC32) $(PFLAGS) -U$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -O$(INCLUDEPATH) --BCB {$< } .cpp.obj: $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< } .c.obj: $(BCB)\BIN\$(BCC32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n$(@D) {$< } .c.i: $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< } .cpp.i: $(BCB)\BIN\$(CPP32) $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n. {$< } .asm.obj: $(BCB)\BIN\$(TASM32) $(AFLAGS) -i$(INCLUDEPATH:;= -i) $(AUSERDEFINES) -d$(SYSDEFINES:;= -d) $<, $@ .rc.res: $(BCB)\BIN\$(BRCC32) $(RFLAGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $< # --------------------------------------------------------------------------- 1.8 +1 -0 xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak Index: XercesLib.mak =================================================================== RCS file: /home/cvs/xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- XercesLib.mak 31 Dec 2003 10:40:08 -0000 1.7 +++ XercesLib.mak 15 Feb 2004 20:15:15 -0000 1.8 @@ -355,6 +355,7 @@ $(TARGETPATH)\obj\XSObjectFactory.obj \ $(TARGETPATH)\obj\XMLIBM1047Transcoder.obj \ $(TARGETPATH)\obj\XMLCanRepGroup.obj \ + $(TARGETPATH)\obj\BinMemOutputStream.obj \ $(DEPRDOM_OBJFILES) RESFILES = $(TARGETPATH)\obj\Version.res MAINSOURCE = XercesLib.cpp
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]