mhoyt 2004/12/01 12:33:01
Modified: c/Projects/Win32/VC7.1/Conf conf.vcproj
c/Projects/Win32/VC7.1/PerfT PerfT.vcproj
c/Projects/Win32/VC7.1/Performance perf.vcproj
c/Tests/PerfT perft.cpp
c/Tests/Performance perf.cpp
Log:
Patch to enable build of PerfT/Performance tests as well as direct conf's
intermediate build files to the correct location.
Revision Changes Path
1.2 +8 -8 xml-xalan/c/Projects/Win32/VC7.1/Conf/conf.vcproj
Index: conf.vcproj
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC7.1/Conf/conf.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conf.vcproj 3 Aug 2004 18:22:14 -0000 1.1
+++ conf.vcproj 1 Dec 2004 20:33:00 -0000 1.2
@@ -12,8 +12,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\..\..\Build\Win32\VC7.1\debug"
-
IntermediateDirectory=".\..\..\Build\Win32\VC7.1\debug\conf"
+ OutputDirectory=".\..\..\..\..\Build\Win32\VC7.1\debug"
+
IntermediateDirectory=".\..\..\..\..\Build\Win32\VC7.1\debug\conf"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -31,7 +31,7 @@
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="2"
-
PrecompiledHeaderFile=".\..\..\Build\Win32\VC7.1\debug\conf/conf.pch"
+
PrecompiledHeaderFile=".\..\..\..\..\Build\Win32\VC7.1\debug\conf/conf.pch"
AssemblerListingLocation=".\..\..\..\..\Build\Win32\VC7.1\Debug\conf/"
ObjectFile=".\..\..\..\..\Build\Win32\VC7.1\Debug\conf/"
ProgramDataBaseFileName=".\..\..\..\..\Build\Win32\VC7.1\Debug\conf/"
@@ -55,7 +55,7 @@
StackReserveSize="2048000"/>
<Tool
Name="VCMIDLTool"
-
TypeLibraryName=".\..\..\Build\Win32\VC7.1\debug/conf.tlb"/>
+
TypeLibraryName=".\..\..\..\..\Build\Win32\VC7.1\debug/conf.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -96,7 +96,7 @@
EnableFunctionLevelLinking="TRUE"
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
-
PrecompiledHeaderFile=".\..\..\Build\Win32\VC7.1\Release\conf/conf.pch"
+
PrecompiledHeaderFile=".\..\..\..\..\Build\Win32\VC7.1\Release\conf/conf.pch"
AssemblerListingLocation=".\..\..\..\..\Build\Win32\VC7.1\Release\conf/"
ObjectFile=".\..\..\..\..\Build\Win32\VC7.1\Release\conf/"
ProgramDataBaseFileName=".\..\..\..\..\Build\Win32\VC7.1\Release\conf/"
@@ -117,7 +117,7 @@
StackReserveSize="2048000"/>
<Tool
Name="VCMIDLTool"
-
TypeLibraryName=".\..\..\Build\Win32\VC7.1\Release/conf.tlb"/>
+
TypeLibraryName=".\..\..\..\..\Build\Win32\VC7.1\Release/conf.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -158,7 +158,7 @@
EnableFunctionLevelLinking="TRUE"
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
-
PrecompiledHeaderFile=".\..\..\Build\Win32\VC7.1\Release.symbols\conf/conf.pch"
+
PrecompiledHeaderFile=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\conf/conf.pch"
AssemblerListingLocation=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\conf/"
ObjectFile=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\conf/"
ProgramDataBaseFileName=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\conf/"
@@ -182,7 +182,7 @@
StackReserveSize="2048000"/>
<Tool
Name="VCMIDLTool"
-
TypeLibraryName=".\..\..\Build\Win32\VC7.1\Release.symbols/conf.tlb"/>
+
TypeLibraryName=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols/conf.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
1.2 +30 -27 xml-xalan/c/Projects/Win32/VC7.1/PerfT/PerfT.vcproj
Index: PerfT.vcproj
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC7.1/PerfT/PerfT.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PerfT.vcproj 3 Aug 2004 18:22:14 -0000 1.1
+++ PerfT.vcproj 1 Dec 2004 20:33:00 -0000 1.2
@@ -12,8 +12,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\..\..\Build\Win32\VC7.1\debug"
-
IntermediateDirectory=".\..\..\Build\Win32\VC7.1\debug\PerfT"
+ OutputDirectory=".\..\..\..\..\Build\Win32\VC7.1\debug"
+
IntermediateDirectory=".\..\..\..\..\Build\Win32\VC7.1\debug\PerfT"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -23,16 +23,19 @@
Optimization="0"
AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;..\..\..\..\Build\Win32\VC7.1\Debug\Nls\Include"
PreprocessorDefinitions="_WINDOWS,_CONSOLE,WIN32,_DEBUG"
+ StringPooling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ EnableFunctionLevelLinking="TRUE"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="2"
-
PrecompiledHeaderFile=".\..\..\Build\Win32\VC7.1\debug\PerfT/PerfT.pch"
-
AssemblerListingLocation=".\..\..\Build\Win32\VC7.1\debug\PerfT/"
-
ObjectFile=".\..\..\Build\Win32\VC7.1\debug\PerfT/"
-
ProgramDataBaseFileName=".\..\..\Build\Win32\VC7.1\debug\PerfT/"
+
PrecompiledHeaderFile=".\..\..\..\..\Build\Win32\VC7.1\debug\PerfT/PerfT.pch"
+
AssemblerListingLocation=".\..\..\..\..\Build\Win32\VC7.1\debug\PerfT/"
+
ObjectFile=".\..\..\..\..\Build\Win32\VC7.1\debug\PerfT/"
+
ProgramDataBaseFileName=".\..\..\..\..\Build\Win32\VC7.1\debug\PerfT/"
WarningLevel="4"
SuppressStartupBanner="TRUE"
+ DebugInformationFormat="3"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -40,17 +43,17 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="xerces-c_2D.lib"
-
OutputFile=".\..\..\Build\Win32\VC7.1\debug/PerfT.exe"
- LinkIncremental="2"
+
OutputFile=".\..\..\..\..\Build\Win32\VC7.1\debug/PerfT.exe"
+ LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\xml-xerces\c\Build\Win32\VC7.1\Debug;$(XERCESCROOT)\Build\Win32\VC7.1\debug;$(XERCESCROOT)\lib"
GenerateDebugInformation="TRUE"
-
ProgramDatabaseFile=".\..\..\Build\Win32\VC7.1\debug/PerfT.pdb"
+
ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7.1\debug\PerfT.pdb"
SubSystem="1"
StackReserveSize="2048000"/>
<Tool
Name="VCMIDLTool"
-
TypeLibraryName=".\..\..\Build\Win32\VC7.1\debug/PerfT.tlb"/>
+
TypeLibraryName=".\..\..\..\..\Build\Win32\VC7.1\debug/PerfT.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -74,8 +77,8 @@
</Configuration>
<Configuration
Name="Release with symbols|Win32"
-
OutputDirectory=".\..\..\Build\Win32\VC7.1\Release.symbols"
-
IntermediateDirectory=".\..\..\Build\Win32\VC7.1\Release.symbols\PerfT"
+
OutputDirectory=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols"
+
IntermediateDirectory=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\PerfT"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -89,10 +92,10 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
RuntimeTypeInfo="TRUE"
-
PrecompiledHeaderFile=".\..\..\Build\Win32\VC7.1\Release.symbols\PerfT/PerfT.pch"
-
AssemblerListingLocation=".\..\..\Build\Win32\VC7.1\Release.symbols\PerfT/"
-
ObjectFile=".\..\..\Build\Win32\VC7.1\Release.symbols\PerfT/"
-
ProgramDataBaseFileName=".\..\..\Build\Win32\VC7.1\Release.symbols\PerfT/"
+
PrecompiledHeaderFile=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\PerfT/PerfT.pch"
+
AssemblerListingLocation=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\PerfT/"
+
ObjectFile=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\PerfT/"
+
ProgramDataBaseFileName=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\PerfT/"
WarningLevel="4"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -103,17 +106,17 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /FIXED:NO"
AdditionalDependencies="xerces-c_2.lib"
-
OutputFile=".\..\..\Build\Win32\VC7.1\Release.symbols/PerfT.exe"
+
OutputFile=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols/PerfT.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\xml-xerces\c\Build\Win32\VC7.1\Release;$(XERCESCROOT)\Build\Win32\VC7.1\Release;$(XERCESCROOT)\lib"
GenerateDebugInformation="TRUE"
-
ProgramDatabaseFile=".\..\..\Build\Win32\VC7.1\Release.symbols/PerfT.pdb"
+
ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols/PerfT.pdb"
SubSystem="1"
StackReserveSize="2048000"/>
<Tool
Name="VCMIDLTool"
-
TypeLibraryName=".\..\..\Build\Win32\VC7.1\Release.symbols/PerfT.tlb"/>
+
TypeLibraryName=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols/PerfT.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -137,8 +140,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\..\..\Build\Win32\VC7.1\Release"
-
IntermediateDirectory=".\..\..\Build\Win32\VC7.1\Release\PerfT"
+
OutputDirectory=".\..\..\..\..\Build\Win32\VC7.1\Release"
+
IntermediateDirectory=".\..\..\..\..\Build\Win32\VC7.1\Release\PerfT"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -152,10 +155,10 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
RuntimeTypeInfo="TRUE"
-
PrecompiledHeaderFile=".\..\..\Build\Win32\VC7.1\Release\PerfT/PerfT.pch"
-
AssemblerListingLocation=".\..\..\Build\Win32\VC7.1\Release\PerfT/"
-
ObjectFile=".\..\..\Build\Win32\VC7.1\Release\PerfT/"
-
ProgramDataBaseFileName=".\..\..\Build\Win32\VC7.1\Release\PerfT/"
+
PrecompiledHeaderFile=".\..\..\..\..\Build\Win32\VC7.1\Release\PerfT/PerfT.pch"
+
AssemblerListingLocation=".\..\..\..\..\Build\Win32\VC7.1\Release\PerfT/"
+
ObjectFile=".\..\..\..\..\Build\Win32\VC7.1\Release\PerfT/"
+
ProgramDataBaseFileName=".\..\..\..\..\Build\Win32\VC7.1\Release\PerfT/"
WarningLevel="4"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
@@ -165,7 +168,7 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="xerces-c_2.lib"
-
OutputFile=".\..\..\Build\Win32\VC7.1\Release/PerfT.exe"
+
OutputFile=".\..\..\..\..\Build\Win32\VC7.1\Release/PerfT.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\xml-xerces\c\Build\Win32\VC7.1\Release;$(XERCESCROOT)\Build\Win32\VC7.1\Release;$(XERCESCROOT)\lib"
@@ -173,7 +176,7 @@
StackReserveSize="2048000"/>
<Tool
Name="VCMIDLTool"
-
TypeLibraryName=".\..\..\Build\Win32\VC7.1\Release/PerfT.tlb"/>
+
TypeLibraryName=".\..\..\..\..\Build\Win32\VC7.1\Release/PerfT.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
1.2 +27 -27 xml-xalan/c/Projects/Win32/VC7.1/Performance/perf.vcproj
Index: perf.vcproj
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC7.1/Performance/perf.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perf.vcproj 3 Aug 2004 18:22:15 -0000 1.1
+++ perf.vcproj 1 Dec 2004 20:33:01 -0000 1.2
@@ -12,8 +12,8 @@
<Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\..\..\Build\Win32\VC7.1\Release"
-
IntermediateDirectory=".\..\..\Build\Win32\VC7.1\Release\Performance"
+
OutputDirectory=".\..\..\..\..\Build\Win32\VC7.1\Release"
+
IntermediateDirectory=".\..\..\..\..\Build\Win32\VC7.1\Release\Performance"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -27,10 +27,10 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
RuntimeTypeInfo="TRUE"
-
PrecompiledHeaderFile=".\..\..\Build\Win32\VC7.1\Release\Performance/perf.pch"
-
AssemblerListingLocation=".\..\..\Build\Win32\VC7.1\Release\Performance/"
-
ObjectFile=".\..\..\Build\Win32\VC7.1\Release\Performance/"
-
ProgramDataBaseFileName=".\..\..\Build\Win32\VC7.1\Release\Performance/"
+
PrecompiledHeaderFile=".\..\..\..\..\Build\Win32\VC7.1\Release\Performance/perf.pch"
+
AssemblerListingLocation=".\..\..\..\..\Build\Win32\VC7.1\Release\Performance/"
+
ObjectFile=".\..\..\..\..\Build\Win32\VC7.1\Release\Performance/"
+
ProgramDataBaseFileName=".\..\..\..\..\Build\Win32\VC7.1\Release\Performance/"
WarningLevel="4"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
@@ -40,7 +40,7 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="xerces-c_2.lib"
-
OutputFile=".\..\..\Build\Win32\VC7.1\Release/perf.exe"
+
OutputFile=".\..\..\..\..\Build\Win32\VC7.1\Release/perf.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\xml-xerces\c\Build\Win32\VC7.1\Release;$(XERCESCROOT)\Build\Win32\VC7.1\Release;$(XERCESCROOT)\lib"
@@ -48,7 +48,7 @@
StackReserveSize="2048000"/>
<Tool
Name="VCMIDLTool"
-
TypeLibraryName=".\..\..\Build\Win32\VC7.1\Release/perf.tlb"/>
+
TypeLibraryName=".\..\..\..\..\Build\Win32\VC7.1\Release/perf.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -72,8 +72,8 @@
</Configuration>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\..\..\Build\Win32\VC7.1\Debug"
-
IntermediateDirectory=".\..\..\Build\Win32\VC7.1\Debug\Performance"
+ OutputDirectory=".\..\..\..\..\Build\Win32\VC7.1\Debug"
+
IntermediateDirectory=".\..\..\..\..\Build\Win32\VC7.1\Debug\Performance"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -89,10 +89,10 @@
EnableFunctionLevelLinking="TRUE"
RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="2"
-
PrecompiledHeaderFile=".\..\..\Build\Win32\VC7.1\Debug\Performance/perf.pch"
-
AssemblerListingLocation=".\..\..\Build\Win32\VC7.1\Debug\Performance/"
-
ObjectFile=".\..\..\Build\Win32\VC7.1\Debug\Performance/"
-
ProgramDataBaseFileName=".\..\..\Build\Win32\VC7.1\Debug\Performance/"
+
PrecompiledHeaderFile=".\..\..\..\..\Build\Win32\VC7.1\Debug\Performance/perf.pch"
+
AssemblerListingLocation=".\..\..\..\..\Build\Win32\VC7.1\Debug\Performance/"
+
ObjectFile=".\..\..\..\..\Build\Win32\VC7.1\Debug\Performance/"
+
ProgramDataBaseFileName=".\..\..\..\..\Build\Win32\VC7.1\Debug\Performance/"
WarningLevel="4"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -103,17 +103,17 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="xerces-c_2D.lib"
-
OutputFile=".\..\..\Build\Win32\VC7.1\Debug/perf.exe"
+
OutputFile=".\..\..\..\..\Build\Win32\VC7.1\Debug/perf.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
-
AdditionalLibraryDirectories="..\..\..\..\xml-xerces\c\Build\Win32\VC7.1\Debug;$(XERCESCROOT)\Build\Win32\VC7.1\Debug;$(XERCESCROOT)\lib"
+
AdditionalLibraryDirectories=""..\..\..\..\xml-xerces\c\Build\Win32\VC7.1\Debug";"$(XERCESCROOT)\Build\Win32\VC7.1\Debug";"$(XERCESCROOT)\lib""
GenerateDebugInformation="TRUE"
-
ProgramDatabaseFile=".\..\..\Build\Win32\VC7.1\Debug/perf.pdb"
+
ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7.1\Debug\perf.pdb"
SubSystem="1"
StackReserveSize="2048000"/>
<Tool
Name="VCMIDLTool"
-
TypeLibraryName=".\..\..\Build\Win32\VC7.1\Debug/perf.tlb"/>
+
TypeLibraryName=".\..\..\..\..\Build\Win32\VC7.1\Debug/perf.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -137,8 +137,8 @@
</Configuration>
<Configuration
Name="Release with symbols|Win32"
-
OutputDirectory=".\..\..\Build\Win32\VC7.1\Release.symbols"
-
IntermediateDirectory=".\..\..\Build\Win32\VC7.1\Release.symbols\Performance"
+
OutputDirectory=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols"
+
IntermediateDirectory=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\Performance"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -152,10 +152,10 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
RuntimeTypeInfo="TRUE"
-
PrecompiledHeaderFile=".\..\..\Build\Win32\VC7.1\Release.symbols\Performance/perf.pch"
-
AssemblerListingLocation=".\..\..\Build\Win32\VC7.1\Release.symbols\Performance/"
-
ObjectFile=".\..\..\Build\Win32\VC7.1\Release.symbols\Performance/"
-
ProgramDataBaseFileName=".\..\..\Build\Win32\VC7.1\Release.symbols\Performance/"
+
PrecompiledHeaderFile=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\Performance/perf.pch"
+
AssemblerListingLocation=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\Performance/"
+
ObjectFile=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\Performance/"
+
ProgramDataBaseFileName=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols\Performance/"
WarningLevel="4"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
@@ -166,17 +166,17 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /FIXED:NO"
AdditionalDependencies="xerces-c_2.lib"
-
OutputFile=".\..\..\Build\Win32\VC7.1\Release.symbols/perf.exe"
+
OutputFile=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols/perf.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\xml-xerces\c\Build\Win32\VC7.1\Release;$(XERCESCROOT)\Build\Win32\VC7.1\Release;$(XERCESCROOT)\lib"
GenerateDebugInformation="TRUE"
-
ProgramDatabaseFile=".\..\..\Build\Win32\VC7.1\Release.symbols/perf.pdb"
+
ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols/perf.pdb"
SubSystem="1"
StackReserveSize="2048000"/>
<Tool
Name="VCMIDLTool"
-
TypeLibraryName=".\..\..\Build\Win32\VC7.1\Release.symbols/perf.tlb"/>
+
TypeLibraryName=".\..\..\..\..\Build\Win32\VC7.1\Release.symbols/perf.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
1.26 +38 -15 xml-xalan/c/Tests/PerfT/perft.cpp
Index: perft.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/PerfT/perft.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- perft.cpp 5 Aug 2004 23:36:20 -0000 1.25
+++ perft.cpp 1 Dec 2004 20:33:01 -0000 1.26
@@ -123,7 +123,9 @@
// Just hoist everything...
XALAN_CPP_NAMESPACE_USE
- XalanFileUtility h;
+ MemoryManagerType& theManager = XalanMemMgrs::getDefaultXercesMemMgr();
+
+ XalanFileUtility h(theManager);
// Set the program help string, then get the command line parameters.
//
@@ -138,15 +140,19 @@
XalanTransformer xalan;
// Generate Unique Run id and processor info
- const XalanDOMString UniqRunid = h.generateUniqRunid();
+ XalanDOMString UniqRunid;
+ h.generateUniqRunid(UniqRunid);
// Defined basic constants for file manipulation and open
results file
const XalanDOMString resultFilePrefix("cpp");
- const XalanDOMString resultsFile(h.args.output +
resultFilePrefix + UniqRunid + XalanFileUtility::s_xmlSuffix);
+ XalanDOMString resultsFile= h.args.output;
+ resultsFile += resultFilePrefix;
+ resultsFile += UniqRunid;
+ resultsFile += XalanFileUtility::s_xmlSuffix;
- XalanXMLFileReporter logFile(resultsFile);
+ XalanXMLFileReporter logFile(theManager, resultsFile);
logFile.logTestFileInit("Performance Testing - Reports various
performance metrics using the Transformer");
// Get the list of sub-directories below "base" and iterate
through them
@@ -154,7 +160,8 @@
typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
- const FileNameVectorType dirs =
h.getDirectoryNames(h.args.base);
+ FileNameVectorType dirs;
+ h.getDirectoryNames(h.args.base, dirs);
for(FileNameVectorType::size_type j = 0; j < dirs.size();
j++)
{
@@ -167,14 +174,19 @@
cout << "Processing files in Directory: " << dirs[j] <<
endl;
// Check that output directory is there.
- const XalanDOMString theOutputDir = h.args.output +
dirs[j];
+ XalanDOMString theOutputDir = h.args.output;
+ theOutputDir += dirs[j];
h.checkAndCreateDir(theOutputDir);
// Indicate that directory was processed and get test
files from the directory
foundDir = true;
- const FileNameVectorType files =
h.getTestFileNames(h.args.base, dirs[j], false);
- logFile.logTestCaseInit(XalanDOMString("Performance
Directory: ") + dirs[j] );
+ FileNameVectorType files;
+ h.getTestFileNames(h.args.base, dirs[j], false, files);
+ XalanDOMString logEntry;
+ logEntry = "Performance Directory: ";
+ logEntry += dirs[j];
+ logFile.logTestCaseInit(logEntry);
const long iterCount = h.args.iters;
@@ -187,7 +199,7 @@
typedef XalanXMLFileReporter::Hashtable
Hashtable;
- Hashtable attrs;
+ Hashtable attrs(theManager);
attrs.insert(Hashtable::value_type(XalanDOMString("idref"), files[i]));
attrs.insert(Hashtable::value_type(XalanDOMString("UniqRunid"),UniqRunid));
@@ -200,11 +212,20 @@
continue;
}
- const XalanDOMString theXSLFile= h.args.base +
dirs[j] + XalanFileUtility::s_pathSep + files[i];
- const XalanDOMString theXMLFile =
h.generateFileName(theXSLFile,"xml");
-
- const XalanDOMString outbase = h.args.output
+ dirs[j] + XalanFileUtility::s_pathSep + files[i];
- const XalanDOMString theOutputFile =
h.generateFileName(outbase, "out");
+ XalanDOMString theXSLFile = h.args.base;
+ theXSLFile += dirs[j];
+ theXSLFile += XalanFileUtility::s_pathSep;
+ theXSLFile += files[i];
+
+ XalanDOMString theXMLFile;
+ h.generateFileName(theXSLFile,"xml",
theXMLFile);
+
+ XalanDOMString outbase = h.args.output;
+ outbase += dirs[j];
+ outbase += XalanFileUtility::s_pathSep;
+ outbase += files[i];
+ XalanDOMString theOutputFile;
+ h.generateFileName(outbase, "out",
theOutputFile);
const XSLTInputSource
xslInputSource(theXSLFile);
const XSLTInputSource
xmlInputSource(theXMLFile);
@@ -342,7 +363,9 @@
}
- logFile.logTestCaseClose(XalanDOMString("Performance
Directory: ") + dirs[j], XalanDOMString("Done") );
+ logEntry = "Performance Directory: ";
+ logEntry += dirs[j];
+ logFile.logTestCaseClose(logEntry,
XalanDOMString("Done"));
}
// Check to see if -sub cmd-line directory was processed
correctly.
1.42 +50 -22 xml-xalan/c/Tests/Performance/perf.cpp
Index: perf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Performance/perf.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- perf.cpp 10 Nov 2004 19:11:25 -0000 1.41
+++ perf.cpp 1 Dec 2004 20:33:01 -0000 1.42
@@ -35,6 +35,8 @@
#include <xercesc/util/PlatformUtils.hpp>
+
+
#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
#include <xalanc/PlatformSupport/XalanFileOutputStream.hpp>
#include <xalanc/PlatformSupport/XalanOutputStreamPrintWriter.hpp>
@@ -253,8 +255,10 @@
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
#endif
+
+ XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::Initialize();
- MemoryManagerType& theManager = XalanMemMgrs::getDefaultXercesMemMgr();
+ MemoryManagerType & theManager = XalanMemMgrs::getDefaultXercesMemMgr();
const XalanDOMString
processorType(XALAN_STATIC_UCODE_STRING("XalanC"), theManager);
bool skip = true; // Default will skip long tests
@@ -264,18 +268,21 @@
// Set the program help string, then get the command line parameters.
//
- setHelp(h, theManager);
+ setHelp(h);
if (h.getParams(argc, argv, "PERF-RESULTS", setGold) == true)
{
// Generate Unique Run id and processor info
XalanDOMString UniqRunid(theManager);
- h.generateUniqRunid(theManager);
- const XalanDOMString resultFilePrefix(XalanDOMString("cpp"),
theManager);
- const XalanDOMString resultsFile(h.args.output, +
resultFilePrefix + UniqRunid + XalanFileUtility::s_xmlSuffix);
+ h.generateUniqRunid(UniqRunid);
+ const XalanDOMString resultFilePrefix(XalanDOMString("cpp"));
+ XalanDOMString resultsFile = h.args.output;
+ resultsFile += resultFilePrefix;
+ resultsFile += UniqRunid;
+ resultsFile += XalanFileUtility::s_xmlSuffix;
- XalanXMLFileReporter logFile(resultsFile);
+ XalanXMLFileReporter logFile(theManager, resultsFile);
logFile.logTestFileInit("Performance Testing - Reports
performance times for single transform, and average for multiple transforms
using compiled stylesheet");
@@ -287,12 +294,14 @@
// cleaned up when this instance goes out of scope.
bool foundDir = false; // Flag indicates directory
found. Used in conjunction with -sub cmd-line arg.
{
- XSLTInit theInit;
+ XSLTInit theInit(theManager);
typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
// Get the list of Directories that are below
perf and iterate through them
- const FileNameVectorType dirs =
h.getDirectoryNames(h.args.base);
+ FileNameVectorType dirs(theManager);
+
+ h.getDirectoryNames(h.args.base, dirs);
const long iterCount = h.args.iters;
@@ -305,14 +314,18 @@
}
// Check that output directory is there.
- const XalanDOMString theOutputDir =
h.args.output + dirs[j];
+ XalanDOMString theOutputDir =
h.args.output;
+ theOutputDir += dirs[j];
h.checkAndCreateDir(theOutputDir);
-
logFile.logTestCaseInit(XalanDOMString("Performance Directory: ") + dirs[j] );
+ XalanDOMString logEntry("Performance
Directory: ");
+ logEntry += dirs[j];
+ logFile.logTestCaseInit(logEntry);
// Indicate that directory was
processed and get test files from the directory
foundDir = true;
- const FileNameVectorType files =
h.getTestFileNames(h.args.base, dirs[j], false);
+ FileNameVectorType files(theManager);
+ h.getTestFileNames(h.args.base,
dirs[j], false, files);
for(FileNameVectorType::size_type i =
0; i < files.size(); i++)
{
@@ -322,25 +335,33 @@
typedef
XalanXMLFileReporter::Hashtable Hashtable;
- Hashtable attrs;
+ Hashtable attrs(theManager);
if (skip &&
checkForExclusion(files[i]))
{
continue;
}
- const XalanDOMString
theXSLFile= h.args.base + dirs[j] + XalanFileUtility::s_pathSep + files[i];
- const XalanDOMString
theXMLFile = h.generateFileName(theXSLFile,"xml");
-
- const XalanDOMString theOutput
= h.args.output + dirs[j] + XalanFileUtility::s_pathSep + files[i];
- const XalanDOMString
theOutputFile = h.generateFileName(theOutput, "out");
+ XalanDOMString theXSLFile=
h.args.base;
+ theXSLFile += dirs[j];
+ theXSLFile +=
XalanFileUtility::s_pathSep;
+ theXSLFile += files[i];
+ XalanDOMString
theXMLFile(theManager);
+
h.generateFileName(theXSLFile,"xml", theXMLFile);
+
+ XalanDOMString theOutput =
h.args.output;
+ theOutput += dirs[j];
+ theOutput +=
XalanFileUtility::s_pathSep;
+ theOutput += files[i];
+ XalanDOMString theOutputFile;
+ h.generateFileName(theOutput,
"out", theOutputFile);
attrs.insert(Hashtable::value_type(XalanDOMString("href"), theXSLFile));
// Create the necessary support
objects to instantiate a processor.
XercesDOMSupport
csDOMSupport;
- XercesParserLiaison
csParserLiaison(csDOMSupport);
+ XercesParserLiaison
csParserLiaison(theManager, csDOMSupport);
/*XalanSourceTreeDOMSupport
csDOMSupport;
XalanSourceTreeParserLiaison
csParserLiaison(csDOMSupport);
@@ -348,12 +369,13 @@
csDOMSupport.setParserLiaison(&csParserLiaison);
*/
- XSLTProcessorEnvSupportDefault
csXSLTProcessorEnvSupport;
+ XSLTProcessorEnvSupportDefault
csXSLTProcessorEnvSupport(theManager);
XObjectFactoryDefault
csXObjectFactory;
XPathFactoryDefault
csXPathFactory;
// Create a processor and
connect to ProcessorEnvSupport object
XSLTEngineImpl csProcessor(
+ theManager,
csParserLiaison,
csXSLTProcessorEnvSupport,
csDOMSupport,
@@ -370,6 +392,7 @@
// Create a stylesheet
construction context, using the
// stylesheet's factory support
objects.
StylesheetConstructionContextDefault csConstructionContext(
+
theManager,
csProcessor,
ssXPathFactory);
cout << endl << files[i] <<
endl;
@@ -416,6 +439,7 @@
const XSLTInputSource
xmlInputSource(theXMLFile);
StylesheetExecutionContextDefault psExecutionContext(
+
theManager,
csProcessor,
csXSLTProcessorEnvSupport,
csDOMSupport,
@@ -517,15 +541,17 @@
logFile.addMetricToAttrs("avgetoe",theAverage, attrs);
logFile.logElementWAttrs(10,
"perf", attrs, "xxx");
}
-
-
logFile.logTestCaseClose(XalanDOMString("Performance Directory: ") + dirs[j],
XalanDOMString("Done") );
+
+ logEntry = "Performance Directory: ";
+ logEntry += dirs[j];
+ logFile.logTestCaseClose(logEntry,
XalanDOMString("Done"));
}
}
// Check to see if -sub cmd-line directory was
processed correctly.
if (!foundDir)
- {
+ {
cout << "Specified test directory: \"" <<
c_str(TranscodeToLocalCodePage(h.args.sub)) << "\" not found" << endl;
}
@@ -542,6 +568,8 @@
cerr << "Exception caught!!!" << endl << endl;
}
}
+
+ XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::Terminate();
return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
