knoaman 2003/06/03 10:48:30
Modified: c/Projects/Win32/VC6/xerces-all/MemHandlerTest
MemHandlerTest.dsp MemHandlerTest.mak
c/tests/MemHandlerTest Makefile.in
Log:
Update MemHandlerTest project files.
Revision Changes Path
1.2 +23 -10
xml-xerces/c/Projects/Win32/VC6/xerces-all/MemHandlerTest/MemHandlerTest.dsp
Index: MemHandlerTest.dsp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/Projects/Win32/VC6/xerces-all/MemHandlerTest/MemHandlerTest.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MemHandlerTest.dsp 2 Jun 2003 22:29:09 -0000 1.1
+++ MemHandlerTest.dsp 3 Jun 2003 17:48:30 -0000 1.2
@@ -1,4 +1,4 @@
-# Microsoft Developer Studio Project File - Name="ThreadTest" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="MemHandlerTest" - Package
Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
@@ -53,7 +53,7 @@
# ADD BSC32
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /subsystem:console
/machine:I386
-# ADD LINK32 kernel32.lib user32.lib xerces-c_2.lib /subsystem:console
/machine:I386 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_2.lib /version:1.0
/subsystem:console /machine:I386 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
!ELSEIF "$(CFG)" == "MemHandlerTest - Win32 Debug"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /GZ /c
-# ADD CPP /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D
"_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
+# ADD CPP /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D
"_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +79,6 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /subsystem:console /debug
/machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /debug
/machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
-# SUBTRACT LINK32 /incremental:no
!ELSEIF "$(CFG)" == "MemHandlerTest - Win64 Debug"
@@ -95,7 +94,7 @@
# PROP Intermediate_Dir "..\..\..\..\..\Build\Win64\VC6\Debug\obj"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D
"_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
+# ADD BASE CPP /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D
"_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
# SUBTRACT BASE CPP /YX
# ADD CPP /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG"
/D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -104,9 +103,8 @@
# ADD BASE BSC32
# ADD BSC32
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console
/debug /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
-# SUBTRACT BASE LINK32 /incremental:no
-# ADD LINK32 kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /debug
/pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console
/debug /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /debug
/pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "MemHandlerTest - Win64 Release"
@@ -132,8 +130,8 @@
# ADD BASE BSC32
# ADD BSC32
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2.lib /subsystem:console
/libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
-# ADD LINK32 kernel32.lib user32.lib xerces-c_2.lib /subsystem:console
/incremental:yes /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2.lib /version:1.0
/subsystem:console /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console
/incremental:yes /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -150,12 +148,27 @@
# Begin Source File
SOURCE=..\..\..\..\..\tests\MemHandlerTest\MemoryMonitor.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\..\tests\MemHandlerTest\SimpleHashPtr.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\tests\MemHandlerTest\MemoryMonitor.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\tests\MemHandlerTest\SimpleHashPtr.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\tests\MemHandlerTest\SimpleValueHashTableOf.hpp
+# End Source File
# End Group
# Begin Group "Resource Files"
1.2 +35 -33
xml-xerces/c/Projects/Win32/VC6/xerces-all/MemHandlerTest/MemHandlerTest.mak
Index: MemHandlerTest.mak
===================================================================
RCS file:
/home/cvs/xml-xerces/c/Projects/Win32/VC6/xerces-all/MemHandlerTest/MemHandlerTest.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MemHandlerTest.mak 2 Jun 2003 22:29:09 -0000 1.1
+++ MemHandlerTest.mak 3 Jun 2003 17:48:30 -0000 1.2
@@ -37,11 +37,11 @@
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\MemoryMonitor.exe"
+ALL : "$(OUTDIR)\MemHandlerTest.exe"
!ELSE
-ALL : "XercesLib - Win32 Release" "$(OUTDIR)\MemoryMonitor.exe"
+ALL : "XercesLib - Win32 Release" "$(OUTDIR)\MemHandlerTest.exe"
!ENDIF
@@ -53,7 +53,7 @@
[EMAIL PROTECTED] "$(INTDIR)\MemoryMonitor.obj"
[EMAIL PROTECTED] "$(INTDIR)\SimpleHashPtr.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc60.idb"
- [EMAIL PROTECTED] "$(OUTDIR)\MemoryMonitor.exe"
+ [EMAIL PROTECTED] "$(OUTDIR)\MemHandlerTest.exe"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -96,17 +96,17 @@
RSC=rc.exe
BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\MemoryMonitor.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\MemHandlerTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console
/incremental:no /pdb:"$(OUTDIR)\MemoryMonitor.pdb" /machine:I386
/out:"$(OUTDIR)\MemoryMonitor.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console
/incremental:no /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /machine:I386
/out:"$(OUTDIR)\MemHandlerTest.exe" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\MemoryMonitor.obj" \
"$(INTDIR)\SimpleHashPtr.obj" \
"$(OUTDIR)\xerces-c_2.lib"
-"$(OUTDIR)\MemoryMonitor.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -121,11 +121,11 @@
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\MemoryMonitor.exe"
+ALL : "$(OUTDIR)\MemHandlerTest.exe"
!ELSE
-ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\MemoryMonitor.exe"
+ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\MemHandlerTest.exe"
!ENDIF
@@ -138,9 +138,9 @@
[EMAIL PROTECTED] "$(INTDIR)\SimpleHashPtr.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc60.idb"
[EMAIL PROTECTED] "$(INTDIR)\vc60.pdb"
- [EMAIL PROTECTED] "$(OUTDIR)\MemoryMonitor.exe"
- [EMAIL PROTECTED] "$(OUTDIR)\MemoryMonitor.ilk"
- [EMAIL PROTECTED] "$(OUTDIR)\MemoryMonitor.pdb"
+ [EMAIL PROTECTED] "$(OUTDIR)\MemHandlerTest.exe"
+ [EMAIL PROTECTED] "$(OUTDIR)\MemHandlerTest.ilk"
+ [EMAIL PROTECTED] "$(OUTDIR)\MemHandlerTest.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -149,7 +149,7 @@
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D
"_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D
"_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -183,17 +183,17 @@
RSC=rc.exe
BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\MemoryMonitor.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\MemHandlerTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console
/incremental:yes /pdb:"$(OUTDIR)\MemoryMonitor.pdb" /debug /machine:I386
/out:"$(OUTDIR)\MemoryMonitor.exe" /pdbtype:sept
/libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console
/incremental:yes /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /debug /machine:I386
/out:"$(OUTDIR)\MemHandlerTest.exe" /pdbtype:sept
/libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\MemoryMonitor.obj" \
"$(INTDIR)\SimpleHashPtr.obj" \
"$(OUTDIR)\xerces-c_2D.lib"
-"$(OUTDIR)\MemoryMonitor.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -208,11 +208,11 @@
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\MemoryMonitor.exe"
+ALL : "$(OUTDIR)\MemHandlerTest.exe"
!ELSE
-ALL : "XercesLib - Win64 Debug" "$(OUTDIR)\MemoryMonitor.exe"
+ALL : "XercesLib - Win64 Debug" "$(OUTDIR)\MemHandlerTest.exe"
!ENDIF
@@ -225,9 +225,9 @@
[EMAIL PROTECTED] "$(INTDIR)\SimpleHashPtr.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc60.idb"
[EMAIL PROTECTED] "$(INTDIR)\vc60.pdb"
- [EMAIL PROTECTED] "$(OUTDIR)\MemoryHandler.exe"
- [EMAIL PROTECTED] "$(OUTDIR)\MemoryHandler.ilk"
- [EMAIL PROTECTED] "$(OUTDIR)\MemoryHandler.pdb"
+ [EMAIL PROTECTED] "$(OUTDIR)\MemHandlerTest.exe"
+ [EMAIL PROTECTED] "$(OUTDIR)\MemHandlerTest.ilk"
+ [EMAIL PROTECTED] "$(OUTDIR)\MemHandlerTest.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -270,17 +270,17 @@
RSC=rc.exe
BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\MemoryMonitor.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\MemHandlerTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console
/incremental:yes /pdb:"$(OUTDIR)\MemoryMonitor.pdb" /debug /machine:IX86
/out:"$(OUTDIR)\MemoryMonitor.exe" /pdbtype:sept
/libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console
/incremental:yes /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /debug /machine:IX86
/out:"$(OUTDIR)\MemHandlerTest.exe" /pdbtype:sept
/libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\MemoryMonitor.obj" \
"$(INTDIR)\SimpleHashPtr.obj" \
"$(OUTDIR)\xerces-c_2D.lib"
-"$(OUTDIR)\MemoryMonitor.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -295,11 +295,11 @@
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\MemoryMonitor.exe"
+ALL : "$(OUTDIR)\MemHandlerTest.exe"
!ELSE
-ALL : "XercesLib - Win64 Release" "$(OUTDIR)\MemoryMonitor.exe"
+ALL : "XercesLib - Win64 Release" "$(OUTDIR)\MemHandlerTest.exe"
!ENDIF
@@ -311,8 +311,8 @@
[EMAIL PROTECTED] "$(INTDIR)\MemoryMonitor.obj"
[EMAIL PROTECTED] "$(INTDIR)\SimpleHashPtr.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc60.idb"
- [EMAIL PROTECTED] "$(OUTDIR)\MemoryMonitor.exe"
- [EMAIL PROTECTED] "$(OUTDIR)\MemoryMonitor.ilk"
+ [EMAIL PROTECTED] "$(OUTDIR)\MemHandlerTest.exe"
+ [EMAIL PROTECTED] "$(OUTDIR)\MemHandlerTest.ilk"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -355,17 +355,17 @@
RSC=rc.exe
BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\MemoryMonitor.bsc"
+BSC32_FLAGS=/o"$(OUTDIR)\MemHandlerTest.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /subsystem:console
/incremental:yes /pdb:"$(OUTDIR)\MemoryMonitor.pdb" /machine:IX86
/out:"$(OUTDIR)\MemoryMonitor.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release"
/machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console
/incremental:yes /pdb:"$(OUTDIR)\MemHandlerTest.pdb" /machine:IX86
/out:"$(OUTDIR)\MemHandlerTest.exe" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release"
/machine:IA64
LINK32_OBJS= \
"$(INTDIR)\MemoryMonitor.obj" \
"$(INTDIR)\SimpleHashPtr.obj" \
"$(OUTDIR)\xerces-c_2.lib"
-"$(OUTDIR)\MemoryMonitor.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\MemHandlerTest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -374,10 +374,10 @@
!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("MemoryMonitor.dep")
-!INCLUDE "MemoryMonitor.dep"
+!IF EXISTS("MemHandlerTest.dep")
+!INCLUDE "MemHandlerTest.dep"
!ELSE
-!MESSAGE Warning: cannot find "MemoryMonitor.dep"
+!MESSAGE Warning: cannot find "MemHandlerTest.dep"
!ENDIF
!ENDIF
@@ -389,8 +389,10 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
SOURCE=..\..\..\..\..\tests\MemHandlerTest\SimpleHashPtr.cpp
+
"$(INTDIR)\SimpleHashPtr.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+
!IF "$(CFG)" == "MemHandlerTest - Win32 Release"
1.2 +2 -2 xml-xerces/c/tests/MemHandlerTest/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/MemHandlerTest/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 2 Jun 2003 22:22:26 -0000 1.1
+++ Makefile.in 3 Jun 2003 17:48:30 -0000 1.2
@@ -81,7 +81,7 @@
include ../../version.incl
include ../Makefile.incl
-APP_NAME=MemoryMonitor
+APP_NAME=MemHandlerTest
APP_DIR=MemHandlerTest
OUTDIR= ${XERCESCROOT}/tests/${APP_DIR}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
