[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2019-06-21 Thread Matthias Seidel (via logerrit) 
 solenv/bin/modules/installer/globals.pm |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 573971b607a886886631d102f08f81db0f7a1938
Author: Matthias Seidel 
AuthorDate: Fri Jun 21 15:21:44 2019 +
Commit: Matthias Seidel 
CommitDate: Fri Jun 21 15:21:44 2019 +

Cleaned up whitespace

diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index cd9826a4367b..8202dbc3d536 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -171,8 +171,8 @@ BEGIN
 $programmenufolder = "ProgramMenuFolder";
 $systemfolder = "SystemFolder";
 $encodinglistname = "msi-encodinglist.txt";
-$msiencoding = "";  # hash reference for msi encodings
-$msilanguage = "";  # hash reference for msi languages LCID
+$msiencoding = ""; # hash reference for msi encodings
+$msilanguage = ""; # hash reference for msi languages LCID
 $sofficeiconadded = 0;
 $temppath = "";
 $globaltempdirname = "ooopackaging";
@@ -236,7 +236,7 @@ BEGIN
 $strip = 1;
 
 $globallogging = 0;
-$logfilename = "logfile.log";   # the default logfile name for global 
errors
+$logfilename = "logfile.log"; # the default logfile name for global errors
 #   @logfileinfo = ();
 #   @errorlogfileinfo = ();
 #   @globallogfileinfo = ();
@@ -297,7 +297,7 @@ BEGIN
 $productxpdfile = "setup.xpd";
 $xpd_files_prepared = 0;
 $defaultlanguage = "";
-# @emptyxpdparents = ();
+#   @emptyxpdparents = ();
 @createdxpdfiles = ();
 @allxpdfiles = ();
 $isxpdplatform = 0;
@@ -407,7 +407,7 @@ BEGIN
 
 $fix_number_of_cab_files = 1;
 $cabfilecompressionlevel = 2;
-$number_of_cabfiles = 1;# only for $fix_number_of_cab_files = 1
+$number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1
 $include_cab_in_msi = 0;
 $msidatabasename = "";
 $prepare_winpatch = 0;
@@ -418,9 +418,9 @@ BEGIN
 %newfilescollector = ();
 
 $saveinstalldir = "";
-$csp_installdir = "";   # global installdir of createsimplepackage() 
in simplepackage.pm
-$csp_installlogdir = "";# global installlogdir of 
createsimplepackage() in simplepackage.pm
-$csp_languagestring = "";   # global languagestring of 
createsimplepackage() in simplepackage.pm
+$csp_installdir = ""; # global installdir of createsimplepackage() in 
simplepackage.pm
+$csp_installlogdir = ""; # global installlogdir of createsimplepackage() 
in simplepackage.pm
+$csp_languagestring = ""; # global languagestring of createsimplepackage() 
in simplepackage.pm
 $localunpackdir = "";
 $localinstalldirset = 0;
 $localinstalldir = "";
@@ -478,7 +478,7 @@ BEGIN
 
 if ( $plat =~ /cygwin/i )
 {
-$zippath = "zip";   # Has to be in the path: 
/usr/bin/zip
+$zippath = "zip"; # Has to be in the path: /usr/bin/zip
 $checksumfile = "so_checksum";
 $unopkgfile = "unopkg.exe";
 $separator = "/";
@@ -491,7 +491,7 @@ BEGIN
 elsif ( $plat =~ /os2/i )
 {
 print "Setup OS/2 platform\n";
-$zippath = "zip";   # Has to be in the path: 
/usr/bin/zip
+$zippath = "zip"; # Has to be in the path: /usr/bin/zip
 $checksumfile = "so_checksum";
 $unopkgfile = "unopkg.bin";
 $separator = "/";
@@ -504,7 +504,7 @@ BEGIN
 }
 else
 {
-$zippath = "zip";   # Has to be in the path: 
/usr/bin/zip
+$zippath = "zip"; # Has to be in the path: /usr/bin/zip
 $checksumfile = "so_checksum";
 $unopkgfile = "unopkg";
 $separator = "/";
@@ -533,7 +533,7 @@ BEGIN
 
 # ToDo: Needs to be expanded for additional platforms
 
-$is_release = 0;  # Is changed in parameter.pm when the -release option is 
given.
+$is_release = 0; # Is changed in parameter.pm when the -release option is 
given.
 $source_version = undef;
 $target_version = undef;
 $source_msi = undef;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2019-04-09 Thread Matthias Seidel (via logerrit) 
 solenv/bin/modules/installer/download.pm |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 09162b7d8d9afdbbcf03273db3ffa31bf2ac1b6c
Author: Matthias Seidel 
AuthorDate: Tue Apr 9 12:21:23 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Apr 9 12:21:23 2019 +

Changed download name for Dev build (according to openoffice.lst), removed 
whitespace

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index 7142f69df2d0..f85777bb52a8 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -70,7 +70,7 @@ sub put_linenumber_into_script
 {
 my ( $scriptfile ) = @_;
 
-my $linenumber =  $#{$scriptfile} + 2;
+my $linenumber = $#{$scriptfile} + 2;
 
 $installer::logger::Lang->printf("Adding linenumber %d into download shell 
script\n", $linenumber);
 
@@ -469,15 +469,15 @@ sub get_downloadname_productname
 }
 }
 
-if ( $allvariables->{'PRODUCTNAME'} eq "AOO-Developer-Build" )
+if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice Developer Build" )
 {
 if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
 {
-$start .= "-Dev-SDK";
+$start .= "_Dev-SDK";
 }
 else
 {
-$start .= "-Dev";
+$start .= "_Dev";
 }
 }
 
@@ -507,7 +507,7 @@ sub get_download_version
 # the environment variable CWS_WORK_STAMP is set only in CWS
 if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; }
 
-if (( $cwsproduct ) || ( $devproduct ))  # use "DEV300m75"
+if (( $cwsproduct ) || ( $devproduct )) # use "DEV300m75"
 {
 my $source = uc($installer::globals::build); # DEV300
 my $localminor = "";
@@ -515,7 +515,7 @@ sub get_download_version
 else { $localminor = $installer::globals::lastminor; }
 $version = $source . $localminor;
 }
-else  # use 3.2.0rc1
+else # use 3.2.0rc1
 {
 $version = $allvariables->{'PRODUCTVERSION'};
 if (( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ) && ( 
$allvariables->{'ABOUTBOXPRODUCTVERSION'} ne "" )) { $version = 
$allvariables->{'ABOUTBOXPRODUCTVERSION'}; }
@@ -1403,7 +1403,7 @@ sub replace_identifier_in_nshfile
 {
 my $oldstring = $1;
 ${$nshfile}[$i] =~ s/\Q$oldstring\E/$newstring/;
-$installer::logger::Lang->printf("NSIS replacement in %s (%s):  
\-\> %s\n",
+$installer::logger::Lang->printf("NSIS replacement in %s (%s): 
\-\> %s\n",
 $nshfilename,
 $onelanguage,
 $oldstring,
@@ -1512,7 +1512,7 @@ sub convert_utf8_to_utf16
 installer::systemactions::copy_one_file($filename, $savfilename);
 
 open( IN, "<:utf8", $filename ) || installer::exiter::exit_program("ERROR: 
Cannot open file $filename for reading", "convert_utf8_to_utf16");
-while (my  $line = )
+while (my $line = )
 {
 push @localfile, $line;
 }
@@ -1893,7 +1893,7 @@ sub create_download_sets
 if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: 
Could not find script file $scriptfilename!", "create_download_sets"); }
 my $scriptfile = installer::files::read_file($$scriptref);
 
-$installer::logger::Lang->printf("Found  script file %s: %s \n", 
$scriptfilename, $$scriptref);
+$installer::logger::Lang->printf("Found script file %s: %s \n", 
$scriptfilename, $$scriptref);
 
 # add product name into script template
 put_productname_into_script($scriptfile, $allvariableshashref);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2019-02-04 Thread Libreoffice Gerrit user 
 solenv/bin/modules/installer/logger.pm |   28 +---
 1 file changed, 13 insertions(+), 15 deletions(-)

New commits:
commit 23b7d74f43725596c16dfaf0e4284f667e020eea
Author: Matthias Seidel 
AuthorDate: Mon Feb 4 23:14:21 2019 +
Commit: Matthias Seidel 
CommitDate: Mon Feb 4 23:14:21 2019 +

Removed whitespace, fixed typo

diff --git a/solenv/bin/modules/installer/logger.pm 
b/solenv/bin/modules/installer/logger.pm
index 652bc17b7f46..1bdf3054cf68 100644
--- a/solenv/bin/modules/installer/logger.pm
+++ b/solenv/bin/modules/installer/logger.pm
@@ -8,7 +8,7 @@
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
 #
-#http://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
@@ -45,9 +45,9 @@ sub Die ($);
 
 =head1 DESCRIPTION
 
-This module is in a transition state from a set of loosly connected 
functions to a single class.
+This module is in a transition state from a set of loosely connected 
functions to a single class.
 
-There are three globaly available logger objects:
+There are three globally available logger objects:
 
 =over
 
@@ -59,7 +59,7 @@ sub Die ($);
 
 =item $Glob
 
-is independent of the current language.  Its messages are prepended to 
each $Lang logger.
+is independent of the current language. Its messages are prepended to each 
$Lang logger.
 
 =cut
 
@@ -146,19 +146,19 @@ sub new ($$@)
 # When true then lines are printed to the console.
 'is_print_to_console' => 1,
 'is_save_lines' => 0,
-# A container of printed lines.  Lines are added only when 
'is_save_lines' is true.
+# A container of printed lines. Lines are added only when 
'is_save_lines' is true.
 'lines' => [],
 # Another logger to which all prints are forwarded.
 'forward' => [],
-# A filter function that for example can recoginze build errors.
+# A filter function that for example can recognize build errors.
 'filter' => undef,
 # Show relative time
 'is_show_relative_time' => 0,
-# Show log id (mostly for debugging the logger)
+# Show log id (mostly for debugging the logger).
 'is_show_log_id' => 0,
 # Show the process id, useful on the console when doing a 
multiprocessor build.
 'is_show_process_id' => 0,
-# Current indentation
+# Current indentation.
 'indentation' => "",
 };
 while (scalar @arguments >= 2)
@@ -200,7 +200,7 @@ sub printf ($$@)
 
 Print the given message.
 If the optional $force parameter is given and it evaluates to true then 
the message
-is printed even when the golbal $installer::globals::quiet is true.
+is printed even when the global $installer::globals::quiet is true.
 
 =cut
 sub print ($$;$)
@@ -325,7 +325,7 @@ sub set_filename ($$)
 
 =head2 set_filter ($self, $filter)
 
-Sets $filter (a function reference) as line filter.  It is applied to each 
line.
+Sets $filter (a function reference) as line filter. It is applied to each 
line.
 The filter can extract information from the given message and modify it 
before it is printed.
 
 =cut
@@ -377,7 +377,7 @@ sub copy_lines_from ($$)
 
 =head2 set_forward ($self, $other)
 
-Set a forwarding target.  All future messages are forwarded (copied) to 
$other.
+Set a forwarding target. All future messages are forwarded (copied) to 
$other.
 A typical use is to tie $Info to $Lang so that all messages sent to $Info 
are
 printed to the console AND written to the log file.
 
@@ -454,7 +454,7 @@ sub include_header_into_globallogfile
 
 sub include_timestamp_into_logfile
 {
-Die "deprected";
+Die "deprecated";
 my ($message) = @_;
 
 my $infoline;
@@ -523,7 +523,7 @@ sub copy_globalinfo_into_logfile
 
 sub debuginfo
 {
-my  ( $message ) = @_;
+my ( $message ) = @_;
 
 $message = $message . "\n";
 push(@installer::globals::functioncalls, $message);
@@ -742,6 +742,4 @@ sub Die ($)
 die $message;
 }
 
-
-
 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2019-01-23 Thread Libreoffice Gerrit user 
 solenv/bin/modules/installer/systemactions.pm |   76 +-
 1 file changed, 38 insertions(+), 38 deletions(-)

New commits:
commit fef416499d3559230d78288661d73fe59838273e
Author: Matthias Seidel 
AuthorDate: Wed Jan 23 23:07:15 2019 +
Commit: Matthias Seidel 
CommitDate: Wed Jan 23 23:07:15 2019 +

Removed whitespace, fixed typos

diff --git a/solenv/bin/modules/installer/systemactions.pm 
b/solenv/bin/modules/installer/systemactions.pm
index 181ac8b734ee..33e616bf33cd 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -8,7 +8,7 @@
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
 #
-#http://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
@@ -32,7 +32,7 @@ use installer::pathanalyzer;
 use installer::remover;
 
 ##
-# Creating a new direcotory
+# Creating a new directory
 ##
 
 sub create_directory
@@ -155,7 +155,7 @@ sub create_directory
 }
 
 ##
-# Creating a new direcotory with defined privileges
+# Creating a new directory with defined privileges
 ##
 
 sub create_directory_with_privileges
@@ -282,9 +282,9 @@ sub create_directory_with_privileges
 
 =item is_directory_empty ($path)
 Return
-1 if there are no files in the directory pointed to by $path
-0 if there are files
-   -1 if there is an error accessing the directory.
+ 1 if there are no files in the directory pointed to by $path
+ 0 if there are files
+-1 if there is an error accessing the directory.
 =cut
 sub is_directory_empty ($)
 {
@@ -309,7 +309,7 @@ sub is_directory_empty ($)
 
 
 ##
-# Removing a new direcotory
+# Removing a new directory
 ##
 
 sub remove_empty_directory
@@ -374,7 +374,7 @@ sub create_directories
 {
 my ($newdirectory, $languagesref) =@_;
 
-$installer::globals::unpackpath =~ 
s/\Q$installer::globals::separator\E\s*$//;  # removing ending slashes and 
backslashes
+$installer::globals::unpackpath =~ 
s/\Q$installer::globals::separator\E\s*$//; # removing ending slashes and 
backslashes
 
 my $path = "";
 
@@ -382,14 +382,14 @@ sub create_directories
 {
 if ( $installer::globals::temppathdefined ) { $path = 
$installer::globals::temppath; }
 else { $path = $installer::globals::unpackpath; }
-$path =~ s/\Q$installer::globals::separator\E\s*$//;# removing 
ending slashes and backslashes
+$path =~ s/\Q$installer::globals::separator\E\s*$//; # removing ending 
slashes and backslashes
 $path = $path . $installer::globals::separator;
 }
 elsif ( ( $newdirectory eq "jds" ) )
 {
 if ( $installer::globals::jdstemppathdefined ) { $path = 
$installer::globals::jdstemppath; }
 else { $path = $installer::globals::unpackpath; }
-$path =~ s/\Q$installer::globals::separator\E\s*$//;# removing 
ending slashes and backslashes
+$path =~ s/\Q$installer::globals::separator\E\s*$//; # removing ending 
slashes and backslashes
 $path = $path . $installer::globals::separator;
 installer::systemactions::create_directory($path);
 }
@@ -408,9 +408,9 @@ sub create_directories
 $infoline = "create_directories: Using $path for $newdirectory !\n";
 $installer::logger::Lang->print($infoline);
 
-if ($newdirectory eq "unzip" )  # special handling for common directory
+if ($newdirectory eq "unzip" ) # special handling for common directory
 {
-$path = $path  . ".." . $installer::globals::separator . "common" . 
$installer::globals::productextension . $installer::globals::separator;
+$path = $path . ".." . $installer::globals::separator . "common" . 
$installer::globals::productextension . $installer::globals::separator;
 create_directory($path);
 
 $path = $path . $newdirectory . $installer::globals::separator;
@@ -449,11 +449,11 @@ sub create_directories
 
 if ( $$languagesref ) { $locallanguagesref = $$languagesref; }
 
-if (!($locallanguagesref eq "" ))   # this will be a path like 
"01_49", for Profiles and ConfigurationFiles, idt-Files
+if (!($locallanguagesref eq "" )) # this will be a path like "01_49", 
for Profiles and ConfigurationFiles, idt-Files
 {
 my $languagestring = 
installer::languages::get_language_directory_name($$languagesref);
 
-$path = $path . $languagestring  . $installer::globals::separator;
+

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2019-01-23 Thread Libreoffice Gerrit user 
 solenv/bin/make_installer.pl |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit e774041ec07d7f168c41a42b6ffa6aacc816d442
Author: Jim Jagielski 
AuthorDate: Wed Jan 23 19:51:08 2019 +
Commit: Jim Jagielski 
CommitDate: Wed Jan 23 19:51:08 2019 +

Fix confusing message... if EPM is patched, be sure to log that

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index cce6c29f9a9e..b250735d0733 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1117,8 +1117,14 @@ sub MakeNonWindowsBuild ($$$)
 if ( $installer::globals::call_epm )
 {
 # ... now epm can be started, to create the 
installation sets
-
-$installer::logger::Info->print( "... starting 
unpatched epm ... \n" );
+if ( $installer::globals::is_special_epm )
+{
+$installer::logger::Info->print( "... starting 
patched epm ... \n" );
+}
+else
+{
+$installer::logger::Info->print( "... starting 
unpatched epm ... \n" );
+}
 
 if ( $installer::globals::call_epm ) { 
installer::epmfile::call_epm($epmexecutable, $completeepmfilename, 
$packagename, $includepatharrayref); }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2019-01-22 Thread Libreoffice Gerrit user 
 solenv/bin/modules/installer/epmfile.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 546c42031b7fd06fcaa8ca835026c5495b369a67
Author: Jim Jagielski 
AuthorDate: Tue Jan 22 21:28:26 2019 +
Commit: Jim Jagielski 
CommitDate: Tue Jan 22 21:28:26 2019 +

don't be picky about format

diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index f5cdd055e3b4..731452443e03 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -846,7 +846,7 @@ sub set_patch_state
 while ()
 {
 chop;
-if ( $_ =~ /Patched for OpenOffice.org/ ) { 
$installer::globals::is_special_epm = 1; }
+if ( $_ =~ /Patched for .*OpenOffice/ ) { 
$installer::globals::is_special_epm = 1; }
 }
 
 close (EPMPATCH);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2018-06-07 Thread Matthias Seidel 
 solenv/bin/modules/installer/languagepack.pm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2b10a2545149db3b4e100b14c95d84719dadc647
Author: Matthias Seidel 
Date:   Thu Jun 7 14:02:10 2018 +

Fixed double wording, minor cleanup

diff --git a/solenv/bin/modules/installer/languagepack.pm 
b/solenv/bin/modules/installer/languagepack.pm
index 7dbd76ce581d..fff01f47735e 100644
--- a/solenv/bin/modules/installer/languagepack.pm
+++ b/solenv/bin/modules/installer/languagepack.pm
@@ -57,7 +57,7 @@ sub select_language_items
 # Files with style "LANGUAGEPACK" and "FORCELANGUAGEPACK" also 
have to be included into the language pack.
 # Files with style "LANGUAGEPACK" are only included into language 
packs.
 # Files with style "FORCELANGUAGEPACK" are included into language 
packs and non language packs. They are
-# forced, because otherwise they not not be included into 
languagepacks.
+# forced, because otherwise they will not be included into 
languagepacks.
 
 my $styles = "";
 if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
@@ -510,7 +510,7 @@ sub build_installer_for_languagepack
 if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not 
find script file $scriptfilename!", "build_installer_for_languagepack"); }
 my $scriptfile = installer::files::read_file($$scriptref);
 
-my $infoline = "Found  script file $scriptfilename: $$scriptref \n";
+my $infoline = "Found script file $scriptfilename: $$scriptref \n";
 $installer::logger::Lang->print($infoline);
 
 # find and read english license file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin svtools/source

2018-05-13 Thread Matthias Seidel 
 solenv/bin/modules/ExtensionsLst.pm |2 +-
 svtools/source/dialogs/addresstemplate.cxx  |2 +-
 svtools/source/filter/FilterConfigCache.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4828086a389647c04a5854b07587b229c9176269
Author: Matthias Seidel 
Date:   Sun May 13 19:38:57 2018 +

Fixed typos (successfull -> successful)

diff --git a/solenv/bin/modules/ExtensionsLst.pm 
b/solenv/bin/modules/ExtensionsLst.pm
index 7b4eaa4f7cf3..8754d8b2e1dc 100644
--- a/solenv/bin/modules/ExtensionsLst.pm
+++ b/solenv/bin/modules/ExtensionsLst.pm
@@ -483,7 +483,7 @@ sub Download (@)
 my $last_was_redirect = 0;
 my $response = $agent->get($URL);
 
-# When download was successfull then check the md5 checksum and rename 
the .part file
+# When download was successful then check the md5 checksum and rename 
the .part file
 # into the actual extension name.
 if ($response->is_success())
 {
diff --git a/svtools/source/dialogs/addresstemplate.cxx 
b/svtools/source/dialogs/addresstemplate.cxx
index 0b73ed8120fc..5771acb22122 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -834,7 +834,7 @@ void AssignmentPersistentData::Commit()
 
 WaitObject aWaitCursor(this);
 
-// no matter what we do here, we handled the currently selected data 
source (no matter if successfull or not)
+// no matter what we do here, we handled the currently selected data 
source (no matter if successful or not)
 m_aDatasource.SaveValue();
 
 // create an interaction handler (may be needed for connecting)
diff --git a/svtools/source/filter/FilterConfigCache.cxx 
b/svtools/source/filter/FilterConfigCache.cxx
index 08901ce113a8..d18d28902d55 100644
--- a/svtools/source/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter/FilterConfigCache.cxx
@@ -129,7 +129,7 @@ String 
FilterConfigCache::FilterConfigCacheEntry::GetShortName()
 specify, which config package should be opened.
 Must be one of the defined static values TYPEPKG or FILTERPKG.
 
-@return A valid object if open was successfull. The access on opened
+@return A valid object if open was successful. The access on opened
 data will be readonly. It returns NULL in case open failed.
 
 @throws It let pass RuntimeExceptions only.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2018-04-16 Thread Matthias Seidel 
 solenv/bin/modules/installer/download.pm |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit af8b9767feaa871e5edf6369ba35616b11736a3d
Author: Matthias Seidel 
Date:   Mon Apr 16 18:08:04 2018 +

Temporarily disable translation of NSIS for Arabic.

Minor cleanup and some German comments translated.

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index 7254677adee8..01ac9c717ea3 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -1177,7 +1177,7 @@ sub nsis_language_converter
 if ( $language eq "en-US" ) { $nsislanguage = "English"; }
 elsif ( $language eq "af" ) { $nsislanguage = "Afrikaans"; }
 elsif ( $language eq "sq" ) { $nsislanguage = "Albanian"; }
-elsif ( $language eq "ar" ) { $nsislanguage = "Arabic"; }
+#elsif ( $language eq "ar" ) { $nsislanguage = "Arabic"; } # Temporarily 
disabled (Malformed LO surrogate)
 elsif ( $language eq "hy" ) { $nsislanguage = "Armenian"; }
 elsif ( $language eq "ast" ) { $nsislanguage = "Asturian"; }
 elsif ( $language eq "eu" ) { $nsislanguage = "Basque"; }
@@ -1228,7 +1228,7 @@ sub nsis_language_converter
 elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
 elsif ( $language eq "zh-TW" ) { $nsislanguage = "TradChinese"; }
 elsif ( $language eq "tr" ) { $nsislanguage = "Turkish"; }
-#elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; } #temporarily 
disabled (problem in Ukrainian.nsh)
+#elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; } # 
Temporarily disabled (Problem in Ukrainian.nsh)
 elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
 elsif ( $language eq "cy" ) { $nsislanguage = "Welsh"; }
 else
@@ -1374,7 +1374,7 @@ sub get_language_string_from_language_block
 ##
 # Windows: Replacing strings in NSIS nsh file
 # nsh file syntax:
-# !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis auswählen"
+# !define MUI_TEXT_DIRECTORY_TITLE "Choose Install Location"
 ##
 
 sub replace_identifier_in_nshfile
@@ -1400,7 +1400,7 @@ sub replace_identifier_in_nshfile
 # Windows: Replacing strings in NSIS nlf file
 # nlf file syntax (2 lines):
 # # ^DirSubText
-# Zielverzeichnis
+# Destination Folder
 ##
 
 sub replace_identifier_in_nlffile
@@ -1771,8 +1771,7 @@ sub create_link_tree
 }
 
 ###
-# Setting supported platform for Sun OpenOffice.org
-# builds
+# Setting supported platform for OpenOffice builds
 ###
 
 sub is_supported_platform
@@ -1979,7 +1978,7 @@ sub create_download_link_tree
 my ($downloaddir, $languagestringref, $allvariableshashref) = @_;
 
 $installer::logger::Info->print("\n");
-
$installer::logger::Info->print("**\n");
 #
+
$installer::logger::Info->print("**\n");
 $installer::logger::Info->print("... creating download hard link ...\n");
 
$installer::logger::Info->print("**\n");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2018-04-14 Thread Matthias Seidel 
 solenv/bin/modules/installer/download.pm |2 +-
 solenv/bin/modules/installer/globals.pm  |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ec0762eeb02bde6b1be98907e5ad8f77e5b2fbdb
Author: Matthias Seidel 
Date:   Sat Apr 14 09:30:15 2018 +

#i74793#

Removed Ukrainian (uk) from "noMSLocaleLangs".
MSI for uk can be built without bundling en-US.

Temporarily disable translation of NSIS because of a problem in 
Ukrainian.nsh (NSIS 3.03).

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index 788e04d0621f..7254677adee8 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -1228,7 +1228,7 @@ sub nsis_language_converter
 elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
 elsif ( $language eq "zh-TW" ) { $nsislanguage = "TradChinese"; }
 elsif ( $language eq "tr" ) { $nsislanguage = "Turkish"; }
-elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; }
+#elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; } #temporarily 
disabled (problem in Ukrainian.nsh)
 elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
 elsif ( $language eq "cy" ) { $nsislanguage = "Welsh"; }
 else
diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index 83df6518a241..cd9826a4367b 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -69,7 +69,6 @@ BEGIN
 "eo",
 "ka",
 "ga",
-"uk",
 "gd",
 "my",
 "mai",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2018-02-17 Thread Damjan Jovanovic 
 solenv/bin/modules/installer/simplepackage.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf34497e91c553d6c8d6158630c392d8d4db00f1
Author: Damjan Jovanovic 
Date:   Sat Feb 17 08:22:00 2018 +

If LibreOffice is installed, it's incompatible "unopkg" tool will be in 
$PATH,

causing the build to break in main/instsetoo_native as that tool lacks our
"sync" option. Refer to our own unopkg using its absolute path to avoid this
problem.

Patch by: me

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index e6929192c91f..1c654005bb0f 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -123,7 +123,7 @@ sub register_extensions
 
 if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: 
$unopkgfile not found!", "register_extensions"); }
 
-my $systemcall = $unopkgfile . " sync --verbose" . " 
-env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |";
+my $systemcall = $programdir . $installer::globals::separator . 
$unopkgfile . " sync --verbose" . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 
|";
 
 $installer::logger::Info->printf("... %s ...\n", $systemcall);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2017-03-12 Thread Matthias Seidel 
 solenv/bin/modules/installer/patch/InstallationSet.pm |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 2bf0ec1ac35dec10af8b0beb52d9daac96e453f1
Author: Matthias Seidel 
Date:   Sun Mar 12 20:37:33 2017 +

Fixed typos

diff --git a/solenv/bin/modules/installer/patch/InstallationSet.pm 
b/solenv/bin/modules/installer/patch/InstallationSet.pm
index fecb94c..13b1f72 100644
--- a/solenv/bin/modules/installer/patch/InstallationSet.pm
+++ b/solenv/bin/modules/installer/patch/InstallationSet.pm
@@ -216,7 +216,7 @@ sub UnpackCab ($$$)
 ++$count;
 }
 
-# Cleanup.  Remove the temporary directory.  It should be empty by now.
+# Cleanup. Remove the temporary directory. It should be empty by now.
 rmdir($temporary_destination_path);
 }
 
@@ -227,9 +227,9 @@ sub UnpackCab ($$$)
 
 Unpack the flat file structure of the $cab_filename to $destination_path.
 
-In order to detect and handle an incomplete (arborted) previous
-extraction, the cab file is unpacked to a temprorary directory
-that after successful extraction is renamed to $destination_path.
+In order to detect and handle an incomplete (aborted) previous
+extraction, the cab file is unpacked to a temporary directory
+that, after successful extraction, is renamed to $destination_path.
 
 =cut
 sub UnpackCabFlat ($$$)
@@ -237,7 +237,7 @@ sub UnpackCabFlat ($$$)
 my ($cab_filename, $destination_path, $file_table) = @_;
 
 # Unpack the .cab file to a temporary path (note that
-# $destination_path may alreay bee a temporary path). Using a
+# $destination_path may already be a temporary path). Using a
 # second one prevents the lengthy flat unpacking to be repeated
 # when another step fails.
 
@@ -388,7 +388,7 @@ sub Download ($$$)
 my $digest = undef;
 if ( ! defined $checksum_value)
 {
-# No checksum available.  Skip test.
+# No checksum available. Skip test.
 }
 elsif ($checksum_type eq "sha256")
 {
@@ -592,7 +592,7 @@ sub ProvideUnpackedExe ($)
 
 if ($exe_is_unpacked)
 {
-# Yes, exe has already been unpacked.  There is nothing more to do.
+# Yes, exe has already been unpacked. There is nothing more to do.
 $installer::logger::Info->printf("downloadable installation set has 
already been unpacked to\n");
 $installer::logger::Info->printf("%s\n", $unpacked_exe_path);
 return 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2017-03-07 Thread Raphael Bircher 
 solenv/bin/cws  |   26 
 solenv/bin/cws.pl   | 2112 ---
 solenv/bin/cwsattach|   27 
 solenv/bin/cwsattach.pl |  216 
 solenv/bin/cwscreate|   26 
 solenv/bin/cwstestresult|   27 
 solenv/bin/cwstestresult.pl |  188 ---
 solenv/bin/cwstouched   |   26 
 solenv/bin/cwstouched.pl|  147 --
 solenv/bin/cwstouched.py|  106 -
 solenv/bin/modules/Cws.pm   | 2149 
 solenv/bin/modules/CwsConfig.pm |  537 -
 solenv/bin/modules/Eis.pm   |  216 
 13 files changed, 5803 deletions(-)

New commits:
commit 31a7e12058303b4e05bd9049e8fce766f7941862
Author: Raphael Bircher 
Date:   Tue Mar 7 22:29:07 2017 +

Remove some old stuff from SUN Time EIS/CWS

diff --git a/solenv/bin/cws b/solenv/bin/cws
deleted file mode 100755
index 975c992..000
--- a/solenv/bin/cws
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# *
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-# *
-if [ x${SOLARENV}x = xx ]; then
-echo No environment found, please use 'configure'
-exit 1
-fi
-exec perl -w $SOLARENV/bin/cws.pl "$@"
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
deleted file mode 100644
index 59e530b..000
--- a/solenv/bin/cws.pl
+++ /dev/null
@@ -1,2112 +0,0 @@
-#!/usr/bin/perl -w
-#**
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-#**
-
-
-
-#*
-#
-# cws.pl   - wrap common childworkspace operations
-#
-use strict;
-use Getopt::Long;
-use File::Basename;
-use File::Path;
-use File::Copy;
-use Cwd;
-use Benchmark;
-
- module lookup
-my @lib_dirs;
-BEGIN {
-if ( !defined($ENV{SOLARENV}) ) {
-die "No environment found (environment variable SOLARENV is 
undefined)";
-}
-push(@lib_dirs, "$ENV{SOLARENV}/bin/modules");
-}
-use lib (@lib_dirs);
-
-use Cws;
-
- script id #
-
-( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-
- globals 
-
-# TODO: replace dummy vales with actual source_config migration milestone
-my $ooo320_source_config_milestone = 'm999';
-
-# valid command with possible abbreviations
-my @valid_commands = (
-'help', 'h', '?',
-'create',
-'fetch',  'f',
-'query', 'q',
-'task', 't',
-'eisclone',
-'setcurrent'
- );
-
-# list the valid options to each command
-my %valid_options_hash = (
-'help'   => ['help'],
-'create' => ['help', 'milestone', 'migration', 
'hg'],
-'fetch'  => ['help', 'milestone', 
'childworkspace','platforms','noautocommon',
-'quiet', 'onlysolver', 
'additionalrepositories'],
-'query'  => ['help', 
'milestone','masterworkspace','childworkspace'],
-'task'   => ['help'],
-'setcurrent' => ['help',

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2016-07-28 Thread Damjan Jovanovic 
 solenv/bin/download_external_dependencies.pl |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ad3e8774955aa8779ed5c4afbd5903f40e2d9c84
Author: Damjan Jovanovic 
Date:   Thu Jul 28 04:38:47 2016 +

Perl returns the exit code of a subprocess shifted right by 8 bits.

Shift it left before use.

Patch by: me

diff --git a/solenv/bin/download_external_dependencies.pl 
b/solenv/bin/download_external_dependencies.pl
index 3990e34..ddef6dd 100755
--- a/solenv/bin/download_external_dependencies.pl
+++ b/solenv/bin/download_external_dependencies.pl
@@ -534,17 +534,18 @@ sub DownloadFile ($$$)
 $URL);
 }
 
-if ($? == 0)
+my $rc = $? >> 8;
+if ($rc == 0)
 {
 return 1;
 }
-elsif ($? == 1)
+elsif ($rc == 1)
 {
 return 0;
 }
 else
 {
-exit $?;
+exit $rc;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2016-06-05 Thread Damjan Jovanovic 
 solenv/bin/modules/installer/systemactions.pm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6efa10d535351216e97c3a736a17ea9f597482b5
Author: Damjan Jovanovic 
Date:   Sun Jun 5 09:40:50 2016 +

#i126736#: fix typo in systemactions.pm

Remove stray backslashes in warning messages in systemactions.pm which
cause warnings.

Patch by: j.nitsc...@ok.de
Reviewed by: me

diff --git a/solenv/bin/modules/installer/systemactions.pm 
b/solenv/bin/modules/installer/systemactions.pm
index d857ba7..181ac8b 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -91,7 +91,7 @@ sub create_directory
 }
 else
 {
-$infoline = "\Error: \"$directory\" could not be 
created. Even the parent directory \"$parentdir\" does not exist and could not 
be created.\n";
+$infoline = "Error: \"$directory\" could not be 
created. Even the parent directory \"$parentdir\" does not exist and could not 
be created.\n";
 $installer::logger::Lang->print($infoline);
 if ( -d $parentdir )
 {
@@ -211,7 +211,7 @@ sub create_directory_with_privileges
 }
 else
 {
-$infoline = "\Error: \"$directory\" could not be 
created. Even the parent directory \"$parentdir\" does not exist and could not 
be created.\n";
+$infoline = "Error: \"$directory\" could not be 
created. Even the parent directory \"$parentdir\" does not exist and could not 
be created.\n";
 $installer::logger::Lang->print($infoline);
 if ( -d $parentdir )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2016-02-19 Thread Damjan Jovanovic 
 solenv/bin/download_external_dependencies.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9825e795eca5a633a169e8e8511b9215be102762
Author: Damjan Jovanovic 
Date:   Fri Feb 19 22:58:06 2016 +

Log the HTTP status when a download in ./bootstrap fails.

Patch by: me

diff --git a/solenv/bin/download_external_dependencies.pl 
b/solenv/bin/download_external_dependencies.pl
index 5cc5a25..9db822b 100755
--- a/solenv/bin/download_external_dependencies.pl
+++ b/solenv/bin/download_external_dependencies.pl
@@ -551,7 +551,7 @@ sub DownloadFile ($$$)
 }
 else
 {
-print "download from $URL failed\n";
+print "download from $URL failed (" . $response->status_line . ")\n";
 }
 close($out);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2016-01-09 Thread Andrea Pescetti 
 solenv/bin/download_external_dependencies.pl |   55 ---
 1 file changed, 9 insertions(+), 46 deletions(-)

New commits:
commit 1f39c0bdcd0dd917e91bd8133010749543910337
Author: Andrea Pescetti 
Date:   Sat Jan 9 17:43:42 2016 +

#i126469# Fix failing checksums at first download attempt in ./bootstrap

Patch By: j.nitschke 

diff --git a/solenv/bin/download_external_dependencies.pl 
b/solenv/bin/download_external_dependencies.pl
index a33cab3..278e0937 100755
--- a/solenv/bin/download_external_dependencies.pl
+++ b/solenv/bin/download_external_dependencies.pl
@@ -85,15 +85,7 @@ use File::Basename;
 use Digest::MD5;
 use Digest::SHA;
 use URI;
-my $simple = 1;
-if ($simple)
-{
-use LWP::Simple;
-}
-else
-{
-use LWP::UserAgent;
-}
+use LWP::UserAgent;
 
 my $Debug = 1;
 
@@ -538,54 +530,25 @@ sub DownloadFile ($$$)
 
 # Download the extension.
 my $success = 0;
-if ($simple)
-{
-my $content = LWP::Simple::get($URL);
-$success = defined $content;
+
+my $agent = LWP::UserAgent->new();
+$agent->env_proxy;
+my $response = $agent->get($URL);
+
+$success = $response->is_success;
 if ($success)
 {
+my $content = $response->content;
 open $out, ">$temporary_filename";
 binmode($out);
 print $out $content;
-close($out);
 $digest->add($content);
 }
 else
 {
 print "download from $URL failed\n";
 }
-}
-else
-{
-my $agent = LWP::UserAgent->new();
-$agent->timeout(120);
-$agent->env_proxy;
-$agent->show_progress(1);
-my $last_was_redirect = 0;
-$agent->add_handler('response_redirect'
-=> sub{
-$last_was_redirect = 1;
-return;
-});
-$agent->add_handler('response_data'
-=> sub{
-if ($last_was_redirect)
-{
-$last_was_redirect = 0;
-# Throw away the data we got so far.
-$digest->reset();
-close $out;
-open $out, ">$temporary_filename";
-binmode($out);
-}
-my($response,$agent,$h,$data)=@_;
-print $out $data;
-$digest->add($data);
-});
-
-$success = $agent->get($URL)->is_success();
-close $out;
-}
+close($out);
 
 # When download was successful then check the checksum and rename the 
.part file
 # into the actual extension name.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2014-04-24 Thread Jürgen Schmidt 
 solenv/bin/srcrelease.xml |   24 +---
 1 file changed, 5 insertions(+), 19 deletions(-)

New commits:
commit e86dd7e54715bf3a6a4df32431ec1d4ed5bc870a
Author: Jürgen Schmidt j...@apache.org
Date:   Thu Apr 24 07:26:51 2014 +

drop tar.gz src release

diff --git a/solenv/bin/srcrelease.xml b/solenv/bin/srcrelease.xml
index 0049952..5a05488 100644
--- a/solenv/bin/srcrelease.xml
+++ b/solenv/bin/srcrelease.xml
@@ -27,7 +27,7 @@
   property name=out.dir value=./
   property name=aoo.name value=apache-openoffice/
   property name=aoo.short.name value=aoo/
-  property name=aoo.ver value=4.1.0/
+  property name=aoo.ver value=4.2.0/
 
   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/
@@ -46,8 +46,6 @@
 property name=release.name value=${aoo.name}-${aoo.ver}/
 property name=release.file.name 
value=${release.name}-r${scm.revision}-src/
 property name=release.zip value=${out.dir}/${release.file.name}.zip/
-property name=release.tar value=${out.dir}/${release.file.name}.tar/
-property name=release.tar.gz 
value=${out.dir}/${release.file.name}.tar.gz/
 property name=release.tar.bz2 
value=${out.dir}/${release.file.name}.tar.bz2/
   /target
 
@@ -79,9 +77,9 @@
 echo level=verbose message=   ... DONE/
   /target
 
-  target name=source.tar depends=declarenames
-echo level=verbose message=### creating intermediate ${release.tar} 
.../
-tar destfile=${release.tar} longfile=gnu
+  target name=source.tar.bz2 depends=declarenames
+echo level=verbose message=### creating ${release.tar.bz2} .../
+tar destfile=${release.tar.bz2} compression=bzip2 longfile=gnu
   tarfileset file=main/NOTICE fullpath=${release.dir.name}/NOTICE/
   tarfileset file=main/LICENSE fullpath=${release.dir.name}/LICENSE/
   tarfileset file=main/README fullpath=${release.dir.name}/README/
@@ -95,19 +93,7 @@
 echo level=verbose message=   ... DONE/
   /target
 
-  target name=source.tar.gz depends=source.tar
-echo level=verbose message=### creating ${release.tar.gz} .../
-gzip destfile=${release.tar.gz} src=${release.tar}/
-echo level=verbose message=   ... DONE/
-  /target
-
-  target name=source.tar.bz2 depends=source.tar
-echo level=verbose message=### creating ${release.tar.bz2} .../
-bzip2 destfile=${release.tar.bz2} src=${release.tar}/
-echo level=verbose message=   ... DONE/
-  /target
-
-  target name=pack depends=clean,source.zip,source.tar.gz,source.tar.bz2
+  target name=pack depends=clean,source.zip,source.tar.bz2
 echo level=info message=### Create source release files for Apache 
OpenOffice ${aoo.ver} .../
   /target
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2014-01-27 Thread Herbert Dürr 
 solenv/bin/modules/installer/parameter.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21e12229257ecf0aa191e0fdd2ce28dfe1fc06f3
Author: Herbert Dürr h...@apache.org
Date:   Mon Jan 27 13:07:58 2014 +

#i122301# enable ismacbuild flag for all mac builds

diff --git a/solenv/bin/modules/installer/parameter.pm 
b/solenv/bin/modules/installer/parameter.pm
index 478362e..62e0bee 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -285,7 +285,7 @@ sub setglobalvariables
 }
 }
 
-if (( $installer::globals::compiler =~ /unxmacxi/ ) || ( 
$installer::globals::compiler =~ /unxmacxp/ ))
+if( $installer::globals::compiler =~ /unxmac/ )
 {
 $installer::globals::ismacbuild = 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' - solenv/bin

2013-12-13 Thread Andre Fischer 
 solenv/bin/modules/installer/download.pm |   78 +--
 1 file changed, 44 insertions(+), 34 deletions(-)

New commits:
commit 80830a5bcbfd006c72cfcb57ce6bca0758db76b9
Author: Andre Fischer a...@apache.org
Date:   Fri Dec 13 12:02:58 2013 +

123531: Cleanup: use strict, no hard-coded values.

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index 8c540fa..de73339 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -32,6 +32,8 @@ use installer::pathanalyzer;
 use installer::remover;
 use installer::systemactions;
 
+use strict;
+
 BEGIN { # This is needed so that cygwin's perl evaluates ACLs
 # (needed for correctly evaluating the -x test.)
 if( $^O =~ /cygwin/i ) {
@@ -157,7 +159,7 @@ sub call_md5sum
 {
 my ($filename) = @_;
 
-$md5sumfile = /usr/bin/md5sum;
+my $md5sumfile = /usr/bin/md5sum;
 
 if ( ! -f $md5sumfile ) { installer::exiter::exit_program(ERROR: No file 
/usr/bin/md5sum, call_md5sum); }
 
@@ -191,7 +193,7 @@ sub call_md5sum
 
 sub get_md5sum
 {
-($md5sumoutput) = @_;
+my ($md5sumoutput) = @_;
 
 my $md5sum;
 
@@ -357,7 +359,7 @@ sub create_tar_gz_file_from_package
 }
 
 $alldirs = installer::systemactions::get_all_directories($installdir);
-$packagename = ${$alldirs}[0]; # only taking the first Solaris package
+my $packagename = ${$alldirs}[0]; # only taking the first Solaris package
 if ( $packagename eq  ) { installer::exiter::exit_program(ERROR: Could 
not find package in directory $installdir!, determine_packagename); }
 
 
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$packagename);
@@ -368,8 +370,8 @@ sub create_tar_gz_file_from_package
 my $ldpreloadstring = ;
 if ( $getuidlibrary ne  ) { $ldpreloadstring = LD_PRELOAD= . 
$getuidlibrary; }
 
-$systemcall = cd $installdir; $ldpreloadstring tar -cf - $packagename | 
gzip  $targzname;
-print ... $systemcall ...\n;
+my $systemcall = cd $installdir; $ldpreloadstring tar -cf - $packagename 
| gzip  $targzname;
+$installer::logger::Info-printf(... %s ...\n, $systemcall);
 
 my $returnvalue = system($systemcall);
 
@@ -799,7 +801,7 @@ sub create_tar_gz_file_from_directory
 $installer::globals::downloadfilename = $downloadfilename . 
$installer::globals::downloadfileextension;
 my $targzname = $downloaddir . $installer::globals::separator . 
$installer::globals::downloadfilename;
 
-$systemcall = cd $changedir; $ldpreloadstring tar -cf - $packdir | gzip  
$targzname;
+my $systemcall = cd $changedir; $ldpreloadstring tar -cf - $packdir | 
gzip  $targzname;
 
 my $returnvalue = system($systemcall);
 
@@ -827,16 +829,13 @@ sub resolve_variables_in_downloadname
 
 # Typical name: soa-{productversion}-{extension}-bin-{os}-{languages}
 
-my $productversion = ;
-if ( $allvariables-{'PRODUCTVERSION'} ) { $productversion = 
$allvariables-{'PRODUCTVERSION'}; }
+my $productversion = $allvariables-{'PRODUCTVERSION'} // ;
 $downloadname =~ s/\{productversion\}/$productversion/;
 
-my $ppackageversion = ;
-if ( $allvariables-{'PACKAGEVERSION'} ) { $packageversion = 
$allvariables-{'PACKAGEVERSION'}; }
+my $packageversion = $allvariables-{'PACKAGEVERSION'} // ;
 $downloadname =~ s/\{packageversion\}/$packageversion/;
 
-my $extension = ;
-if ( $allvariables-{'SHORT_PRODUCTEXTENSION'} ) { $extension = 
$allvariables-{'SHORT_PRODUCTEXTENSION'}; }
+my $extension = $allvariables-{'SHORT_PRODUCTEXTENSION'} // ;
 $extension = lc($extension);
 $downloadname =~ s/\{extension\}/$extension/;
 
@@ -1046,11 +1045,11 @@ sub put_setup_ico_into_template
 # Windows: Including the publisher into nsi template
 ##
 
-sub put_publisher_into_template
+sub put_publisher_into_template ($$)
 {
-my ($templatefile) = @_;
+my ($templatefile, $variables) = @_;
 
-my $publisher = Sun Microsystems, Inc.;
+my $publisher = $variables-{'OOOVENDOR'} // ;
 
 replace_one_variable($templatefile, PUBLISHERPLACEHOLDER, $publisher);
 }
@@ -1059,11 +1058,11 @@ sub put_publisher_into_template
 # Windows: Including the web site into nsi template
 ##
 
-sub put_website_into_template
+sub put_website_into_template ($$)
 {
-my ($templatefile) = @_;
+my ($templatefile, $variables) = @_;
 
-my $website = http\:\/\/www\.openoffice\.org;
+my $website = $variables-{'STARTCENTER_INFO_URL'} // ;
 
 replace_one_variable($templatefile, WEBSITEPLACEHOLDER, $website);
 }
@@ -1506,7 +1505,8 @@ sub convert_utf16_to_utf8
 #   open( IN, :utf16, $filename ) || 
installer::exiter::exit_program(ERROR: Cannot open file $filename for 
reading, convert_utf16_to_utf8);
 #   open( IN, :para:crlf:uni, $filename ) ||

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2013-11-14 Thread Andre Fischer 
 solenv/bin/make_installer.pl|   10 ++---
 solenv/bin/modules/installer/control.pm |2 -
 solenv/bin/modules/installer/globals.pm |2 -
 solenv/bin/modules/installer/languages.pm   |   47 ++--
 solenv/bin/modules/installer/parameter.pm   |3 -
 solenv/bin/modules/installer/scriptitems.pm |   14 +++-
 6 files changed, 45 insertions(+), 33 deletions(-)

New commits:
commit 44de3926bd631b005ec20b57a576bbee43d7d62a
Author: Andre Fischer a...@apache.org
Date:   Thu Nov 14 14:03:43 2013 +

123686: Removed support for building multiple languages in one run.

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 0837e56..7258912 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -612,10 +612,11 @@ if ( $installer::globals::debug ) { 
installer::logger::savedebug($installer::glo
 
 if ( $installer::globals::debug ) { installer::logger::debuginfo(\nPart 1b: 
The language dependent part\n); }
 
-
-for ( my $n = 0; $n = $#installer::globals::languageproducts; $n++ )
+# Run the following code block exactly once.
+# This strange version of a do{}while(false) loop exists only to allow 
(legacy) next statements.
+for (;1;last)
 {
-my $languagesarrayref = 
installer::languages::get_all_languages_for_one_product($installer::globals::languageproducts[$n],
 $allvariableshashref);
+my $languagesarrayref = 
installer::languages::get_all_languages_for_one_product($installer::globals::languageproduct,
 $allvariableshashref);
 if ( $installer::globals::globallogging ) { 
installer::files::save_file($loggingdir . languages.log ,$languagesarrayref); 
}
 
 $installer::globals::alllanguagesinproductarrayref = $languagesarrayref;
@@ -2259,8 +2260,7 @@ for ( my $n = 0; $n = 
$#installer::globals::languageproducts; $n++ )
 # saving file_info file for later analysis
 my $speciallogfilename = fileinfo_ . $installer::globals::product . 
\.log;
 installer::files::save_array_of_hashes($loggingdir . $speciallogfilename, 
$filesinproductlanguageresolvedarrayref);
-
-}   # end of iteration for one language group
+}
 
 # saving debug info at end
 if ( $installer::globals::debug ) { 
installer::logger::savedebug($installer::globals::exitlog); }
diff --git a/solenv/bin/modules/installer/control.pm 
b/solenv/bin/modules/installer/control.pm
index a188073..51edf8d 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -497,7 +497,7 @@ sub check_updatepack
 
 # try to write into $shipdrive
 
-my $directory = $installer::globals::product . _ . 
$installer::globals::compiler . _ . $installer::globals::buildid . _ . 
$installer::globals::languageproducts[0] . _test_$$;
+my $directory = $installer::globals::product . _ . 
$installer::globals::compiler . _ . $installer::globals::buildid . _ . 
$installer::globals::languageproduct . _test_$$;
 $directory =~ s/\,/\_/g;# for the list of languages
 $directory =~ s/\-/\_/g;# for en-US, pt-BR, ...
 $directory = $shipdrive . $installer::globals::separator . 
$directory;
diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index e545da8..de3887e 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -113,7 +113,7 @@ BEGIN
 
 $required_dotnet_version = 2.0.0.0;
 $productextension = ;
-@languageproducts = ();
+$languageproduct = undef;
 $build = ;
 $minor = ;
 $lastminor = ;
diff --git a/solenv/bin/modules/installer/languages.pm 
b/solenv/bin/modules/installer/languages.pm
index d184ff7..030956d 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -30,31 +30,46 @@ use installer::globals;
 use installer::remover;
 use installer::ziplist;
 
-#
-# Analyzing the laguage list parameter and language list from zip list file
-#
+=head2 analyze_languagelist()
 
-sub analyze_languagelist
-{
-my $first = $installer::globals::languagelist;
+Convert $installer::globals::languagelist into 
$installer::globals::languageproduct.
+
+That is now just a replacement of '_' with ','.
+
+$installer::globals::languageproduct (specified by the -l option
+on the command line) can contain multiple languages separated by
+'_' to specify multilingual builds.
 
-$first =~ s/\_/\,/g;# substituting _ by ,, in case of dmake 
definition 01_49
+Separation by '#' to build multiple languages (single or
+multilingual) in one make_installer.pl run is not supported
+anymore.  Call make_installer.pl with all languages separately instead:
+make_installer.pl -l L1#L2
+

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2013-11-12 Thread Andre Fischer 
 solenv/bin/modules/installer/globals.pm   |1 
 solenv/bin/modules/installer/windows/media.pm |   37 --
 solenv/bin/modules/installer/windows/msiglobal.pm |4 +-
 3 files changed, 2 insertions(+), 40 deletions(-)

New commits:
commit 41e4096dd00c29aff7dbbac2ab0fad38bc3509bc
Author: Andre Fischer a...@apache.org
Date:   Tue Nov 12 12:04:47 2013 +

123678: Removed ::globals::one_cab_file

diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index f4dcd0f..c5909db 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -420,7 +420,6 @@ BEGIN
 
 $one_cab_file = 0;
 $fix_number_of_cab_files = 1;
-$cab_file_per_component = 0;
 $cabfilecompressionlevel = 2;
 $number_of_cabfiles = 1;# only for $fix_number_of_cab_files = 1
 $include_cab_in_msi = 0;
diff --git a/solenv/bin/modules/installer/windows/media.pm 
b/solenv/bin/modules/installer/windows/media.pm
index 0dc57b3..bebacd4 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -304,43 +304,6 @@ sub create_media_table
 }
 
 }
-elsif ( $installer::globals::cab_file_per_component )
-{
-for ( my $i = 0; $i = $#{$filesref}; $i++ )
-{
-my $onefile = ${$filesref}[$i];
-my $nextfile = ${$filesref}[$i+1];
-
-my $filecomponent = ;
-my $nextcomponent = ;
-
-if ( $onefile-{'componentname'} ) { $filecomponent = 
$onefile-{'componentname'}; }
-if ( $nextfile-{'componentname'} ) { $nextcomponent = 
$nextfile-{'componentname'}; }
-
-if ( $filecomponent eq $nextcomponent )
-{
-next;   # nothing to do, this is not the last file of a 
component
-}
-
-my %media = ();
-$diskid++;
-
-$media{'DiskId'} = get_media_diskid($diskid);
-$media{'LastSequence'} = get_media_lastsequence($onefile);
-$media{'DiskPrompt'} = get_media_diskprompt();
-$media{'Cabinet'} = get_media_cabinet($diskid);
-$media{'VolumeLabel'} = get_media_volumelabel();
-$media{'Source'} = get_media_source();
-
-my $oneline = $media{'DiskId'} . \t . $media{'LastSequence'} . 
\t . $media{'DiskPrompt'} . \t
-. $media{'Cabinet'} . \t . $media{'VolumeLabel'} . \t 
. $media{'Source'} . \n;
-
-push(@mediatable, $oneline);
-
-$media{'Cabinet'} =~ s/^\s*\#//;# removing leading hash
-
set_cabinetfilename_for_component_in_file_collector($media{'Cabinet'}, 
$filesref, $filecomponent, $i);
-}
-}
 elsif ( $installer::globals::fix_number_of_cab_files )
 {
 # number of cabfiles
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 2434293..e6a1d26 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -259,7 +259,7 @@ sub generate_cab_file_list
 push(@installer::globals::allddffiles, $ddffilename);
 }
 }
-elsif ((( $installer::globals::cab_file_per_component ) || ( 
$installer::globals::fix_number_of_cab_files ))  ( 
$installer::globals::updatedatabase ))
+elsif (( $installer::globals::fix_number_of_cab_files )  ( 
$installer::globals::updatedatabase ))
 {
 my $sequenceorder = get_sequenceorder($filesref);
 
@@ -352,7 +352,7 @@ sub generate_cab_file_list
 push(@installer::globals::allddffiles, $ddffilename);
 }
 }
-elsif (( $installer::globals::cab_file_per_component ) || ( 
$installer::globals::fix_number_of_cab_files ))
+elsif ( $installer::globals::fix_number_of_cab_files )
 {
 for ( my $i = 0; $i = $#{$filesref}; $i++ )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2013-11-07 Thread Andre Fischer 
 solenv/bin/modules/installer/epmfile.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a75055eb48ce419ab4bbbd4c975c54b3af09784a
Author: Andre Fischer a...@apache.org
Date:   Thu Nov 7 14:38:12 2013 +

123595: RPM output lines need no printf

diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index e877595..38cff5d 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2312,7 +2312,7 @@ sub log_rpm_info
 
 $infoline = $rpmout\n;
 $infoline =~ s/error/e_r_r_o_r/gi;  # avoiding log problems
-$installer::logger::Lang-printf($infoline);
+$installer::logger::Lang-print($infoline);
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2013-06-07 Thread Ariel Constenla-Haile 
 solenv/bin/modules/installer/control.pm |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3ad9bb02f84c05964f73ffe08495c3140ac2151e
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat Jun 8 01:46:14 2013 +

Fix build breaker

The log file is checked for the word error at the end of the packaging
process, this breaks the build when the word is part of a file name,
like boost error.hpp/error.ipp headers.

diff --git a/solenv/bin/modules/installer/control.pm 
b/solenv/bin/modules/installer/control.pm
index 3648aff..bad8c98 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -347,6 +347,9 @@ sub check_logfile
 $compareline =~ s/Error\.ulf//g;# removing all occurences of 
Error.ulf
 $compareline =~ s/Error\.idl//g;# removing all occurences of 
Error.idl
 $compareline =~ s/Error\.html//g;   # removing all occurences of 
Error.html
+# Ugly workaround for (boost) headers
+$compareline =~ s/error\.hpp//g;# removing all occurences of 
error.hpp
+$compareline =~ s/error\.ipp//g;# removing all occurences of 
error.ipp
 
 if ( $compareline =~ /\bError\b/i )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

2013-05-04 Thread Andrea Pescetti 
 solenv/bin/download_external_dependencies.pl |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 365ff9c02db80644372043d85d8e1c7e2ffe94de
Author: Andrea Pescetti pesce...@apache.org
Date:   Sat May 4 22:15:24 2013 +

Reorder parameters to get a more meaningful output - likely the intended 
one.

diff --git a/solenv/bin/download_external_dependencies.pl 
b/solenv/bin/download_external_dependencies.pl
index 070340f..855f430 100755
--- a/solenv/bin/download_external_dependencies.pl
+++ b/solenv/bin/download_external_dependencies.pl
@@ -602,9 +602,9 @@ sub DownloadFile ($$$)
 {
 unlink($temporary_filename);
 printf(%s checksum does not match (%s instead of %s)\n,
+   $checksum-{'type'},
$file_checksum,
-   $checksum-{'value'},
-   $checksum-{'type'});
+   $checksum-{'value'});
 return 0;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits