peiyongz 2002/10/10 14:14:35
Modified: c/scripts packageBinaries.pl
Log:
Build ICU if ICUMsgLoader is specified.
Revision Changes Path
1.100 +31 -7 xml-xerces/c/scripts/packageBinaries.pl
Index: packageBinaries.pl
===================================================================
RCS file: /home/cvs/xml-xerces/c/scripts/packageBinaries.pl,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- packageBinaries.pl 27 Aug 2002 18:36:57 -0000 1.99
+++ packageBinaries.pl 10 Oct 2002 21:14:35 -0000 1.100
@@ -429,7 +429,7 @@
#
# ICU Build happens here, if one is required.
#
- if ($opt_t =~ 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");
#Clean up all the dependency files, causes problems for nmake
@@ -460,7 +460,19 @@
psystem("cat buildlog.txt");
}
-
change_windows_project_for_ICU("$XERCESCROOT/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp");
+ $transcoder = 0;
+ if ($opt_t =~ m/icu/i )
+ {
+ $transcoder = 1;
+ }
+
+ $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);
}
@@ -1211,7 +1223,8 @@
sub change_windows_project_for_ICU() {
- my ($thefile) = @_;
+ my ($thefile, $transcoder, $msgloader) = @_;
+
print "\nConverting Windows Xerces library project ($thefile) for ICU usage...";
my $thefiledotbak = $thefile . ".bak";
rename ($thefile, $thefiledotbak);
@@ -1229,11 +1242,22 @@
$line =~ s[/D "PROJ_XMLPARSER"][/I "$ICUROOT\\include" /D "PROJ_XMLPARSER"];
$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/XML_USE_WIN32_TRANSCODER/XML_USE_ICU_TRANSCODER/g;
$line =~ s/user32.lib/user32.lib $icuuc.lib icudata.lib/g;
- $line =~
s/Transcoders\\Win32\\Win32TransService.cpp/Transcoders\\ICU\\ICUTransService.cpp/g;
- $line =~
s/Transcoders\\Win32\\Win32TransService.hpp/Transcoders\\ICU\\ICUTransService.hpp/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;
+ }
+
+ 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;
+ }
+
print FIZZLEOUT $line;
}
close (FIZZLEOUT);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
