neilg 2003/07/17 12:10:32
Modified: c/Projects/Win32/BCC.551/Xerces-all Xerces-all.mak
c/Projects/Win32/BCC.551/Xerces-all/XercesLib XercesLib.mak
c/Projects/Win32/BCC.551/Xerces-all/MemHandlerTest
MemHandlerTest.cpp MemHandlerTest.mak
Log:
additional fix for bug 20353; thanks to Vitaly Praperny
Revision Changes Path
1.4 +1 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Xerces-all.mak 2 Jun 2003 22:29:06 -0000 1.3
+++ Xerces-all.mak 17 Jul 2003 19:10:32 -0000 1.4
@@ -99,5 +99,5 @@
MemHandlerTest: MemHandlerTest\MemHandlerTest.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
cd ..
1.3 +3 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesLib.mak 14 Jul 2003 18:51:55 -0000 1.2
+++ XercesLib.mak 17 Jul 2003 19:10:32 -0000 1.3
@@ -308,6 +308,9 @@
$(TARGETPATH)\obj\XMemory.obj \
$(TARGETPATH)\obj\DOMNormalizer.obj \
$(TARGETPATH)\obj\MemoryManagerImpl.obj \
+ $(TARGETPATH)\obj\XMLGrammarPoolImpl.obj \
+ $(TARGETPATH)\obj\XMLDTDDescriptionImpl.obj \
+ $(TARGETPATH)\obj\XMLSchemaDescriptionImpl.obj \
$(DEPRDOM_OBJFILES)
RESFILES = $(TARGETPATH)\obj\Version.res
MAINSOURCE = XercesLib.cpp
1.2 +4 -1
xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/MemHandlerTest/MemHandlerTest.cpp
Index: MemHandlerTest.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/MemHandlerTest/MemHandlerTest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MemHandlerTest.cpp 2 Jun 2003 22:29:06 -0000 1.1
+++ MemHandlerTest.cpp 17 Jul 2003 19:10:32 -0000 1.2
@@ -6,12 +6,15 @@
//---------------------------------------------------------------------------
#ifdef NEVER_COMPILE
+#include <stdio.h>
+
// Dummy entry point to satisfy the BCB IDE
int main(int argc, char* argv[])
{
+ printf("*** Compile XercesC Library with Deprecated DOM API for this test\n");
return 0;
}
#endif
// The real entry point is in the Samples folder
-#include <MemoryMonitor.cpp>
+//#include <MemoryMonitor.cpp>
1.3 +8 -3
xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/MemHandlerTest/MemHandlerTest.mak
Index: MemHandlerTest.mak
===================================================================
RCS file:
/home/cvs/xml-xerces/c/Projects/Win32/BCC.551/Xerces-all/MemHandlerTest/MemHandlerTest.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemHandlerTest.mak 3 Jun 2003 18:43:23 -0000 1.2
+++ MemHandlerTest.mak 17 Jul 2003 19:10:32 -0000 1.3
@@ -5,7 +5,12 @@
# ---------------------------------------------------------------------------
TARGETPATH=..\..\..\..\..\Build\Win32\BCC.551
PROJECT = $(TARGETPATH)\MemHandlerTest.exe
-OBJFILES = $(TARGETPATH)\obj\MemoryMonitor.obj $(TARGETPATH)\obj\SimpleHashPtr.obj
+!if $d(WITHDEPRDOM)
+DEPRDOM_OBJFILES = $(TARGETPATH)\obj\MemoryMonitor.obj
$(TARGETPATH)\obj\SimpleHashPtr.obj
+!else
+NO_DEPRDOM_PRODUCEMAIN=NEVER_COMPILE
+!endif
+OBJFILES = $(DEPRDOM_OBJFILES) $(TARGETPATH)\obj\MemHandlerTest.obj
RESFILES =
MAINSOURCE = MemHandlerTest.cpp
RESDEPEN = $(RESFILES)
@@ -16,11 +21,11 @@
SPARELIBS =
DEFFILE =
# ---------------------------------------------------------------------------
-PATHCPP = .;
+PATHCPP = .;..\..\..\..\..\tests\MemHandlerTest
PATHASM = .;
PATHPAS = .;
PATHRC = .;
-USERDEFINES = _DEBUG;PLATFORM_WIN32
+USERDEFINES = _DEBUG;PLATFORM_WIN32;WIN32_LEAN_AND_MEAN;$(NO_DEPRDOM_PRODUCEMAIN)
SYSDEFINES = _NO_VCL;NO_STRICT;_VIS_NOLIB;_RTLDLL
INCLUDEPATH = ..\..\..\..\..\tests\MemHandlerTest;..\..\..\..\..\src
LIBPATH =
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
