tng 2002/11/19 08:04:34
Modified: c/scripts packageBinaries.pl xerces-c.spec
Log:
Get ready for Xerces-C++ 2.2
Revision Changes Path
1.109 +54 -54 xml-xerces/c/scripts/packageBinaries.pl
Index: packageBinaries.pl
===================================================================
RCS file: /home/cvs/xml-xerces/c/scripts/packageBinaries.pl,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- packageBinaries.pl 11 Nov 2002 18:52:38 -0000 1.108
+++ packageBinaries.pl 19 Nov 2002 16:04:34 -0000 1.109
@@ -29,11 +29,11 @@
print (" -j suppress building of ICU (speeds up builds when debugging)\n");
print (" -h to get help on these commands\n\n");
print ("Example: Under unix's\n");
- print (" perl packageBinaries.pl -s \$HOME/xerces-c-src2_1_0");
- print (" -o \$HOME/xerces-c_2_1_0-linux -c gcc -x g++ -m inmem -n fileonly -t
native\n\n");
+ print (" perl packageBinaries.pl -s \$HOME/xerces-c-src2_2_0");
+ print (" -o \$HOME/xerces-c_2_2_0-linux -c gcc -x g++ -m inmem -n fileonly -t
native\n\n");
print ("Example: Under Windows\n");
- print (" perl packageBinaries.pl -s \\xerces-c-src2_1_0");
- print (" -o\\xerces-c_2_1_0-win32 [-n fileonly] [-t icu]\n\n");
+ print (" perl packageBinaries.pl -s \\xerces-c-src2_2_0");
+ print (" -o\\xerces-c_2_2_0-win32 [-n fileonly] [-t icu]\n\n");
print ("Note:\n");
print (" Under Windows, by default the XercesLib project files is\n");
print (" configured to use Win32 resource file based message loader,\n");
@@ -163,7 +163,7 @@
#
#REVISIT: icu
#
- if (($opt_t =~ m/icu/i || $opt_m =~ m/icu/i) && length($ICUROOT) > 0) {
+ if (($opt_t =~ m/icu/i || $opt_m =~ m/icu/i) && length($ICUROOT) > 0) {
print ("Building ICU from $ICUROOT ...\n");
@@ -186,13 +186,13 @@
{
$transcoder = 1;
}
-
- $msgloader = 0;
- if ($opt_m =~ m/icu/i)
+
+ $msgloader = 0;
+ if ($opt_m =~ m/icu/i)
{
$msgloader = 1;
}
-
+
change_windows_makefile_for_ICU("$XERCESCROOT\\Projects\\Win32\\VC6\\xerces-all/XercesLib/XercesLib.mak",
$transcoder, $msgloader);
}
@@ -213,8 +213,8 @@
# Build resource bundle for ICUMsgLoader
if ($opt_m =~ m/icu/i) {
pchdir ("$XERCESCROOT\\src\\xercesc\\util\\MsgLoaders\\ICU\\resources");
- psystem( "nmake /f resources.mak > buildlog.txt 2>&1 ");
- system("cat buildlog.txt");
+ psystem( "nmake /f resources.mak > buildlog.txt 2>&1 ");
+ system("cat buildlog.txt");
}
# Decide where you want the build copied from
@@ -322,7 +322,7 @@
if ( $opt_m =~ m/icu/i) {
psystem("copy /y
$XERCESCROOT\\src\\xercesc\\util\\MsgLoaders\\ICU\\resources\\*.res $targetdir\\lib");
}
-
+
}
psystem("copy /y $BUILDDIR\\xerces-c_*.lib $targetdir\\lib");
@@ -492,13 +492,13 @@
{
$transcoder = 1;
}
-
- $msgloader = 0;
- if ($opt_m =~ m/icu/i)
+
+ $msgloader = 0;
+ if ($opt_m =~ m/icu/i)
{
$msgloader = 1;
}
-
+
change_windows_project_for_ICU("$XERCESCROOT/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp",
$transcoder , $msgloader);
}
@@ -520,7 +520,7 @@
}
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") {
@@ -538,10 +538,10 @@
# Build resource bundle for ICUMsgLoader
if ($opt_m =~ m/icu/i) {
pchdir ("$XERCESCROOT/src/xercesc/util/MsgLoaders/ICU/resources");
- psystem( "nmake /f resources.mak > buildlog.txt 2>&1 ");
- system("cat buildlog.txt");
+ psystem( "nmake /f resources.mak > buildlog.txt 2>&1 ");
+ system("cat buildlog.txt");
}
-
+
# Decide where you want the build copied from
pchdir ($targetdir);
$BUILDDIR = $XERCESCROOT . "/Build/Win32/VC6/" . $buildmode;
@@ -641,12 +641,12 @@
psystem("cp -fv $ICUROOT/lib/icuuc.lib $targetdir/lib");
psystem("cp -fv $ICUROOT/lib/icuucd.lib $targetdir/lib");
-
+
# Copy the Resouce Bundle for ICUMsgLoader
if ( $opt_m =~ m/icu/i) {
psystem("cp -fv
$XERCESCROOT/src/xercesc/util/MsgLoaders/ICU/resources/*.res $targetdir/lib");
}
-
+
}
psystem("cp -fv $BUILDDIR/xerces-c_*.lib $targetdir/lib");
if ($buildmode ne "Debug") {
@@ -787,7 +787,7 @@
if ($opt_m =~ m/icu/i) {
$ENV{'SHLIB_PATH'}="$ICUROOT/lib:$ENV{'SHLIB_PATH'}";
}
-
+
psystem ("echo SHLIB_PATH=$ENV{'SHLIB_PATH'}");
}
if ($platform =~ m/Linux/i) {
@@ -800,11 +800,11 @@
} else {
$icuCompileFlags = 'CC=gcc CXX=g++ CXXFLAGS="-w -O" CFLAGS="-w -O"';
}
-
+
if ($opt_m =~ m/icu/i) {
$ENV{'LD_LIBRARY_PATH'}="$ICUROOT/lib:$ENV{'LD_LIBRARY_PATH'}";
}
-
+
psystem ("echo LD_LIBRARY_PATH=$ENV{'LD_LIBRARY_PATH'}");
}
@@ -813,11 +813,11 @@
$platform = "solaris";
if ($opt_c eq "") {$opt_c = "cc";}
if ($opt_x eq "") {$opt_x = "CC";}
-
+
if ($opt_m =~ m/icu/i) {
$ENV{'LD_LIBRARY_PATH'}="$ICUROOT/lib:$ENV{'LD_LIBRARY_PATH'}";
}
-
+
psystem ("echo LD_LIBRARY_PATH=$ENV{'LD_LIBRARY_PATH'}");
}
@@ -929,7 +929,7 @@
psystem ("mkdir $targetdir/doc/html/apiDocs");
# Build ICU if needed
- if (($opt_t =~ m/icu/i || $opt_m =~ m/icu/i) && !(length($opt_j) > 0))
+ if (($opt_t =~ m/icu/i || $opt_m =~ m/icu/i) && !(length($opt_j) > 0))
{
print("\n\nBuild ICU with \'$opt_b\' bit ...\n");
if(length($ICUROOT) == 0) {
@@ -1118,22 +1118,22 @@
pchdir ("$targetdir/lib");
psystem("rm -f libxerces-c* ");
- if ((-e "$XERCESCROOT/lib/libxerces-c.so.21.0" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-c.so.21.0 .");
- psystem("ln -s libxerces-c.so.21.0 libxerces-c.so.21 ");
- psystem("ln -s libxerces-c.so.21 libxerces-c.so ");
- }
-
- if ((-e "$XERCESCROOT/lib/libxerces-c.sl.21.0" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-c.sl.21.0 .");
- psystem("ln -s libxerces-c.sl.21.0 libxerces-c.sl.21 ");
- psystem("ln -s libxerces-c.sl.21 libxerces-c.sl ");
- }
-
- if ((-e "$XERCESCROOT/lib/libxerces-c21.0.so" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-c21.0.so .");
- psystem("ln -s libxerces-c21.0.so libxerces-c21.so ");
- psystem("ln -s libxerces-c21.so libxerces-c.so ");
+ if ((-e "$XERCESCROOT/lib/libxerces-c.so.22.0" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-c.so.22.0 .");
+ psystem("ln -s libxerces-c.so.22.0 libxerces-c.so.22 ");
+ psystem("ln -s libxerces-c.so.22 libxerces-c.so ");
+ }
+
+ if ((-e "$XERCESCROOT/lib/libxerces-c.sl.22.0" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-c.sl.22.0 .");
+ psystem("ln -s libxerces-c.sl.22.0 libxerces-c.sl.22 ");
+ psystem("ln -s libxerces-c.sl.22 libxerces-c.sl ");
+ }
+
+ if ((-e "$XERCESCROOT/lib/libxerces-c22.0.so" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-c22.0.so .");
+ psystem("ln -s libxerces-c22.0.so libxerces-c22.so ");
+ psystem("ln -s libxerces-c22.so libxerces-c.so ");
}
#
@@ -1186,7 +1186,7 @@
if ( $opt_m =~ m/icu/i) {
psystem("cp -f
$XERCESCROOT/src/xercesc/util/MsgLoaders/ICU/resources/*.res $targetdir/lib");
}
-
+
}
# Populate the etc output directory like config.status and the map file
@@ -1286,7 +1286,7 @@
sub change_windows_project_for_ICU() {
my ($thefile, $transcoder, $msgloader) = @_;
-
+
print "\nConverting Windows Xerces library project ($thefile) for ICU usage...";
my $thefiledotbak = $thefile . ".bak";
rename ($thefile, $thefiledotbak);
@@ -1305,21 +1305,21 @@
$line =~ s[Debug/xerces-c_2D.lib"][Debug/xerces-c_2D.lib"
/libpath:"$ICUROOT\\lib" /libpath:"$ICUROOT\\source\\data"];
$line =~ s[Release/xerces-c_2.lib"][Release/xerces-c_2.lib"
/libpath:"$ICUROOT\\lib" /libpath:"$ICUROOT\\source\\data"];
$line =~ s/user32.lib/user32.lib $icuuc.lib icudata.lib/g;
-
+
if ($transcoder)
{
$line =~ s/XML_USE_WIN32_TRANSCODER/XML_USE_ICU_TRANSCODER/g;
$line =~
s/Transcoders\\Win32\\Win32TransService.cpp/Transcoders\\ICU\\ICUTransService.cpp/g;
- $line =~
s/Transcoders\\Win32\\Win32TransService.hpp/Transcoders\\ICU\\ICUTransService.hpp/g;
+ $line =~
s/Transcoders\\Win32\\Win32TransService.hpp/Transcoders\\ICU\\ICUTransService.hpp/g;
}
-
+
if ($msgloader)
{
$line =~ s/XML_USE_WIN32_MSGLOADER/XML_USE_ICU_MESSAGELOADER/g;
$line =~
s/MsgLoaders\\Win32\\Win32MsgLoader.cpp/MsgLoaders\\ICU\\ICUMsgLoader.cpp/g;
- $line =~
s/MsgLoaders\\Win32\\Win32MsgLoader.hpp/MsgLoaders\\ICU\\ICUMsgLoader.hpp/g;
+ $line =~
s/MsgLoaders\\Win32\\Win32MsgLoader.hpp/MsgLoaders\\ICU\\ICUMsgLoader.hpp/g;
}
-
+
print FIZZLEOUT $line;
}
close (FIZZLEOUT);
@@ -1352,14 +1352,14 @@
$line =~
s/Transcoders\\Win32\\Win32TransService/Transcoders\\ICU\\ICUTransService/g;
$line =~ s/Win32TransService/ICUTransService/g;
}
-
+
if ($msgloader)
{
$line =~ s/XML_USE_WIN32_MSGLOADER/XML_USE_ICU_MESSAGELOADER/g;
$line =~
s/MsgLoaders\\Win32\\Win32MsgLoader/MsgLoaders\\ICU\\ICUMsgLoader/g;
- $line =~ s/Win32MsgLoader/ICUMsgLoader/g;
+ $line =~ s/Win32MsgLoader/ICUMsgLoader/g;
}
-
+
print FIZZLEOUT $line;
}
close (FIZZLEOUT);
1.2 +13 -13 xml-xerces/c/scripts/xerces-c.spec
Index: xerces-c.spec
===================================================================
RCS file: /home/cvs/xml-xerces/c/scripts/xerces-c.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xerces-c.spec 2 Oct 2002 14:58:26 -0000 1.1
+++ xerces-c.spec 19 Nov 2002 16:04:34 -0000 1.2
@@ -1,4 +1,4 @@
-%define tarversion 2_1_0
+%define tarversion 2_2_0
# threads
# values: pthreads, none
@@ -6,7 +6,7 @@
Summary: Validating XML parser
Name: xerces-c
-Version: 2.1.0
+Version: 2.2.0
Release: 2
URL: http://xml.apache.org/xerces-c/
Source0: %{name}-src%{tarversion}.tar.gz
@@ -18,14 +18,14 @@
%description
Xerces-C++ is a validating XML parser written in a portable subset of C++.
-Xerces-C++ makes it easy to give your application the ability to read and
-write XML data. A shared library is provided for parsing, generating,
-manipulating, and validating XML documents.
-
-The parser provides high performance, modularity, and scalability. Source
-code, samples and API documentation are provided with the parser. For
-portability, care has been taken to make minimal use of templates, no RTTI,
-no C++ namespaces and minimal use of #ifdefs.
+Xerces-C++ makes it easy to give your application the ability to read and
+write XML data. A shared library is provided for parsing, generating,
+manipulating, and validating XML documents.
+
+The parser provides high performance, modularity, and scalability. Source
+code, samples and API documentation are provided with the parser. For
+portability, care has been taken to make minimal use of templates, no RTTI,
+and minimal use of #ifdefs.
%package devel
Requires: xerces-c = %{version}
@@ -34,9 +34,9 @@
%description devel
Xerces-C++ is a validating XML parser written in a portable subset of C++.
-Xerces-C++ makes it easy to give your application the ability to read and
-write XML data. A shared library is provided for parsing, generating,
-manipulating, and validating XML documents.
+Xerces-C++ makes it easy to give your application the ability to read and
+write XML data. A shared library is provided for parsing, generating,
+manipulating, and validating XML documents.
%prep
%setup -q -n %{name}-src%{tarversion}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
