solenv/bin/modules/installer/download.pm | 32 ++++++------------
solenv/bin/modules/installer/languages.pm | 25 ++++++++++++++
solenv/bin/modules/installer/patch/InstallationSet.pm | 2 -
solenv/bin/modules/installer/patch/Msi.pm | 11 +++++-
solenv/bin/modules/installer/simplepackage.pm | 2 -
solenv/bin/modules/installer/worker.pm | 6 ++-
solenv/bin/srcrelease.xml | 2 -
solenv/bin/update_module_ignore_lists.pl | 4 +-
8 files changed, 57 insertions(+), 27 deletions(-)
New commits:
commit 0bcdf29f92417baed014fca55932727f31260174
Author: Andre Fischer <a...@apache.org>
Date: Mon Dec 9 08:43:20 2013 +0000
123531: Handle languages that are internally prefixed with 'en-US_'
diff --git a/solenv/bin/modules/installer/languages.pm
b/solenv/bin/modules/installer/languages.pm
index 0b19c1f..260e96c 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -462,4 +462,29 @@ sub get_key_language ($)
}
}
+
+
+
+=head2 get_normalized_language ($language)
+
+ Transform "..._<language>" into "<language>".
+ The ... part, if it exists, is typically en-US.
+
+ If $language does not contain a '_' then $language is returned unmodified.
+
+=cut
+sub get_normalized_language ($)
+{
+ my ($language) = @_;
+
+ if ($language =~ /^.*?_(.*)$/)
+ {
+ return $1;
+ }
+ else
+ {
+ return $language;
+ }
+}
+
1;
diff --git a/solenv/bin/modules/installer/patch/InstallationSet.pm
b/solenv/bin/modules/installer/patch/InstallationSet.pm
index e30adc4..876bfb8 100644
--- a/solenv/bin/modules/installer/patch/InstallationSet.pm
+++ b/solenv/bin/modules/installer/patch/InstallationSet.pm
@@ -253,7 +253,7 @@ sub GetUnpackedPath ($$$$$)
$package_format,
installer::patch::Version::ArrayToDirectoryName(
installer::patch::Version::StringToNumberArray($version)),
- $language);
+ installer::languages::get_normalized_language($language));
}
diff --git a/solenv/bin/modules/installer/patch/Msi.pm
b/solenv/bin/modules/installer/patch/Msi.pm
index 5cefda8..e5b47f6 100644
--- a/solenv/bin/modules/installer/patch/Msi.pm
+++ b/solenv/bin/modules/installer/patch/Msi.pm
@@ -51,7 +51,7 @@ sub FindAndCreate($$$$$)
$path = installer::patch::InstallationSet::GetUnpackedExePath(
$version,
$is_current_version,
- $language,
+ installer::languages::get_normalized_language($language),
"msi",
$product_name);
@@ -75,6 +75,7 @@ sub FindAndCreate($$$$$)
If construction fails then IsValid() will return false.
=cut
+
sub new ($$$$$$)
{
my ($class, $filename, $version, $is_current_version, $language,
$product_name) = @_;
@@ -122,6 +123,7 @@ sub IsValid ($)
Write all modified tables back into the databse.
=cut
+
sub Commit ($)
{
my $self = shift;
@@ -159,6 +161,7 @@ sub Commit ($)
call for the same table is very cheap.
=cut
+
sub GetTable ($$)
{
my ($self, $table_name) = @_;
@@ -197,6 +200,7 @@ sub GetTable ($$)
Write the given table back to the databse.
=cut
+
sub PutTable ($$)
{
my ($self, $table) = @_;
@@ -243,6 +247,7 @@ sub PutTable ($$)
to their last modification times (mtime).
=cut
+
sub EnsureAYoungerThanB ($$)
{
my ($filename_a, $filename_b) = @_;
@@ -276,6 +281,7 @@ sub EnsureAYoungerThanB ($$)
Returns long and short name (in this order) as array.
=cut
+
sub SplitLongShortName ($)
{
my ($name) = @_;
@@ -300,6 +306,7 @@ sub SplitLongShortName ($)
table.
=cut
+
sub SplitTargetSourceLongShortName ($)
{
my ($name) = @_;
@@ -322,6 +329,7 @@ sub SplitTargetSourceLongShortName ($)
to hashes that contains short and long source and target names.
=cut
+
sub GetDirectoryMap ($)
{
my ($self) = @_;
@@ -423,6 +431,7 @@ sub GetDirectoryMap ($)
calls but the first are cheap.
=cut
+
sub GetFileMap ($)
{
my ($self) = @_;
commit f63ec98285ba6fbe47927967798a109e62be94c9
Author: Andre Fischer <a...@apache.org>
Date: Mon Dec 9 08:37:41 2013 +0000
123729: Reapply changes that where accidentally merged out.
diff --git a/solenv/bin/modules/installer/worker.pm
b/solenv/bin/modules/installer/worker.pm
index c7058f4..b7db099 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -733,8 +733,10 @@ sub remove_all_items_with_special_flag
if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'} };
if ( $styles =~ /\b$flag\b/ )
{
- my $infoline = "Attention: Removing from collector:
$oneitem->{'Name'} !\n";
- $installer::logger::Lang->print($infoline);
+ $installer::logger::Lang->printf(
+ "Attention: Removing from collector '%s' because it has flag
%s\n",
+ $oneitem->{'Name'},
+ $flag);
if ( $flag eq "BINARYTABLE_ONLY" ) {
push(@installer::globals::binarytableonlyfiles, $oneitem); }
next;
}
commit ae089acb5a865fad33b2e64dc1a5a614fa73ec27
Author: Herbert Dürr <h...@apache.org>
Date: Mon Dec 9 08:20:16 2013 +0000
#i122301# handle new names of unxmac* platform targets
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index bc6a994..8c540fa 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -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/;
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 28b1414..13e09cd 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -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");
}
diff --git a/solenv/bin/modules/installer/worker.pm
b/solenv/bin/modules/installer/worker.pm
index 7af7c93..c7058f4 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -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";
diff --git a/solenv/bin/srcrelease.xml b/solenv/bin/srcrelease.xml
index 3540cda..dc76da3 100644
--- a/solenv/bin/srcrelease.xml
+++ b/solenv/bin/srcrelease.xml
@@ -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">
diff --git a/solenv/bin/update_module_ignore_lists.pl
b/solenv/bin/update_module_ignore_lists.pl
index faab709..3a827d7 100644
--- a/solenv/bin/update_module_ignore_lists.pl
+++ b/solenv/bin/update_module_ignore_lists.pl
@@ -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"
);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
