You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2001/02/16 15:58:59 UTC
cvs commit: xml-xerces/c/src/validators/common Makefile.in CMBinaryOp.cpp CMBinaryOp.hpp CMLeaf.hpp CMNode.hpp CMUnaryOp.cpp CMUnaryOp.hpp ContentSpecNode.cpp DFAContentModel.cpp MixedContentModel.cpp SimpleContentModel.cpp SimpleContentModel.hpp
tng 01/02/16 06:58:59
Modified: c/Projects/OS2/VACPP40 packageBinaries.cmd
xerces_validators.icc
c/Projects/Win32/VC6/xerces-all/XercesLib XercesLib.dsp
c/scripts packageBinaries.pl
c/src Makefile.in configure configure.in
c/src/validators/DTD DTDElementDecl.cpp DTDValidator2.cpp
Makefile.in
c/src/validators/common CMBinaryOp.cpp CMBinaryOp.hpp
CMLeaf.hpp CMNode.hpp CMUnaryOp.cpp CMUnaryOp.hpp
ContentSpecNode.cpp DFAContentModel.cpp
MixedContentModel.cpp SimpleContentModel.cpp
SimpleContentModel.hpp
Added: c/src/validators/common Makefile.in
Log:
Schema: Update Makefile, configure files, project files, and include path in
certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
Revision Changes Path
1.3 +2 -0 xml-xerces/c/Projects/OS2/VACPP40/packageBinaries.cmd
Index: packageBinaries.cmd
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/OS2/VACPP40/packageBinaries.cmd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- packageBinaries.cmd 2000/09/21 00:54:13 1.2
+++ packageBinaries.cmd 2001/02/16 14:58:53 1.3
@@ -210,6 +210,8 @@
"util\Transcoders\ICU", ,
"util\Transcoders\Iconv", ,
"validators", ,
+ "validators\common", ,
+ "validators\datatype", ,
"validators\DTD" )
DO dir OVER hdirs
1.2 +6 -6 xml-xerces/c/Projects/OS2/VACPP40/xerces_validators.icc
Index: xerces_validators.icc
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/OS2/VACPP40/xerces_validators.icc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xerces_validators.icc 2000/06/23 18:10:36 1.1
+++ xerces_validators.icc 2001/02/16 14:58:53 1.2
@@ -1,12 +1,12 @@
group xerces_validators =
- BASE_DIR "\\src\\validators\\DTD\\CMBinaryOp.cpp",
- BASE_DIR "\\src\\validators\\DTD\\CMUnaryOp.cpp",
- BASE_DIR "\\src\\validators\\DTD\\ContentSpecNode.cpp",
- BASE_DIR "\\src\\validators\\DTD\\DFAContentModel.cpp",
BASE_DIR "\\src\\validators\\DTD\\DTDAttDef.cpp",
BASE_DIR "\\src\\validators\\DTD\\DTDAttDefList.cpp",
BASE_DIR "\\src\\validators\\DTD\\DTDElementDecl.cpp",
BASE_DIR "\\src\\validators\\DTD\\DTDValidator.cpp",
BASE_DIR "\\src\\validators\\DTD\\DTDValidator2.cpp",
- BASE_DIR "\\src\\validators\\DTD\\MixedContentModel.cpp",
- BASE_DIR "\\src\\validators\\DTD\\SimpleContentModel.cpp"
+ BASE_DIR "\\src\\validators\\common\\CMBinaryOp.cpp",
+ BASE_DIR "\\src\\validators\\common\\CMUnaryOp.cpp",
+ BASE_DIR "\\src\\validators\\common\\ContentSpecNode.cpp",
+ BASE_DIR "\\src\\validators\\common\\DFAContentModel.cpp",
+ BASE_DIR "\\src\\validators\\common\\MixedContentModel.cpp",
+ BASE_DIR "\\src\\validators\\common\\SimpleContentModel.cpp"
1.47 +41 -20 xml-xerces/c/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
Index: XercesLib.dsp
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- XercesLib.dsp 2001/01/18 02:49:53 1.46
+++ XercesLib.dsp 2001/02/16 14:58:53 1.47
@@ -1306,52 +1306,76 @@
# Begin Group "validators"
# PROP Default_Filter ".cpp,.hpp"
+# Begin Group "common"
+
+# PROP Default_Filter "*.cpp, *.hpp"
+# Begin Source File
+
+
+SOURCE=..\..\..\..\..\src\validators\common\CMBinaryOp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\validators\common\CMBinaryOp.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\validators\common\CMLeaf.hpp
+# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\validators\DTD\CMBinaryOp.cpp
+SOURCE=..\..\..\..\..\src\validators\common\CMNode.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\validators\DTD\CMBinaryOp.hpp
+SOURCE=..\..\..\..\..\src\validators\common\CMStateSet.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\validators\DTD\CMLeaf.hpp
+SOURCE=..\..\..\..\..\src\validators\common\CMUnaryOp.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\validators\DTD\CMNode.hpp
+SOURCE=..\..\..\..\..\src\validators\common\CMUnaryOp.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\validators\DTD\CMStateSet.hpp
+SOURCE=..\..\..\..\..\src\validators\common\ContentSpecNode.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\validators\DTD\CMUnaryOp.cpp
+SOURCE=..\..\..\..\..\src\validators\common\ContentSpecNode.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\validators\DTD\CMUnaryOp.hpp
+SOURCE=..\..\..\..\..\src\validators\common\DFAContentModel.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\validators\DTD\ContentSpecNode.cpp
+SOURCE=..\..\..\..\..\src\validators\common\DFAContentModel.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\validators\DTD\ContentSpecNode.hpp
+SOURCE=..\..\..\..\..\src\validators\common\MixedContentModel.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\validators\DTD\DFAContentModel.cpp
+SOURCE=..\..\..\..\..\src\validators\common\MixedContentModel.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\validators\DTD\DFAContentModel.hpp
+SOURCE=..\..\..\..\..\src\validators\common\SimpleContentModel.cpp
# End Source File
# Begin Source File
+SOURCE=..\..\..\..\..\src\validators\common\SimpleContentModel.hpp
+# End Source File
+# End Group
+# Begin Group "DTD"
+
+# PROP Default_Filter "*.cpp, *.hpp"
+# Begin Source File
+
SOURCE=..\..\..\..\..\src\validators\DTD\DocTypeHandler.hpp
# End Source File
# Begin Source File
@@ -1394,22 +1418,19 @@
SOURCE=..\..\..\..\..\src\validators\DTD\DTDValidator2.cpp
# End Source File
-# Begin Source File
+# End Group
+# Begin Group "datatype"
-SOURCE=..\..\..\..\..\src\validators\DTD\MixedContentModel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\src\validators\DTD\MixedContentModel.hpp
-# End Source File
+# PROP Default_Filter "*.cpp, *.hpp"
# Begin Source File
-SOURCE=..\..\..\..\..\src\validators\DTD\SimpleContentModel.cpp
+SOURCE=..\..\..\..\..\src\validators\datatype\InvalidDatatypeFacetException.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\validators\DTD\SimpleContentModel.hpp
+SOURCE=..\..\..\..\..\src\validators\datatype\InvalidDatatypeValueException.hpp
# End Source File
+# End Group
# End Group
# Begin Group "sax2"
1.45 +97 -91 xml-xerces/c/scripts/packageBinaries.pl
Index: packageBinaries.pl
===================================================================
RCS file: /home/cvs/xml-xerces/c/scripts/packageBinaries.pl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- packageBinaries.pl 2001/01/12 22:09:06 1.44
+++ packageBinaries.pl 2001/02/16 14:58:54 1.45
@@ -51,7 +51,7 @@
print "To build with ICU, you must set an environment variable called ICUROOT\n";
print "Proceeding to build XERCES-C without ICU...\n";
}
-
+
# Check if the source directory exists or not
if (!(-e $XERCESCROOT)) {
print ("The directory $XERCESCROOT does not exist. Cannot proceed any further.\n");
@@ -75,9 +75,9 @@
$platform = <PLATFORM>;
chomp($platform);
close (PLATFORM);
+
-
-print "Packaging binaries for \`" . $platform . "\` in " . $targetdir . " ...\n"; # "
+print "Packaging binaries for \`" . $platform . "\` in " . $targetdir . " ...\n"; # "
#Construct the name of the zip file by extracting the last directory name
$zipfiles = $targetdir;
@@ -92,13 +92,13 @@
# WINDOWS builds happen here ...
#
if ($platform =~ m/Windows/ || $platform =~ m/CYGWIN/) {
-
+
$platformname = 'Win32'; # Needed this way by nmake
if (-e "$targetdir.zip") {
print ("Deleting old target file \'$targetdir.zip\' \n");
unlink("$targetdir.zip");
}
-
+
# Make the target directory and its main subdirectories
psystem ("mkdir $targetdir");
psystem ("mkdir $targetdir/bin");
@@ -123,24 +123,24 @@
psystem ("mkdir $targetdir/doc");
psystem ("mkdir $targetdir/doc/html");
psystem ("mkdir $targetdir/doc/html/apiDocs");
-
+
# If 'FileOnly' NetAccessor has been specified, then the project files have to be
# changed.
if ($opt_n =~ m/fileonly/i) {
changeWindowsProjectForFileOnlyNA("$XERCESCROOT/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp");
}
-
+
#
# ICU Build happens here, if one is required.
#
if ($opt_t =~ m/icu/i && length($ICUROOT) > 0) {
print ("Building ICU from $ICUROOT ...\n");
-
+
#Clean up all the dependency files, causes problems for nmake
pchdir ("$ICUROOT");
psystem ("del /s /f *.dep *.ncb *.plg *.opt");
-
+
# Make the icu dlls
pchdir ("$ICUROOT/source/allinone");
if (!$opt_j) { # Optionally suppress ICU build, to speed up overlong builds while debugging.
@@ -150,36 +150,36 @@
psystem("msdev allinone.dsw /MAKE \"all - $platformname Debug\" /REBUILD /OUT buildlog.txt");
psystem("cat buildlog.txt");
}
-
+
change_windows_project_for_ICU("$XERCESCROOT/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp");
}
-
+
# Clean up all the dependency files, causes problems for nmake
# Also clean up all MSVC-generated project files that just cache the IDE state
pchdir ("$XERCESCROOT");
psystem ("del /s /f *.dep *.ncb *.plg *.opt");
-
+
# Make all files in the Xerces-C system including libraries, samples and tests
pchdir ("$XERCESCROOT/Projects/Win32/VC6/xerces-all");
psystem( "msdev xerces-all.dsw /MAKE \"all - $platformname $buildmode\" /REBUILD /OUT buildlog.txt");
system("cat buildlog.txt");
-
+
# Build the debug xerces dll. Both debug and release DLLs
# are in the standard binary distribution of Xerces.
if ($buildmode ne "Debug") {
psystem("msdev xerces-all.dsw /MAKE \"XercesLib - $platformname Debug\" /REBUILD /OUT buildlog.txt");
system("cat buildlog.txt");
}
-
+
# Decide where you want the build copied from
pchdir ($targetdir);
$BUILDDIR = $XERCESCROOT . "/Build/Win32/VC6/" . $buildmode;
print "\nBuild is being copied from \'" . $BUILDDIR . "\'";
-
+
# Populate the include output directory
print ("\n\nCopying headers files ...\n");
-
+
@headerDirectories =
qw'sax
sax2
@@ -188,7 +188,7 @@
internal
parsers
util
- util/Compilers
+ util/Compilers
util/MsgLoaders
util/MsgLoaders/ICU
util/MsgLoaders/InMemory
@@ -210,15 +210,17 @@
util/Transcoders/Iconv
util/Transcoders/Win32
validators
+ validators/common
+ validators/datatype
validators/DTD';
-
+
foreach $dir (@headerDirectories) {
$inclDir = "include/$dir";
if (! (-e $inclDir)) {
psystem("mkdir $inclDir");
}
$srcDir = "$XERCESCROOT/src/$dir";
-
+
# Weed out directories that have no files to copy, to avoid a bunch of
# warnings from the cp command in the build output.
opendir(dir, $srcDir);
@@ -227,30 +229,30 @@
foreach $fileKind ("hpp", "c") {
$matches = grep(/\.$fileKind$/, @allfiles);
if ($matches > 0) {
- psystem("cp -f $srcDir/*.$fileKind $inclDir/");
+ psystem("cp -f $srcDir/*.$fileKind $inclDir/");
}
}
}
-
-
+
+
#
# Remove internal implementation headers from the DOM include directory.
#
psystem ("rm $targetdir/include/dom/*Impl.hpp");
- psystem ("rm $targetdir/include/dom/DS*.hpp");
-
-
+ psystem ("rm $targetdir/include/dom/DS*.hpp");
+
+
if ($opt_t =~ m/icu/i && length($ICUROOT) > 0) {
psystem("cp -Rfv $ICUROOT/include/* $targetdir/include");
}
-
+
#
# Populate the binary output directory
#
print ("\n\nCopying binary outputs ...\n");
psystem("cp -fv $BUILDDIR/*.dll $targetdir/bin");
psystem("cp -fv $BUILDDIR/*.exe $targetdir/bin");
-
+
if ($opt_t =~ m/icu/i && length($ICUROOT) > 0) {
# Copy the ICU dlls and libs
psystem("cp -fv $ICUROOT/bin/$buildmode/icuuc.dll $targetdir/bin");
@@ -271,13 +273,13 @@
psystem("cp -fv $DEBUGBUILDDIR/xerces-c_*D.lib $targetdir/lib");
psystem("cp -fv $DEBUGBUILDDIR/xerces*D.dll $targetdir/bin");
}
-
-
+
+
# Populate the samples directory
print ("\n\nCopying sample files ...\n");
psystem("cp $XERCESCROOT/version.incl $targetdir");
psystem("cp -Rfv $XERCESCROOT/samples/Projects/* $targetdir/samples/Projects");
-
+
psystem("cp -Rfv $XERCESCROOT/samples/SAXCount/* $targetdir/samples/SAXCount");
psystem("rm -f $targetdir/samples/SAXCount/Makefile");
psystem("cp -Rfv $XERCESCROOT/samples/SAX2Count/* $targetdir/samples/SAX2Count");
@@ -302,14 +304,14 @@
psystem("rm -f $targetdir/samples/EnumVal/Makefile");
psystem("cp -Rfv $XERCESCROOT/samples/CreateDOMDocument/* $targetdir/samples/CreateDOMDocument");
psystem("rm -f $targetdir/samples/CreateDOMDocument/Makefile");
-
+
psystem("cp -Rfv $XERCESCROOT/samples/data/* $targetdir/samples/data");
-
+
# Populate the docs directory
print ("\n\nCopying documentation ...\n");
psystem("cp -Rfv $XERCESCROOT/doc/* $targetdir/doc");
psystem("cp $XERCESCROOT/Readme.html $targetdir");
- psystem("cp $XERCESCROOT/credits.txt $targetdir");
+ psystem("cp $XERCESCROOT/credits.txt $targetdir");
psystem("cp $XERCESCROOT/LICENSE.txt $targetdir");
if (length($ICUROOT) > 0) {
@@ -321,7 +323,7 @@
psystem("rm -f $targetdir/doc/*.xml");
psystem("rm -f $targetdir/doc/*.ent");
psystem("rm -f $targetdir/doc/*.gif");
-
+
# Now package it all up using ZIP
pchdir ("$targetdir/..");
print ("\n\nZIPping up all files ...\n");
@@ -330,9 +332,9 @@
}
#
# End of Windows Builds.
-
-
-
+
+
+
#
# UNIX builds happen here ...
#
@@ -340,20 +342,20 @@
($platform =~ m/SunOS/i) || ($platform =~ m/Linux/i) || ($platform =~ m/ptx/i) ) {
# Set defaults for platform-independent options.
- if ($opt_m eq "") {$opt_m = "inmem"; # In memory message loader.
+ if ($opt_m eq "") {$opt_m = "inmem"; # In memory message loader.
}
if ($opt_n eq "") {$opt_n = "socket"; # Socket based net accessor.
}
if ($opt_t eq "") {$opt_t = "native"; # Native transcoding service.
}
-
-
+
+
# Set defaults for platform-specific options.
if ($platform =~ m/AIX/i) {
$platform = "aix";
if ($opt_c eq "") {$opt_c = "xlc_r"; }
if ($opt_x eq "") {$opt_x = "xlC_r"; }
-
+
$icuCompileFlags = 'CXX="xlC_r" ' .
'CC="xlc_r" ' .
'C_FLAGS="-w -O" ' .
@@ -367,7 +369,7 @@
close (OSVERSION);
$platform = 'hp-11' if ($osversion =~ m/11\./);
$platform = 'hp-10' if ($osversion =~ m/10\./);
-
+
if ($opt_c eq "") {$opt_c = "cc"; }
if ($opt_x eq "") {
$opt_x = "CC";
@@ -378,13 +380,13 @@
if ($opt_m eq "") {
$opt_m = "inmem";
}
-
+
if ($opt_x eq 'CC') {
$icuCompileFlags = 'CC=cc CXX=CC CXXFLAGS="+eh +DAportable -w -O" CFLAGS="+DAportable -w -O"';
} else {
$icuCompileFlags = 'CC=cc CXX=aCC CXXFLAGS="+DAportable -w -O" CFLAGS="+DAportable -w -O"';
}
-
+
}
if ($platform =~ m/Linux/i) {
$icuCompileFlags = 'CC=gcc CXX=g++ CXXFLAGS="-w -O" CFLAGS="-w -O"';
@@ -392,14 +394,14 @@
if ($opt_c eq "") {$opt_c = "gcc";}
if ($opt_x eq "") {$opt_x = "g++";}
}
-
+
if ($platform =~ m/SunOS/i) {
$icuCompileFlags = 'CC=cc CXX=CC CXXFLAGS="-w -O" CFLAGS="-w -O"';
$platform = "solaris";
if ($opt_c eq "") {$opt_c = "cc";}
if ($opt_x eq "") {$opt_x = "CC";}
}
-
+
if ($platform =~ m/ptx/i) {
# Check if the patches have been applied or not
$platform = "ptx";
@@ -426,21 +428,21 @@
}
$XMLINSTALL = $ENV{'XMLINSTALL'};
}
-
+
# Check if the target directories already exist or not
if (-e $targetdir.".tar") {
print ("Error: The target file \'$targetdir.tar\' already exists.\n");
print (" You must delete the file \'$targetdir.tar\' to package your product.\n");
exit(1);
}
-
+
if (-e $srctargetdir.".tar") {
print ("Error: The target file \'$srctargetdir.tar\' already exists.\n");
print (" You must delete the file \'$srctargetdir.tar\' to package your product.\n");
exit(1);
}
-
-
+
+
# Make the target directory and its main subdirectories
psystem ("mkdir $targetdir");
psystem ("mkdir $targetdir/bin");
@@ -478,6 +480,8 @@
psystem ("mkdir $targetdir/include/util/Transcoders/Win32");
psystem ("mkdir $targetdir/include/dom");
psystem ("mkdir $targetdir/include/validators");
+ psystem ("mkdir $targetdir/include/validators/common");
+ psystem ("mkdir $targetdir/include/validators/datatype");
psystem ("mkdir $targetdir/include/validators/DTD");
psystem ("mkdir $targetdir/samples");
psystem ("mkdir $targetdir/samples/data");
@@ -496,7 +500,7 @@
psystem ("mkdir $targetdir/doc");
psystem ("mkdir $targetdir/doc/html");
psystem ("mkdir $targetdir/doc/html/apiDocs");
-
+
# Build ICU if needed
if ($opt_t =~ m/icu/i && !$opt_j)
{
@@ -522,7 +526,7 @@
psystem ("rm -f $ICUROOT/data/*.c"); # same for .c files
psystem ("gmake"); # This will take a long time!
psystem ("gmake install"); # Make this separate since this breaks on Solaris
-
+
# Please check if the following needs any change in Version 1.4
# For the antiquated CC compiler under HPUX, we need to invoke
# gmake one extra time to generate the .cnv files.
@@ -530,28 +534,28 @@
# system ("gmake");
# }
}
-
+
# For ptx, ICUROOT must now be set to XMLINSTALL for further work.
if ($platform =~ m/ptx/i) {
$ENV{'ICUROOT'} = $ENV{'XMLINSTALL'};
}
-
+
# make the source files
print("\n\nBuild the xerces-c library ...\n");
pchdir ("$XERCESCROOT/src");
-
-
+
+
psystem ("chmod +x run* con* install-sh");
-
+
if (length($opt_r) > 0) {
psystem ("runConfigure -p$platform -c$opt_c -x$opt_x -m$opt_m -n$opt_n -t$opt_t -r$opt_r");
} else {
psystem ("runConfigure -p$platform -c$opt_c -x$opt_x -m$opt_m -n$opt_n -t$opt_t");
}
-
+
psystem ("gmake clean"); # May want to comment this line out to speed up
psystem ("gmake");
-
+
# Move ICU libs into lib dir, so samples will link. This matches the structure of
# the eventual binary packaging, even though we are doing it in the build directory.
#
@@ -567,7 +571,7 @@
psystem ("runConfigure -p$platform -c$opt_c -x$opt_x");
psystem ("gmake clean"); # May want to comment this line out to speed up
psystem ("gmake");
-
+
# Next build the tests
print("\n\nBuild the tests ...\n");
pchdir ("$XERCESCROOT/tests");
@@ -575,18 +579,18 @@
psystem ("runConfigure -p$platform -c$opt_c -x$opt_x");
psystem ("gmake clean"); # May want to comment this line out to speed up
psystem ("gmake");
-
+
pchdir ($targetdir);
-
+
# Populate the include output directory
print ("\n\nCopying headers files ...\n");
psystem("cp -Rf $XERCESCROOT/src/sax/*.hpp $targetdir/include/sax");
psystem("cp -Rf $XERCESCROOT/src/sax2/*.hpp $targetdir/include/sax2");
psystem("cp -Rf $XERCESCROOT/src/framework/*.hpp $targetdir/include/framework");
psystem("cp -Rf $XERCESCROOT/src/dom/D*.hpp $targetdir/include/dom");
-
+
psystem("cp -Rf $XERCESCROOT/version.incl $targetdir");
-
+
psystem("rm -f $targetdir/include/dom/*Impl.hpp");
psystem("rm -f $targetdir/include/dom/DS*.hpp");
psystem("cp -Rf $XERCESCROOT/src/internal/*.hpp $targetdir/include/internal");
@@ -616,37 +620,39 @@
psystem("cp -Rf $XERCESCROOT/src/util/Transcoders/ICU/*.hpp $targetdir/include/util/Transcoders/ICU");
psystem("cp -Rf $XERCESCROOT/src/util/Transcoders/Iconv/*.hpp $targetdir/include/util/Transcoders/Iconv");
psystem("cp -Rf $XERCESCROOT/src/util/Transcoders/Win32/*.hpp $targetdir/include/util/Transcoders/Win32");
+ psystem("cp -Rf $XERCESCROOT/src/validators/common/*.hpp $targetdir/include/validators/common");
+ psystem("cp -Rf $XERCESCROOT/src/validators/datatype/*.hpp $targetdir/include/validators/datatype");
psystem("cp -Rf $XERCESCROOT/src/validators/DTD/*.hpp $targetdir/include/validators/DTD");
-
+
if (length($ICUROOT) > 0) {
print "\nICU files are being copied from \'$ICUROOT\'";
psystem("cp -Rf $ICUROOT/include/* $targetdir/include");
}
-
+
# Populate the binary output directory
print ("\n\nCopying binary outputs ...\n");
psystem("cp -Rf $XERCESCROOT/bin/* $targetdir/bin");
-
-
-
+
+
+
#if (length($ICUROOT) > 0) {
# psystem("cp -f $ICUROOT/lib/libicu-uc.* $targetdir/lib");
# psystem("cp -f $ICUROOT/data/libicudata.* $targetdir/lib");
#}
-
+
psystem("cp -f $XERCESCROOT/lib/*.a $targetdir/lib");
psystem("cp -f $XERCESCROOT/lib/*.so $targetdir/lib");
psystem("cp -f $XERCESCROOT/lib/*.sl $targetdir/lib");
-
+
psystem("rm -rf $targetdir/bin/obj");
-
+
# Populate the samples directory
print ("\n\nCopying sample files ...\n");
foreach $iii ('config.guess', 'config.h.in', 'config.sub', 'configure', 'configure.in',
'install-sh', 'runConfigure', 'Makefile.in', 'Makefile.incl', 'Makefile') {
psystem("cp -f $XERCESCROOT/samples/$iii $targetdir/samples");
}
-
+
psystem("cp -Rf $XERCESCROOT/samples/data/* $targetdir/samples/data");
psystem("cp -Rf $XERCESCROOT/samples/SAXCount/* $targetdir/samples/SAXCount");
psystem("rm -f $targetdir/samples/SAXCount/Makefile");
@@ -673,12 +679,12 @@
psystem("cp -Rf $XERCESCROOT/samples/CreateDOMDocument/* $targetdir/samples/CreateDOMDocument");
psystem("rm -f $targetdir/samples/CreateDOMDocument/Makefile");
psystem("rm -f $targetdir/samples/Makefile");
-
+
# Populate the docs directory
print ("\n\nCopying documentation ...\n");
psystem("cp -Rf $XERCESCROOT/doc/* $targetdir/doc");
psystem("cp $XERCESCROOT/Readme.html $targetdir");
- psystem("cp $XERCESCROOT/credits.txt $targetdir");
+ psystem("cp $XERCESCROOT/credits.txt $targetdir");
psystem("cp $XERCESCROOT/LICENSE.txt $targetdir");
if (length($ICUROOT) > 0) {
psystem("cp $XERCESCROOT/license.html $targetdir");
@@ -689,27 +695,27 @@
psystem("rm -f $targetdir/doc/*.xml");
psystem("rm -f $targetdir/doc/*.ent");
psystem("rm -f $targetdir/doc/*.gif");
-
+
# Change the directory permissions
psystem ("chmod 644 `find $targetdir -type f`");
psystem ("chmod 755 $targetdir/bin/* $targetdir/lib/*.sl $targetdir/lib/*.so $targetdir/lib/*.a");
psystem ("chmod +x $targetdir/samples/runConfigure $targetdir/samples/configure $targetdir/samples/install-sh");
psystem ("chmod +x $targetdir/samples/config.sub $targetdir/samples/config.guess $targetdir/samples/config.status");
psystem ("chmod 755 `find $targetdir -type d`");
-
+
# Now package it all up using tar
print ("\n\nTARing up all files ...\n");
pchdir ("$targetdir/..");
$zipname = $targetdir . ".tar";
$platformzipname = $zipname;
-
+
psystem ("tar -cvf $platformzipname $zipfiles");
-
+
# Finally compress the files
print ("Compressing $platformzipname ...\n");
psystem ("gzip $platformzipname");
}
-
+
#
# psystem subroutine both prints and executes a system command.
#
@@ -717,8 +723,8 @@
print("$_[0]\n");
system($_[0]);
}
-
-
+
+
#
# chdir subroutine both prints and executes a chdir
#
@@ -726,14 +732,14 @@
print("chdir $_[0]\n");
chdir $_[0];
}
-
-
+
+
sub change_windows_project_for_ICU() {
my ($thefile) = @_;
print "\nConverting Windows Xerces library project ($thefile) for ICU usage...";
my $thefiledotbak = $thefile . ".bak";
rename ($thefile, $thefiledotbak);
-
+
open (FIZZLE, $thefiledotbak);
open (FIZZLEOUT, ">$thefile");
while ($line = <FIZZLE>) {
@@ -750,8 +756,8 @@
close (FIZZLE);
unlink ($thefiledotbak);
}
-
-
+
+
#
# This subroutine is used to munge the XercesLib project file to remove all
# traces of WinSock based NetAccessor. Once no NetAccessor is specified, the
@@ -770,10 +776,10 @@
print "\nConfiguring Xerces library project ($thefile) for FileOnly NetAccessor...";
my $thefiledotbak = $thefile . ".bak";
rename ($thefile, $thefiledotbak);
-
+
open (PROJFILEIN, $thefiledotbak);
open (PROJFILEOUT, ">$thefile");
-
+
while ($aline = <PROJFILEIN>) {
# By skipping over lines between the NetAccessors group
# we can references to the WinSock based NetAccessor files.
@@ -792,12 +798,12 @@
# We need to preserve the 'End Group' line. The last statement of the
# enclosing while loop prints it out.
}
-
+
# From the remaining lines, remove any references to the #defines and
# the WinSock library.
$aline =~ s/\/D \"XML_USE_NETACCESSOR_WINSOCK\" //g; # "
$aline =~ s/wsock32.lib //g;
-
+
print PROJFILEOUT $aline;
}
close (PROJFILEOUT);
1.25 +11 -2 xml-xerces/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.in 2001/02/15 18:41:27 1.24
+++ Makefile.in 2001/02/16 14:58:54 1.25
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.24 2001/02/15 18:41:27 tng Exp $
+# $Id: Makefile.in,v 1.25 2001/02/16 14:58:54 tng Exp $
#
###################################################################
@@ -86,6 +86,7 @@
PARSERS_DIR = parsers
VALIDATORS_DTD_DIR = validators/DTD
VALIDATORS_DATATYPE_DIR = validators/datatype
+VALIDATORS_COMMON_DIR = validators/common
LIBNAME = libxerces-c
THISLIB = ${XML_LIB_DIR}/${LIBNAME}
@@ -102,9 +103,9 @@
PRODUCTVERSION=${VER}
BINTARGETDIR=${HOME}/${PRODUCTNAME}-c-${PLATFORM}-${CXX}-${PRODUCTVERSION}
-all:: Prepare Util Sax Internal Framework Parsers Sax2 Dom Validators Datatype ${THISLIB}${VER}${SHLIBSUFFIX}
+all:: Prepare Util Sax Internal Framework Parsers Sax2 Dom Validators Datatype Common ${THISLIB}${VER}${SHLIBSUFFIX}
-compile:: Prepare Util Sax Internal Framework Parsers Sax2 Dom Validators Datatype
+compile:: Prepare Util Sax Internal Framework Parsers Sax2 Dom Validators Datatype Common
lib:: compile ${THISLIB}${VER}${SHLIBSUFFIX}
@@ -120,6 +121,7 @@
${CD} $(PARSERS_DIR) ; $(MAKE) includes ; ${CD} ..
${CD} $(VALIDATORS_DTD_DIR) ; $(MAKE) includes ; ${CD} ../..
${CD} $(VALIDATORS_DATATYPE_DIR) ; $(MAKE) includes ; ${CD} ../..
+ ${CD} $(VALIDATORS_COMMON_DIR) ; $(MAKE) includes ; ${CD} ../..
${CD} $(DOM_DIR) ; $(MAKE) includes ; ${CD} ..
Util::
@@ -159,6 +161,10 @@
@echo Building "datatype"
${CD} $(VALIDATORS_DATATYPE_DIR) ; $(MAKE) $(MAKE_FLAGS) ; ${CD} ../..
+Common::
+ @echo Building "common"
+ ${CD} $(VALIDATORS_COMMON_DIR) ; $(MAKE) $(MAKE_FLAGS) ; ${CD} ../..
+
${THISLIB}${VER}${SHLIBSUFFIX}::
@echo Building ${THISLIB}${VER}${SHLIBSUFFIX}
${CD} $(XML_OBJ_DIR)/.. ; $(MAKE) -k $(MAKE_FLAGS) ; ${CD} ..
@@ -173,6 +179,7 @@
${CD} $(DOM_DIR) && $(MAKE) $@ && ${CD} ..
${CD} $(VALIDATORS_DTD_DIR) && $(MAKE) $@ && ${CD} ../..
${CD} $(VALIDATORS_DATATYPE_DIR) && $(MAKE) $@ && ${CD} ../..
+ ${CD} $(VALIDATORS_COMMON_DIR) && $(MAKE) $@ && ${CD} ../..
${CD} $(XML_OBJ) && $(MAKE) $@ && ${CD} ..
clean::
@@ -185,6 +192,7 @@
${CD} $(DOM_DIR) && $(MAKE) $@ && ${CD} ..
${CD} $(VALIDATORS_DTD_DIR) && $(MAKE) $@ && ${CD} ../..
${CD} $(VALIDATORS_DATATYPE_DIR) && $(MAKE) $@ && ${CD} ../..
+ ${CD} $(VALIDATORS_COMMON_DIR) && $(MAKE) $@ && ${CD} ../..
${CD} $(XML_OBJ) && $(MAKE) $@ && ${CD} ..
distclean::
@@ -197,6 +205,7 @@
${CD} $(DOM_DIR) && $(MAKE) $@ && ${CD} ..
${CD} $(VALIDATORS_DTD_DIR) && $(MAKE) $@ && ${CD} ../..
${CD} $(VALIDATORS_DATATYPE_DIR) && $(MAKE) $@ && ${CD} ../..
+ ${CD} $(VALIDATORS_COMMON_DIR) && $(MAKE) $@ && ${CD} ../..
${CD} $(XML_OBJ) && $(MAKE) $@ && ${CD} ..
rm -f Makefile config.cache config.log config.status
find . -name Makefile -print -exec rm -f {} \;
1.23 +2 -0 xml-xerces/c/src/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/configure,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- configure 2001/02/15 18:41:30 1.22
+++ configure 2001/02/16 14:58:54 1.23
@@ -1491,6 +1491,7 @@
util/MsgLoaders/MsgCatalog/Makefile \
util/MsgLoaders/MsgFile/Makefile \
util/NetAccessors/Socket/Makefile \
+validators/common/Makefile \
validators/datatype/Makefile \
validators/DTD/Makefile \
framework/Makefile \
@@ -1620,6 +1621,7 @@
util/MsgLoaders/MsgCatalog/Makefile \
util/MsgLoaders/MsgFile/Makefile \
util/NetAccessors/Socket/Makefile \
+validators/common/Makefile \
validators/datatype/Makefile \
validators/DTD/Makefile \
framework/Makefile \
1.19 +1 -0 xml-xerces/c/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.in 2001/02/15 18:41:31 1.18
+++ configure.in 2001/02/16 14:58:55 1.19
@@ -111,6 +111,7 @@
util/MsgLoaders/MsgCatalog/Makefile \
util/MsgLoaders/MsgFile/Makefile \
util/NetAccessors/Socket/Makefile \
+validators/common/Makefile \
validators/datatype/Makefile \
validators/DTD/Makefile \
framework/Makefile \
1.7 +5 -5 xml-xerces/c/src/validators/DTD/DTDElementDecl.cpp
Index: DTDElementDecl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/DTD/DTDElementDecl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DTDElementDecl.cpp 2000/07/25 22:43:39 1.6
+++ DTDElementDecl.cpp 2001/02/16 14:58:55 1.7
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DTDElementDecl.cpp,v 1.6 2000/07/25 22:43:39 aruna1 Exp $
+ * $Id: DTDElementDecl.cpp,v 1.7 2001/02/16 14:58:55 tng Exp $
*/
@@ -67,11 +67,11 @@
#include <util/XMLUni.hpp>
#include <framework/XMLBuffer.hpp>
#include <validators/DTD/DTDAttDefList.hpp>
-#include <validators/DTD/DFAContentModel.hpp>
+#include <validators/common/DFAContentModel.hpp>
#include <validators/DTD/DTDElementDecl.hpp>
-#include <validators/DTD/ContentSpecNode.hpp>
-#include <validators/DTD/MixedContentModel.hpp>
-#include <validators/DTD/SimpleContentModel.hpp>
+#include <validators/common/ContentSpecNode.hpp>
+#include <validators/common/MixedContentModel.hpp>
+#include <validators/common/SimpleContentModel.hpp>
1.21 +3 -3 xml-xerces/c/src/validators/DTD/DTDValidator2.cpp
Index: DTDValidator2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/DTD/DTDValidator2.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DTDValidator2.cpp 2000/11/07 19:32:36 1.20
+++ DTDValidator2.cpp 2001/02/16 14:58:55 1.21
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DTDValidator2.cpp,v 1.20 2000/11/07 19:32:36 andyh Exp $
+ * $Id: DTDValidator2.cpp,v 1.21 2001/02/16 14:58:55 tng Exp $
*/
@@ -72,11 +72,11 @@
#include <framework/XMLEntityHandler.hpp>
#include <internal/EndOfEntityException.hpp>
#include <internal/XMLScanner.hpp>
-#include <validators/DTD/ContentSpecNode.hpp>
+#include <validators/common/ContentSpecNode.hpp>
#include <validators/DTD/DTDEntityDecl.hpp>
#include <validators/DTD/DTDValidator.hpp>
#include <validators/DTD/DocTypeHandler.hpp>
-#include <validators/DTD/MixedContentModel.hpp>
+#include <validators/common/MixedContentModel.hpp>
1.7 +5 -17 xml-xerces/c/src/validators/DTD/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/DTD/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 2000/03/01 22:30:04 1.6
+++ Makefile.in 2001/02/16 14:58:56 1.7
@@ -55,6 +55,10 @@
#
#
# $Log: Makefile.in,v $
+# Revision 1.7 2001/02/16 14:58:56 tng
+# Schema: Update Makefile, configure files, project files, and include path in
+# certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
+#
# Revision 1.6 2000/03/01 22:30:04 abagchi
# Object files are now created directly under obj directory
#
@@ -104,38 +108,23 @@
SUBMODULE = DTD
VALIDATORS_DTD_CPP_PUBHEADERS = \
- CMBinaryOp.hpp \
- CMLeaf.hpp \
- CMNode.hpp \
- CMStateSet.hpp \
- CMUnaryOp.hpp \
- ContentSpecNode.hpp \
- DFAContentModel.hpp \
DTDAttDef.hpp \
DTDAttDefList.hpp \
DTDElementDecl.hpp \
DTDEntityDecl.hpp \
DTDValidator.hpp \
- DocTypeHandler.hpp \
- MixedContentModel.hpp \
- SimpleContentModel.hpp
+ DocTypeHandler.hpp
VALIDATORS_DTD_CPP_PRIVHEADERS =
VALIDATORS_DTD_C_FILES =
VALIDATORS_DTD_CPP_OBJECTS = \
- CMBinaryOp.$(TO) \
- CMUnaryOp.$(TO) \
- ContentSpecNode.$(TO) \
- DFAContentModel.$(TO) \
DTDAttDef.$(TO) \
DTDAttDefList.$(TO) \
DTDElementDecl.$(TO) \
DTDValidator.$(TO) \
- DTDValidator2.$(TO) \
- MixedContentModel.$(TO) \
- SimpleContentModel.$(TO)
+ DTDValidator2.$(TO)
all:: includes $(VALIDATORS_DTD_CPP_OBJECTS)
1.2 +20 -16 xml-xerces/c/src/validators/common/CMBinaryOp.cpp
Index: CMBinaryOp.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/CMBinaryOp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMBinaryOp.cpp 2001/02/16 14:17:29 1.1
+++ CMBinaryOp.cpp 2001/02/16 14:58:57 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,10 @@
/*
* $Log: CMBinaryOp.cpp,v $
+ * Revision 1.2 2001/02/16 14:58:57 tng
+ * Schema: Update Makefile, configure files, project files, and include path in
+ * certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
+ *
* Revision 1.1 2001/02/16 14:17:29 tng
* Schema: Move the common Content Model files that are shared by DTD
* and schema from 'DTD' folder to 'common' folder. By Pei Yong Zhang.
@@ -82,9 +86,9 @@
// ---------------------------------------------------------------------------
#include <util/XercesDefs.hpp>
#include <util/RuntimeException.hpp>
-#include <validators/DTD/ContentSpecNode.hpp>
-#include <validators/DTD/CMBinaryOp.hpp>
-#include <validators/DTD/CMStateSet.hpp>
+#include <validators/common/ContentSpecNode.hpp>
+#include <validators/common/CMBinaryOp.hpp>
+#include <validators/common/CMStateSet.hpp>
// ---------------------------------------------------------------------------
1.2 +18 -14 xml-xerces/c/src/validators/common/CMBinaryOp.hpp
Index: CMBinaryOp.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/CMBinaryOp.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMBinaryOp.hpp 2001/02/16 14:17:29 1.1
+++ CMBinaryOp.hpp 2001/02/16 14:58:57 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,10 @@
/*
* $Log: CMBinaryOp.hpp,v $
+ * Revision 1.2 2001/02/16 14:58:57 tng
+ * Schema: Update Makefile, configure files, project files, and include path in
+ * certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
+ *
* Revision 1.1 2001/02/16 14:17:29 tng
* Schema: Move the common Content Model files that are shared by DTD
* and schema from 'DTD' folder to 'common' folder. By Pei Yong Zhang.
@@ -83,7 +87,7 @@
#define CMBINARYOP_HPP
#include <util/XercesDefs.hpp>
-#include <validators/DTD/CMNode.hpp>
+#include <validators/common/CMNode.hpp>
class CMStateSet;
1.2 +20 -16 xml-xerces/c/src/validators/common/CMLeaf.hpp
Index: CMLeaf.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/CMLeaf.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMLeaf.hpp 2001/02/16 14:17:29 1.1
+++ CMLeaf.hpp 2001/02/16 14:58:57 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,10 @@
/*
* $Log: CMLeaf.hpp,v $
+ * Revision 1.2 2001/02/16 14:58:57 tng
+ * Schema: Update Makefile, configure files, project files, and include path in
+ * certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
+ *
* Revision 1.1 2001/02/16 14:17:29 tng
* Schema: Move the common Content Model files that are shared by DTD
* and schema from 'DTD' folder to 'common' folder. By Pei Yong Zhang.
@@ -88,9 +92,9 @@
#include <util/XercesDefs.hpp>
#include <util/RuntimeException.hpp>
-#include <validators/DTD/ContentSpecNode.hpp>
-#include <validators/DTD/CMNode.hpp>
-#include <validators/DTD/CMStateSet.hpp>
+#include <validators/common/ContentSpecNode.hpp>
+#include <validators/common/CMNode.hpp>
+#include <validators/common/CMStateSet.hpp>
//
// This class represents a leaf in the content spec node tree of an
1.2 +20 -16 xml-xerces/c/src/validators/common/CMNode.hpp
Index: CMNode.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/CMNode.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMNode.hpp 2001/02/16 14:17:29 1.1
+++ CMNode.hpp 2001/02/16 14:58:57 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,10 @@
/*
* $Log: CMNode.hpp,v $
+ * Revision 1.2 2001/02/16 14:58:57 tng
+ * Schema: Update Makefile, configure files, project files, and include path in
+ * certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
+ *
* Revision 1.1 2001/02/16 14:17:29 tng
* Schema: Move the common Content Model files that are shared by DTD
* and schema from 'DTD' folder to 'common' folder. By Pei Yong Zhang.
@@ -87,8 +91,8 @@
#define CMNODE_HPP
#include <util/XercesDefs.hpp>
-#include <validators/DTD/ContentSpecNode.hpp>
-#include <validators/DTD/CMStateSet.hpp>
+#include <validators/common/ContentSpecNode.hpp>
+#include <validators/common/CMStateSet.hpp>
class CMNode
@@ -164,7 +168,7 @@
CMStateSet* fFirstPos;
CMStateSet* fLastPos;
unsigned int fMaxStates;
-};
+};
1.2 +19 -15 xml-xerces/c/src/validators/common/CMUnaryOp.cpp
Index: CMUnaryOp.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/CMUnaryOp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMUnaryOp.cpp 2001/02/16 14:17:29 1.1
+++ CMUnaryOp.cpp 2001/02/16 14:58:57 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,10 @@
/*
* $Log: CMUnaryOp.cpp,v $
+ * Revision 1.2 2001/02/16 14:58:57 tng
+ * Schema: Update Makefile, configure files, project files, and include path in
+ * certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
+ *
* Revision 1.1 2001/02/16 14:17:29 tng
* Schema: Move the common Content Model files that are shared by DTD
* and schema from 'DTD' folder to 'common' folder. By Pei Yong Zhang.
@@ -82,8 +86,8 @@
// ---------------------------------------------------------------------------
#include <util/XercesDefs.hpp>
#include <util/RuntimeException.hpp>
-#include <validators/DTD/CMStateSet.hpp>
-#include <validators/DTD/CMUnaryOp.hpp>
+#include <validators/common/CMStateSet.hpp>
+#include <validators/common/CMUnaryOp.hpp>
// ---------------------------------------------------------------------------
1.2 +19 -15 xml-xerces/c/src/validators/common/CMUnaryOp.hpp
Index: CMUnaryOp.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/CMUnaryOp.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMUnaryOp.hpp 2001/02/16 14:17:29 1.1
+++ CMUnaryOp.hpp 2001/02/16 14:58:57 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,10 @@
/*
* $Log: CMUnaryOp.hpp,v $
+ * Revision 1.2 2001/02/16 14:58:57 tng
+ * Schema: Update Makefile, configure files, project files, and include path in
+ * certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
+ *
* Revision 1.1 2001/02/16 14:17:29 tng
* Schema: Move the common Content Model files that are shared by DTD
* and schema from 'DTD' folder to 'common' folder. By Pei Yong Zhang.
@@ -84,8 +88,8 @@
#define CMUNARYOP_HPP
#include <util/XercesDefs.hpp>
-#include <validators/DTD/CMNode.hpp>
-#include <validators/DTD/ContentSpecNode.hpp>
+#include <validators/common/CMNode.hpp>
+#include <validators/common/ContentSpecNode.hpp>
class CMStateSet;
1.2 +15 -15 xml-xerces/c/src/validators/common/ContentSpecNode.cpp
Index: ContentSpecNode.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/ContentSpecNode.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentSpecNode.cpp 2001/02/16 14:17:29 1.1
+++ ContentSpecNode.cpp 2001/02/16 14:58:57 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,7 +55,7 @@
*/
/*
- * $Id: ContentSpecNode.cpp,v 1.1 2001/02/16 14:17:29 tng Exp $
+ * $Id: ContentSpecNode.cpp,v 1.2 2001/02/16 14:58:57 tng Exp $
*/
@@ -67,7 +67,7 @@
#include <util/XMLUni.hpp>
#include <framework/XMLNotationDecl.hpp>
#include <framework/XMLBuffer.hpp>
-#include <validators/DTD/ContentSpecNode.hpp>
+#include <validators/common/ContentSpecNode.hpp>
#include <validators/DTD/DTDValidator.hpp>
1.2 +22 -18 xml-xerces/c/src/validators/common/DFAContentModel.cpp
Index: DFAContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/DFAContentModel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DFAContentModel.cpp 2001/02/16 14:17:29 1.1
+++ DFAContentModel.cpp 2001/02/16 14:58:57 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,10 @@
/*
* $Log: DFAContentModel.cpp,v $
+ * Revision 1.2 2001/02/16 14:58:57 tng
+ * Schema: Update Makefile, configure files, project files, and include path in
+ * certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
+ *
* Revision 1.1 2001/02/16 14:17:29 tng
* Schema: Move the common Content Model files that are shared by DTD
* and schema from 'DTD' folder to 'common' folder. By Pei Yong Zhang.
@@ -91,11 +95,11 @@
// ---------------------------------------------------------------------------
#include <util/RuntimeException.hpp>
#include <framework/XMLValidator.hpp>
-#include <validators/DTD/CMBinaryOp.hpp>
-#include <validators/DTD/CMLeaf.hpp>
-#include <validators/DTD/CMUnaryOp.hpp>
-#include <validators/DTD/DFAContentModel.hpp>
-#include <validators/DTD/ContentSpecNode.hpp>
+#include <validators/common/CMBinaryOp.hpp>
+#include <validators/common/CMLeaf.hpp>
+#include <validators/common/CMUnaryOp.hpp>
+#include <validators/common/DFAContentModel.hpp>
+#include <validators/common/ContentSpecNode.hpp>
#include <validators/DTD/DTDElementDecl.hpp>
1.2 +20 -16 xml-xerces/c/src/validators/common/MixedContentModel.cpp
Index: MixedContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/MixedContentModel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MixedContentModel.cpp 2001/02/16 14:17:29 1.1
+++ MixedContentModel.cpp 2001/02/16 14:58:57 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,10 @@
/*
* $Log: MixedContentModel.cpp,v $
+ * Revision 1.2 2001/02/16 14:58:57 tng
+ * Schema: Update Makefile, configure files, project files, and include path in
+ * certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
+ *
* Revision 1.1 2001/02/16 14:17:29 tng
* Schema: Move the common Content Model files that are shared by DTD
* and schema from 'DTD' folder to 'common' folder. By Pei Yong Zhang.
@@ -90,10 +94,10 @@
#include <util/RuntimeException.hpp>
#include <framework/XMLElementDecl.hpp>
#include <framework/XMLValidator.hpp>
-#include <validators/DTD/ContentSpecNode.hpp>
+#include <validators/common/ContentSpecNode.hpp>
#include <validators/DTD/DTDElementDecl.hpp>
-#include <validators/DTD/MixedContentModel.hpp>
-#include <validators/DTD/CMStateSet.hpp>
+#include <validators/common/MixedContentModel.hpp>
+#include <validators/common/CMStateSet.hpp>
// ---------------------------------------------------------------------------
1.2 +18 -14 xml-xerces/c/src/validators/common/SimpleContentModel.cpp
Index: SimpleContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/SimpleContentModel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleContentModel.cpp 2001/02/16 14:17:29 1.1
+++ SimpleContentModel.cpp 2001/02/16 14:58:57 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,10 @@
/*
* $Log: SimpleContentModel.cpp,v $
+ * Revision 1.2 2001/02/16 14:58:57 tng
+ * Schema: Update Makefile, configure files, project files, and include path in
+ * certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
+ *
* Revision 1.1 2001/02/16 14:17:29 tng
* Schema: Move the common Content Model files that are shared by DTD
* and schema from 'DTD' folder to 'common' folder. By Pei Yong Zhang.
@@ -85,7 +89,7 @@
// Includes
// ---------------------------------------------------------------------------
#include <util/RuntimeException.hpp>
-#include <validators/DTD/SimpleContentModel.hpp>
+#include <validators/common/SimpleContentModel.hpp>
// ---------------------------------------------------------------------------
1.2 +18 -14 xml-xerces/c/src/validators/common/SimpleContentModel.hpp
Index: SimpleContentModel.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/SimpleContentModel.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleContentModel.hpp 2001/02/16 14:17:29 1.1
+++ SimpleContentModel.hpp 2001/02/16 14:58:57 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -56,6 +56,10 @@
/*
* $Log: SimpleContentModel.hpp,v $
+ * Revision 1.2 2001/02/16 14:58:57 tng
+ * Schema: Update Makefile, configure files, project files, and include path in
+ * certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
+ *
* Revision 1.1 2001/02/16 14:17:29 tng
* Schema: Move the common Content Model files that are shared by DTD
* and schema from 'DTD' folder to 'common' folder. By Pei Yong Zhang.
@@ -79,7 +83,7 @@
#define SIMPLECONTENTMODEL_HPP
#include <framework/XMLContentModel.hpp>
-#include <validators/DTD/ContentSpecNode.hpp>
+#include <validators/common/ContentSpecNode.hpp>
//
1.1 xml-xerces/c/src/validators/common/Makefile.in
Index: Makefile.in
===================================================================
#
# The Apache Software License, Version 1.1
#
# Copyright (c) 1999 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
#
# 3. The end-user documentation included with the redistribution,
# if any, must include the following acknowledgment:
# "This product includes software developed by the
# Apache Software Foundation (http://www.apache.org/)."
# Alternately, this acknowledgment may appear in the software itself,
# if and wherever such third-party acknowledgments normally appear.
#
# 4. The names "Xerces" and "Apache Software Foundation" must
# not be used to endorse or promote products derived from this
# software without prior written permission. For written
# permission, please contact apache\@apache.org.
#
# 5. Products derived from this software may not be called "Apache",
# nor may "Apache" appear in their name, without prior written
# permission of the Apache Software Foundation.
#
# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
# ====================================================================
#
# This software consists of voluntary contributions made by many
# individuals on behalf of the Apache Software Foundation, and was
# originally based on software copyright (c) 1999, International
# Business Machines, Inc., http://www.ibm.com . For more information
# on the Apache Software Foundation, please see
# <http://www.apache.org/>.
#
# $Log: Makefile.in,v $
# Revision 1.1 2001/02/16 14:58:57 tng
# Schema: Update Makefile, configure files, project files, and include path in
# certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
#
#
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
LDFLAGS = @ldflags@
LIBS = @libs@
OSVER = @osver@
USELIBWWW = @uselibwww@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
include ../../Makefile.incl
MODULE = validators
SUBMODULE = common
VALIDATORS_COMMON_CPP_PUBHEADERS = \
CMBinaryOp.hpp \
CMLeaf.hpp \
CMNode.hpp \
CMStateSet.hpp \
CMUnaryOp.hpp \
ContentSpecNode.hpp \
DFAContentModel.hpp \
MixedContentModel.hpp \
SimpleContentModel.hpp
VALIDATORS_COMMON_CPP_PRIVHEADERS =
VALIDATORS_COMMON_C_FILES =
VALIDATORS_COMMON_CPP_OBJECTS = \
CMBinaryOp.$(TO) \
CMUnaryOp.$(TO) \
ContentSpecNode.$(TO) \
DFAContentModel.$(TO) \
MixedContentModel.$(TO) \
SimpleContentModel.$(TO)
all:: includes $(VALIDATORS_COMMON_CPP_OBJECTS)
includes:: pubheaders $(VALIDATORS_COMMON_C_FILES)
pubheaders::
-mkdir -p $(XML_INC_DIR)/$(MODULE)/$(SUBMODULE)
$(CP) $(VALIDATORS_COMMON_CPP_PUBHEADERS) $(VALIDATORS_COMMON_C_FILES) $(XML_INC_DIR)/$(MODULE)/$(SUBMODULE)
# this may generate unnecessary dependencies, but it makes life easier
depend:: includes
$(MAKE_DEPEND) $(XML_INCL) *.cpp > $(DEPFILE)
clean::
@echo "Making clean in $(MODULE)/$(SUBMODULE) ..."
$(RM2) $(addprefix $(XML_OBJ_DIR)/,$(VALIDATORS_COMMON_CPP_OBJECTS))
distclean:: clean
$(RM) Makefile $(DEPFILE)
@echo "Removing all $(MODULE)/$(SUBMODULE) header files ..."
$(RM2) $(addprefix $(XML_INC_DIR)/$(MODULE)/$(SUBMODULE)/,$(VALIDATORS_COMMON_CPP_PUBHEADERS))
install::
-mkdir -p $(PREFIX)/$(MODULE)/$(SUBMODULE)
$(CP) $(VALIDATORS_COMMON_CPP_PUBHEADERS) $(VALIDATORS_COMMON_C_FILES) $(PREFIX)/$(MODULE)/$(SUBMODULE)