Author: hdu
Date: Mon Dec 9 08:20:16 2013
New Revision: 1549504
URL: http://svn.apache.org/r1549504
Log:
#i122301# handle new names of unxmac* platform targets
Modified:
openoffice/trunk/main/solenv/bin/modules/installer/download.pm
openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm
openoffice/trunk/main/solenv/bin/modules/installer/worker.pm
openoffice/trunk/main/solenv/bin/srcrelease.xml
openoffice/trunk/main/solenv/bin/update_module_ignore_lists.pl
Modified: openoffice/trunk/main/solenv/bin/modules/installer/download.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/download.pm?rev=1549504&r1=1549503&r2=1549504&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/download.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/download.pm Mon Dec 9
08:20:16 2013
@@ -594,15 +594,15 @@ sub get_download_architecture
{
my $arch = "";
- if ( $installer::globals::compiler =~ /unxlngi/ )
+ if(( $installer::globals::compiler =~ /^unxlngi/ )
+ || ( $installer::globals::compiler =~ /^unxmac.i/ )
+ || ( $installer::globals::issolarisx86build )
+ || ( $installer::globals::iswindowsbuild ))
{
$arch = "x86";
}
- elsif ( $installer::globals::compiler =~ /unxlngppc/ )
- {
- $arch = "PPC";
- }
- elsif ( $installer::globals::compiler =~ /unxlngx/ )
+ elsif(( $installer::globals::compiler =~ /^unxlngx/ )
+ || ( $installer::globals::compiler =~ /^unxmaccx/ ))
{
$arch = "x86-64";
}
@@ -610,19 +610,8 @@ sub get_download_architecture
{
$arch = "Sparc";
}
- elsif ( $installer::globals::issolarisx86build )
- {
- $arch = "x86";
- }
- elsif ( $installer::globals::iswindowsbuild )
- {
- $arch = "x86";
- }
- elsif ( $installer::globals::compiler =~ /^unxmacxi/ )
- {
- $arch = "x86";
- }
- elsif ( $installer::globals::compiler =~ /^unxmacxp/ )
+ elsif(( $installer::globals::compiler =~ /^unxmacxp/ )
+ || ( $installer::globals::compiler =~ /^unxlngppc/ ))
{
$arch = "PPC";
}
@@ -856,8 +845,9 @@ sub resolve_variables_in_downloadname
elsif ( $installer::globals::issolarissparcbuild ) { $os = "solsparc"; }
elsif ( $installer::globals::issolarisx86build ) { $os = "solia"; }
elsif ( $installer::globals::islinuxbuild ) { $os = "linux"; }
- elsif ( $installer::globals::compiler =~ /unxmacxi/ ) { $os =
"macosxi"; }
- elsif ( $installer::globals::compiler =~ /unxmacxp/ ) { $os =
"macosxp"; }
+ elsif ( $installer::globals::compiler =~ /unxmac.i/ ) { $os = "macosi";
}
+ elsif ( $installer::globals::compiler =~ /unxmac.x/ ) { $os = "macosx";
}
+ elsif ( $installer::globals::compiler =~ /unxmacxp/ ) { $os = "macosp";
}
else { $os = ""; }
$downloadname =~ s/\{os\}/$os/;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm?rev=1549504&r1=1549503&r2=1549504&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm
(original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm Mon Dec
9 08:20:16 2013
@@ -804,7 +804,7 @@ sub create_simple_package
installer::logger::include_header_into_logfile("Registering
extensions:");
register_extensions($subfolderdir, $languagestringref, $preregdir);
- if ( $installer::globals::compiler =~ /^unxmacx/ )
+ if ( $installer::globals::compiler =~ /^unxmac/ )
{
installer::worker::put_scpactions_into_installset("$installdir/$packagename");
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/worker.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/worker.pm?rev=1549504&r1=1549503&r2=1549504&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/worker.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/worker.pm Mon Dec 9
08:20:16 2013
@@ -733,10 +733,8 @@ sub remove_all_items_with_special_flag
if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'} };
if ( $styles =~ /\b$flag\b/ )
{
- $installer::logger::Lang->printf(
- "Attention: Removing from collector '%s' because it has flag
%s\n",
- $oneitem->{'Name'},
- $flag);
+ my $infoline = "Attention: Removing from collector:
$oneitem->{'Name'} !\n";
+ $installer::logger::Lang->print($infoline);
if ( $flag eq "BINARYTABLE_ONLY" ) {
push(@installer::globals::binarytableonlyfiles, $oneitem); }
next;
}
@@ -2272,10 +2270,14 @@ sub get_platform_name
{
$platformname = "Win32Intel";
}
- elsif ( $installer::globals::compiler =~ /^unxmacxi/ )
+ elsif(( $installer::globals::compiler =~ /^unxmac.i/ ))
{
$platformname = "MacOSXIntel";
}
+ elsif ( $installer::globals::compiler =~ /^unxmaccx/ )
+ {
+ $platformname = "MacOSXX86-64";
+ }
elsif ( $installer::globals::compiler =~ /^unxmacxp/ )
{
$platformname = "MacOSXPowerPC";
Modified: openoffice/trunk/main/solenv/bin/srcrelease.xml
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/srcrelease.xml?rev=1549504&r1=1549503&r2=1549504&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/srcrelease.xml (original)
+++ openoffice/trunk/main/solenv/bin/srcrelease.xml Mon Dec 9 08:20:16 2013
@@ -32,7 +32,7 @@
<property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn
**/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log,
config.parms, config.status, bootstrap, autom4te.cache/**, MacOSXX86Env.*,
external/unowinreg/unowinreg.dll" />
<property name="excludes.executables"
value="solenv/bin/macosx-create-bundle, solenv/bin/linkoo, solenv/bin/localize,
solenv/bin/createpdbrelocators, solenv/bin/langwrap, solenv/bin/makedepn,
solenv/bin/packmodule, solenv/bin/rpm-wrapper, solenv/bin/relocate,
solenv/bin/receditor, solenv/bin/subsequenttests, **/*.sh, **/*.bat, **/*.exe,
configure.cmd, oowintool, config.sub, config.guess, **/*.pl"/>
<property name="includes.mk" value="inc/unxmac*.mk inc/unxlng*.mk
inc/wntmsci*.mk inc/unxsol*.mk" />
- <property name="excludes.outdirs" value="**/unxmacx*/**, **/unxlng*/**,
**/unxsol*/**, **/wntmsci*/**" />
+ <property name="excludes.outdirs" value="**/unxmac*/**, **/unxlng*/**,
**/unxsol*/**, **/wntmsci*/**" />
<target name="getrevision">
Modified: openoffice/trunk/main/solenv/bin/update_module_ignore_lists.pl
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/update_module_ignore_lists.pl?rev=1549504&r1=1549503&r2=1549504&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/update_module_ignore_lists.pl (original)
+++ openoffice/trunk/main/solenv/bin/update_module_ignore_lists.pl Mon Dec 9
08:20:16 2013
@@ -44,6 +44,9 @@ my @platforms = (
"unxsoli4",
"wntmsci12",
"unxmacxi",
+ "unxmacxp",
+ "unxmacci",
+ "unxmaccx",
"unxubit8",
"unxaixp",
"unxbsda",
@@ -70,7 +73,6 @@ my @platforms = (
"unxlngs390x",
"unxlngs",
"unxlnxi",
- "unxmacxp",
"unxsogi",
"unxsogs"
);
