Author: cargilld
Date: Mon Oct 2 18:31:02 2006
New Revision: 452290
URL: http://svn.apache.org/viewvc?view=rev&rev=452290
Log:
packaging updates
Modified:
xerces/c/trunk/scripts/packageBinaries.pl
Modified: xerces/c/trunk/scripts/packageBinaries.pl
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/scripts/packageBinaries.pl?view=diff&rev=452290&r1=452289&r2=452290
==============================================================================
--- xerces/c/trunk/scripts/packageBinaries.pl (original)
+++ xerces/c/trunk/scripts/packageBinaries.pl Mon Oct 2 18:31:02 2006
@@ -471,6 +471,11 @@
# Echo the current PATH to see what compiler it picks up
psystem ("echo PATH=$ENV{'PATH'}");
+
+ $xercesc_cxxflags = '';
+ $xercesc_linkflags = '';
+ $xercesc_64bit_cxxflags = '';
+ $xercesc_64bit_linkflags = '';
# Set defaults for platform-specific options.
if ($platform =~ m/AIX/i) {
@@ -483,9 +488,13 @@
$icu_cflags = '"-w -O2 -qmaxmem=-1 -qnamemangling=v5"';
} else {
$icu_cxxflags = '"-w -O2 -qmaxmem=-1"';
- $icu_cflags = '"-w -O2 -qmaxmem=-1"';
+ $icu_cflags = '"-w -O2 -qmaxmem=-1"';
}
+ if ($opt_b eq "64") {
+ $xercesc_64bit_cxxflags = '"-q64 -qwarn64"';
+ }
+
if ($opt_m =~ m/icu/i) {
$ENV{'LIBPATH'}="$ICUROOT/lib:$XERCESCROOT/lib:$ENV{'LIBPATH'}";
$ENV{'PATH'}="$ICUROOT/bin:$ENV{'PATH'}";
@@ -534,7 +543,16 @@
}
$icu_cxxflags = '"-w +O2 +Ofltacc"';
- $icu_cflags = '"-w +O2 +Ofltacc"';
+ $icu_cflags = '"-w +O2 +Ofltacc"';
+
+ if (($platform eq "hp-11") &&
+ ($opt_x eq "aCC")) {
+ $xercesc_cxxflags= '"-D_INCLUDE__STDC_A1_SOURCE"';
+ if ($opt_b eq "64") {
+ $xercesc_64bit_cxxflags = '"+DD64"';
+ $xercesc_64bit_linkflags = '"+DD64"';
+ }
+ }
if ($opt_m =~ m/icu/i) {
$ENV{'SHLIB_PATH'}="$ICUROOT/lib:$XERCESCROOT/lib:$ENV{'SHLIB_PATH'}";
@@ -576,7 +594,7 @@
if ($platform =~ m/SunOS/i) {
$platform = "solaris";
- if ($opXt_c eq "") {$opt_c = "cc";}
+ if ($opt_c eq "") {$opt_c = "cc";}
if ($opt_x eq "") {$opt_x = "CC";}
if ($opt_m =~ m/icu/i) {
@@ -584,8 +602,23 @@
$ENV{'PATH'}="$ICUROOT/bin:$ENV{'PATH'}";
}
- $icu_cxxflags = '"-w -O3"';
- $icu_cflags = '"-w -xO3"';
+ if ($opt_b eq "32") {
+ $icu_cxxflags = '"-w -O3"';
+ $icu_cflags = '"-w -xO3"';
+ }
+ else {
+ $icu_cxxflags = '"-w -O3 -xarch=v9"';
+ $icu_cflags = '"-w -xO3 -xarch=v9"';
+ }
+
+ if ($opt_x eq "CC") {
+ $ENV{'PATH'}="/usr/ccs/bin:/usr/ucb:$ENV{'PATH'}";
+ $xercesc_linkflags = '"-z muldefs"';
+ if ($opt_b eq "64") {
+ $xercesc_64bit_cxxflags = '"-xarch=v9"';
+ $xercesc_64bit_linkflags = '"-xarch=v9"';
+ }
+ }
psystem ("echo LD_LIBRARY_PATH=$ENV{'LD_LIBRARY_PATH'}");
} # SunOS
@@ -629,6 +662,11 @@
if ($opt_n eq "") {$opt_n = "socket"; } # Socket based net accessor.
if ($opt_t eq "") {$opt_t = "native"; } # Native transcoding service.
if ($opt_b eq "") {$opt_b = "32"; } # bitstobuild.
+
+ $icu_bitflag = "";
+ if ($opt_b eq "32") {
+ $icu_bitflag = "--disable-64bit-libs";
+ }
# Set defaults for platform tools
if ($TAR eq "") {
@@ -683,44 +721,18 @@
my $cXX = $opt_x;
if ($opt_x eq "aCC05") {
$cXX = "aCC";
- }
-
- if ($opt_b eq "32") {
- psystem ("CC=$opt_c CXX=$cXX CXXFLAGS=$icu_cxxflags
CFLAGS=$icu_cflags sh ./configure --prefix=$ICUROOT --disable-64bit-libs");
- }
- else {
- psystem ("CC=$opt_c CXX=$cXX CXXFLAGS=$icu_cxxflags
CFLAGS=$icu_cflags sh ./configure --prefix=$ICUROOT");
- }
+ }
+ psystem ("CC=$opt_c CXX=$cXX CXXFLAGS=$icu_cxxflags
CFLAGS=$icu_cflags sh ./configure --prefix=$ICUROOT $icu_bitflag");
}elsif ($platform eq 'aix') {
my $cXX = $opt_x;
if ($opt_x eq "xlC_rv5compat") {
$cXX = "xlC_r";
- }
-
- if ($opt_b eq "32") {
- psystem ("CC=$opt_c CXX=$cXX CXXFLAGS=$icu_cxxflags
CFLAGS=$icu_cflags sh ./configure --prefix=$ICUROOT --disable-64bit-libs");
- }
- else {
- psystem ("CC=$opt_c CXX=$cXX CXXFLAGS=$icu_cxxflags
CFLAGS=$icu_cflags sh ./configure --prefix=$ICUROOT");
- }
- }elsif ($platform eq 'solaris') {
- if ($opt_b eq "32") {
- psystem ("CC=$opt_c CXX=$opt_x CXXFLAGS=$icu_cxxflags
CFLAGS=$icu_cflags sh ./configure --prefix=$ICUROOT --disable-64bit-libs");
- }
- else {
- $icu_cxxflags = '"-w -O3 -xarch=v9"';
- $icu_cflags = '"-w -xO3 -xarch=v9"';
- psystem ("CC=$opt_c CXX=$opt_x CXXFLAGS=$icu_cxxflags
CFLAGS=$icu_cflags sh ./configure --prefix=$ICUROOT");
- }
+ }
+ psystem ("CC=$opt_c CXX=$cXX CXXFLAGS=$icu_cxxflags
CFLAGS=$icu_cflags sh ./configure --prefix=$ICUROOT $icu_bitflag");
} else {
- # set the 32 bit or 64 bit
- if ($opt_b eq "32") {
- psystem ("CC=$opt_c CXX=$opt_x CXXFLAGS=$icu_cxxflags
CFLAGS=$icu_cflags sh ./configure --prefix=$ICUROOT --disable-64bit-libs");
- }
- else {
- psystem ("CC=$opt_c CXX=$opt_x CXXFLAGS=$icu_cxxflags
CFLAGS=$icu_cflags sh ./configure --prefix=$ICUROOT");
- }
+ # set the 32 bit or 64 bit
+ psystem ("CC=$opt_c CXX=$opt_x CXXFLAGS=$icu_cxxflags
CFLAGS=$icu_cflags sh ./configure --prefix=$ICUROOT $icu_bitflag");
}
psystem ("$MAKE clean"); # Clean up the build,
may want to comment this line out!
@@ -757,19 +769,22 @@
$cfg_icu = "";
$cfg_m = "";
if ($opt_m eq "inmem") {$cfg_m = "--enable-msgloader-inmemory"; }
- if ($opt_m eq "icu") {$cfg_m = "--enable-msgloader-icu";
$cfg_icu="--with-icu=$ICUROOT"; }
+ if ($opt_m eq "icu") {$cfg_m = "--enable-msgloader-icu";
$cfg_icu="--with-icu=$ICUROOT"; }
if ($opt_m eq "iconv") {$cfg_m = "--enable-msgloader-iconv"; }
$cfg_n = "";
if ($opt_n eq "fileonly") {$cfg_n = "--disable-netaccessor-socket
--disable-netaccessor-curl --disable-netaccessor-libwww
--disable-netaccessor-cfurl"; }
- if ($opt_n eq "socket") {$cfg_n = "--enable-netaccessor-socket"; }
+ if ($opt_n eq "socket") {$cfg_n = "--enable-netaccessor-socket"; }
$cfg_t = "";
- if ($opt_t eq "icu") {$cfg_t = "--enable-transcoder-icu";
$cfg_icu="--with-icu=$ICUROOT"; }
+ if ($opt_t eq "icu") {$cfg_t = "--enable-transcoder-icu";
$cfg_icu="--with-icu=$ICUROOT"; }
if ($opt_t eq "native") {$cfg_t = "--disable-transcoder-icu
--enable-transcoder-iconv"; }
- psystem ("CC=$opt_c CXX=$opt_x CXXFLAGS=$icu_cxxflags CFLAGS=$icu_cflags
./configure $cfg_icu $cfg_m $cfg_n $cfg_t --disable-pretty-make");
+ $total_cxxflags = $icu_cxxflags . " " . $xercesc_cxxflags . " " .
$xercesc_64bit_cxxflags;
+ $total_linkflags = $xercesc_linkflags . " " . $xercesc_64bit_linkflags;
+ psystem ("CC=$opt_c CXX=$opt_x CXXFLAGS=$total_cxxflags CFLAGS=$icu_cflags
LDFLAGS=$total_linkflags ./configure $cfg_icu $cfg_m $cfg_n $cfg_t
--disable-pretty-make");
+
psystem ("$MAKE clean"); # May want to comment this line out to speed
up
psystem ("$MAKE");
# build the tests
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
