You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2019/01/24 14:18:32 UTC
svn commit: r1852028 - in /openoffice/branches/AOO42X: ./
main/solenv/bin/modules/installer/strip.pm
Author: jim
Date: Thu Jan 24 14:18:32 2019
New Revision: 1852028
URL: http://svn.apache.org/viewvc?rev=1852028&view=rev
Log:
Merge r1852010 from trunk:
Removed whitespace
Submitted by: mseidel
Reviewed by: jim
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/solenv/bin/modules/installer/strip.pm
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 24 14:18:32 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851813,1852008
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851813,1852008,1852010
Modified: openoffice/branches/AOO42X/main/solenv/bin/modules/installer/strip.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/bin/modules/installer/strip.pm?rev=1852028&r1=1852027&r2=1852028&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/bin/modules/installer/strip.pm (original)
+++ openoffice/branches/AOO42X/main/solenv/bin/modules/installer/strip.pm Thu Jan 24 14:18:32 2019
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# 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
@@ -7,16 +7,16 @@
# 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.
-#
+#
#**************************************************************
@@ -37,9 +37,9 @@ use installer::systemactions;
sub need_to_strip
{
my ( $filename ) = @_;
-
+
my $strip = 0;
-
+
# Check using the "file" command
open (FILE, "file $filename |");
@@ -48,7 +48,7 @@ sub need_to_strip
if (( $fileoutput =~ /not stripped/i ) && ( $fileoutput =~ /\bELF\b/ )) { $strip = 1; }
- return $strip
+ return $strip
}
#####################################################################
@@ -58,14 +58,14 @@ sub need_to_strip
sub do_strip
{
my ( $filename ) = @_;
-
+
my $systemcall = "strip" . " " . $filename;
-
+
my $returnvalue = system($systemcall);
my $infoline = "Systemcall: $systemcall\n";
$installer::logger::Lang->print($infoline);
-
+
if ($returnvalue)
{
$infoline = "ERROR: Could not strip $filename!\n";
@@ -79,7 +79,7 @@ sub do_strip
}
#####################################################################
-# Resolving all variables in the packagename.
+# Resolving all variables in the packagename
#####################################################################
sub strip_libraries
@@ -92,7 +92,7 @@ sub strip_libraries
if (! installer::existence::exists_in_array($strippeddirbase, \@installer::globals::removedirs))
{
- push(@installer::globals::removedirs, $strippeddirbase);
+ push(@installer::globals::removedirs, $strippeddirbase);
}
for ( my $i = 0; $i <= $#{$filelist}; $i++ )
@@ -103,20 +103,20 @@ sub strip_libraries
{
my $shortfilename = $sourcefilename;
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortfilename);
-
+
$infoline = "Strip: $shortfilename\n";
$installer::logger::Lang->print($infoline);
# copy file into directory for stripped libraries
my $onelanguage = ${$filelist}[$i]->{'specificlanguage'};
-
+
# files without language into directory "00"
-
+
if ($onelanguage eq "") { $onelanguage = "00"; }
-
+
my $strippeddir = $strippeddirbase . $installer::globals::separator . $onelanguage;
- installer::systemactions::create_directory($strippeddir); # creating language specific subdirectories
+ installer::systemactions::create_directory($strippeddir); # creating language specific subdirectories
my $destfilename = $strippeddir . $installer::globals::separator . $shortfilename;
installer::systemactions::copy_one_file($sourcefilename, $destfilename);
@@ -126,7 +126,7 @@ sub strip_libraries
${$filelist}[$i]->{'sourcepath'} = $destfilename;
# strip file
-
+
do_strip($destfilename);
}
}