[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - solenv/bin solenv/inc
solenv/bin/modules/installer/globals.pm |2 +-
solenv/bin/modules/installer/parameter.pm | 10 +-
solenv/bin/modules/pre2par/parameter.pm |9 +
solenv/inc/libs.mk|5 -
4 files changed, 23 insertions(+), 3 deletions(-)
New commits:
commit 13fcc38291a3d30d4610492e527e2f30c906e30a
Author: Yuri Dario yda...@apache.org
Date: Tue Sep 9 15:35:43 2014 +
#i118923# OS/2 port, use forward slashes for paths in installer scripts.
diff --git a/solenv/bin/modules/pre2par/parameter.pm
b/solenv/bin/modules/pre2par/parameter.pm
index 92fe984..adae8e8 100644
--- a/solenv/bin/modules/pre2par/parameter.pm
+++ b/solenv/bin/modules/pre2par/parameter.pm
@@ -152,6 +152,15 @@ sub make_path_absolute
}
}
+if ( $pre2par::globals::isos2 )
+{
+if (!($$pathref =~ /^\s*\w\:/)) # this is a relative os2 path
+{
+$$pathref = cwd() . $pre2par::globals::separator . $$pathref;
+$$pathref =~ s/\\/\//g;
+}
+}
+
$$pathref =~ s/\Q$pre2par::globals::separator\E\s*$//; # removing ending
slashes
}
commit 0eda64e2bb03cda98844ffcf16bfc0215d9b706f
Author: Yuri Dario yda...@apache.org
Date: Tue Sep 9 15:34:20 2014 +
#i118923# OS/2 port, use forward slashes for paths in installer scripts.
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index e55bfcd..a3b2851 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -499,7 +499,7 @@ BEGIN
$checksumfile = so_checksum;
$unopkgfile = unopkg.bin;
$separator = /;
-$pathseparator = \:;
+$pathseparator = \;;
$libextension = \.dll;
$isunix = 0;
$iswin = 0;
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index 122abf5..526866c 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -246,8 +246,15 @@ sub make_path_absolute
if (!($$pathref =~ /^\s*\w\:/)) # this is a relative windows path
(no dos drive)
{
$$pathref = cwd() . $installer::globals::separator . $$pathref;
+if ( $installer::globals::isos2 )
+{
+$$pathref =~ s/\\/\//g;
+}
+else
+{
+$$pathref =~ s/\//\\/g;
+}
-$$pathref =~ s/\//\\/g;
}
}
}
@@ -376,6 +383,7 @@ sub setglobalvariables
{
$installer::globals::unpackpath = cwd();
if ( $installer::globals::iswin ) { $installer::globals::unpackpath =~
s/\//\\/g; }
+if ( $installer::globals::isos2 ) { $installer::globals::unpackpath =~
s/\\/\//g; }
}
if ( $installer::globals::localunpackdir ne ) {
$installer::globals::unpackpath = $installer::globals::localunpackdir; }
commit c2063d3da2916dc0f6f81b81232ce9d6407d697d
Author: Yuri Dario yda...@apache.org
Date: Tue Sep 9 15:27:00 2014 +
#i125501# build fixes for enabling Category B also in OS/2 port.
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index d8d70a9..361d9ce 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -326,6 +326,8 @@ UDMLIB=-ludm
ULINGULIB=-lulingu
.IF $(SYSTEM_HUNSPELL) == YES
HUNSPELLLIB=$(HUNSPELL_LIBS)
+.ELIF $(GUI) == OS2
+HUNSPELLLIB=-lhunspell
.ELSE
HUNSPELLLIB=-lhunspell-1.3
.ENDIF
@@ -333,11 +335,12 @@ HUNSPELLLIB=-lhunspell-1.3
MYTHESLIB=$(MYTHES_LIBS)
.ELIF $(GUI) == OS2
MYTHESLIB=-lmythes
+COINMPLIBS=-lCoinMP
.ELSE
MYTHESLIB=-lmythes-1.2
+COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
.ENDIF
PYUNOLIB=-lpyuno
-COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
INTERNAL_APR_LIBS=-lapr-1
INTERNAL_APR_UTIL_LIBS=-laprutil-1
INTERNAL_SERF_LIBS=-lserf-1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - solenv/bin
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 +
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 +
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);
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - solenv/bin vcl/source
solenv/bin/make_installer.pl | 11 --
solenv/bin/modules/installer/control.pm | 11 --
solenv/bin/modules/installer/converter.pm |2
solenv/bin/modules/installer/languages.pm | 109 +-
solenv/bin/modules/installer/packagepool.pm |9 --
solenv/bin/modules/installer/systemactions.pm | 11 --
vcl/source/window/dockwin.cxx |5 +
7 files changed, 106 insertions(+), 52 deletions(-)
New commits:
commit 064c425f69e15091cfd9078ad120447f69f0b021
Author: Andre Fischer a...@apache.org
Date: Mon Dec 2 14:16:32 2013 +
123729: Factored out the creation of directory names the depend on build
languages.
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 1495890..def1bf0 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1645,15 +1645,8 @@ for (;1;last)
if ( $installer::globals::updatepack ) { $logminor =
$installer::globals::lastminor; }
else { $logminor = $installer::globals::minor; }
-my $loglanguagestring = $$languagestringref;
-my $loglanguagestring_orig = $loglanguagestring;
-if (length($loglanguagestring) $installer::globals::max_lang_length)
-{
-my $number_of_languages =
installer::systemactions::get_number_of_langs($loglanguagestring);
-chomp(my $shorter = `echo $loglanguagestring | md5sum | sed -e s/
.*//g`);
-my $id = substr($shorter, 0, 8); # taking only the first 8 digits
-$loglanguagestring = lang_ . $number_of_languages . _id_ . $id;
-}
+my $loglanguagestring_orig = $$languagestringref;
+my $loglanguagestring =
installer::languages::get_language_directory_name($$languagestringref);
# Setup the directory where the language dependent log file will be stored.
$loggingdir = $loggingdir . $loglanguagestring .
$installer::globals::separator;
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index 51edf8d..8db26b2 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -428,16 +428,7 @@ sub determine_ship_directory
my $shipdrive = $ENV{'SHIPDRIVE'};
-my $languagestring = $$languagesref;
-
-if (length($languagestring) $installer::globals::max_lang_length )
-{
-my $number_of_languages =
installer::systemactions::get_number_of_langs($languagestring);
-chomp(my $shorter = `echo $languagestring | md5sum | sed -e s/
.*//g`);
-# $languagestring = $shorter;
-my $id = substr($shorter, 0, 8); # taking only the first 8 digits
-$languagestring = lang_ . $number_of_languages . _id_ . $id;
-}
+my $languagestring =
installer::languages::get_language_directory_name($$languagesref);
my $productstring = $installer::globals::product;
my $productsubdir = ;
diff --git a/solenv/bin/modules/installer/converter.pm
b/solenv/bin/modules/installer/converter.pm
index 5ef25e4..c6d2b79 100644
--- a/solenv/bin/modules/installer/converter.pm
+++ b/solenv/bin/modules/installer/converter.pm
@@ -305,7 +305,7 @@ sub make_path_conform
sub copy_collector
{
-my ($oldcollector) = @_;
+my ( $oldcollector ) = @_;
my @newcollector = ();
diff --git a/solenv/bin/modules/installer/languages.pm
b/solenv/bin/modules/installer/languages.pm
index 030956d..0b19c1f 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -29,6 +29,10 @@ use installer::exiter;
use installer::globals;
use installer::remover;
use installer::ziplist;
+use Digest::MD5;
+
+use strict;
+
=head2 analyze_languagelist()
@@ -70,6 +74,33 @@ sub analyze_languagelist()
+=head2 get_language_directory_name ($language_string)
+
+Create a directory name that contains the given set of languages.
+When $language_string exceeds a certain length then it is shortened.
+
+=cut
+sub get_language_directory_name ($)
+{
+my ($language_string) = @_;
+
+if (length($language_string) $installer::globals::max_lang_length)
+{
+my $number_of_languages = ($language_string =~ tr/_//);
+my $digest = new Digest::MD5();
+$digest-add($language_string);
+my $short_digest = substr($digest-hexdigest(), 0, 8);
+return lang_ . $number_of_languages . _id_ . $short_digest;
+}
+else
+{
+return $language_string;
+}
+}
+
+
+
+
# Reading languages from zip list file
@@ -123,27 +154,23 @@ sub all_elements_of_array1_in_array2
# All languages defined for one product
#
-sub get_all_languages_for_one_product
-{
-my ( $languagestring, $allvariables ) = @_;
+=head2 get_all_languages_for_one_product($languagestring, $allvariables)
+
+$languagestring can be one or more language names,
