[Libreoffice-commits] core.git: solenv/bin
Andras Timar
atimar at suse.com
Thu Feb 28 05:30:48 PST 2013
solenv/bin/modules/installer.pm | 15 -
solenv/bin/modules/installer/scppatchsoname.pm | 204 -------------------------
2 files changed, 1 insertion(+), 218 deletions(-)
New commits:
commit 6aabf38ed7dc7fbf2be26fdf909fb47dcdb7e44d
Author: Andras Timar <atimar at suse.com>
Date: Thu Feb 28 14:25:31 2013 +0100
remove code that handled the recently obsoleted PATCH_SO_NAME flag
Change-Id: I34b99883711b41b8038d1229f00bc670582d6398
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 94e3791..fdf9370 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -50,7 +50,6 @@ use installer::packagelist;
use installer::parameter;
use installer::pathanalyzer;
use installer::profiles;
-use installer::scppatchsoname;
use installer::scpzipfiles;
use installer::scriptitems;
use installer::setupscript;
@@ -634,16 +633,6 @@ sub run {
installer::scpzipfiles::resolving_scpzip_replace_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, "File", $languagestringref);
#####################################
- # Files with flag PATCH_SO_NAME
- #####################################
-
- installer::logger::print_message( "... analyzing files with flag PATCH_SO_NAME ...\n" );
-
- # Editing files with flag PATCH_SO_NAME.
-
- installer::scppatchsoname::resolving_patchsoname_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, "File", $languagestringref);
-
- #####################################
# Files with flag HIDDEN
#####################################
@@ -678,12 +667,10 @@ sub run {
installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($scpactionsinproductlanguageresolvedarrayref, $includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref, "ScpActions");
- # Editing scpactions with flag SCPZIP_REPLACE and PATCH_SO_NAME.
+ # Editing scpactions with flag SCPZIP_REPLACE.
installer::scpzipfiles::resolving_scpzip_replace_flag($scpactionsinproductlanguageresolvedarrayref, $allvariableshashref, "ScpAction", $languagestringref);
- installer::scppatchsoname::resolving_patchsoname_flag($scpactionsinproductlanguageresolvedarrayref, $allvariableshashref, "ScpAction", $languagestringref);
-
#########################################################
# language dependent links part
#########################################################
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm
deleted file mode 100644
index 80aea6f..0000000
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ /dev/null
@@ -1,204 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-package installer::scppatchsoname;
-
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::setupscript;
-use installer::systemactions;
-
-########################################################################################
-# The length of the new string must be identical with the length of the old string
-########################################################################################
-
-sub change_length_of_string
-{
- my ($newstringref, $oldstring) = @_;
-
- while ( length($$newstringref) < length($oldstring) )
- {
- $$newstringref = $$newstringref . chr(0);
- }
-}
-
-########################################################################################
-# The length of the new string must be identical with the length of the old string
-########################################################################################
-
-sub change_length_of_string_with_letter
-{
- my ($newstringref, $oldstring, $onestring) = @_;
-
- while ( length($$newstringref) < length($oldstring) )
- {
- $$newstringref = $$newstringref . $onestring;
- }
-}
-
-########################################################################################
-# Converting a string to a unicode string
-########################################################################################
-
-sub convert_to_unicode
-{
- my ($string) = @_;
-
- my $unicodestring = "";
-
- my $stringlength = length($string);
-
- for ( my $i = 0; $i < $stringlength; $i++ )
- {
- $unicodestring = $unicodestring . substr($string, $i, 1);
- $unicodestring = $unicodestring . chr(0);
- }
-
- return $unicodestring;
-}
-
-########################################################################################
-# Replacing the so name in all files with flag PATCH_SO_NAME
-########################################################################################
-
-sub replace_productname_in_file
-{
- my ($sourcepath, $destpath, $variableshashref, $onefilehash, $styles) = @_;
-
- my $onefile = installer::files::read_binary_file($sourcepath);
-
- # searching for "x"
-
- my $onestring = "x" . chr(0);
- my $replacestring = "";
- for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; }
-
- my $productname = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'};
- if ( exists($onefilehash->{'FileDescription'}) ) { $productname = $onefilehash->{'FileDescription'}; }
- my $unicode_productname = convert_to_unicode($productname);
-
- change_length_of_string(\$unicode_productname, $replacestring);
-
- my $found1 = $onefile =~ s/$replacestring/$unicode_productname/sg;
-
- my $found2 = 0;
-
- if ( $styles =~ /\bPATCH_SO_NAME_Z\b/ )
- {
- # searching for "z"
-
- $onestring = "z" . chr(0);
- $replacestring = "";
- for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; }
-
- my $productname2 = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'};
- if ( exists($onefilehash->{'FileDescriptionZ'}) ) { $productname2 = $onefilehash->{'FileDescriptionZ'}; }
- my $unicode_productname2 = convert_to_unicode($productname2);
-
- change_length_of_string_with_letter(\$unicode_productname2, $replacestring, $onestring);
-
- $found2 = $onefile =~ s/$replacestring/$unicode_productname2/sg;
- }
-
- installer::files::save_binary_file($onefile, $destpath);
-
- my $found = $found1 + $found2;
-
- return $found;
-}
-
-#########################################################
-# Analyzing files with flag PATCH_SO_NAME
-#########################################################
-
-sub resolving_patchsoname_flag
-{
- my ($filesarrayref, $variableshashref, $item, $languagestringref) = @_;
-
- my $diritem = lc($item);
-
- my $replacedirbase = installer::systemactions::create_directories("patchsoname_$diritem", $languagestringref);
-
- installer::logger::include_header_into_logfile("$item with flag PATCH_SO_NAME:");
-
- for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
- {
- my $onefile = ${$filesarrayref}[$i];
- my $styles = "";
-
- if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-
- if ( $styles =~ /\bPATCH_SO_NAME\b/ )
- {
- # Language specific subdirectory
-
- my $onelanguage = $onefile->{'specificlanguage'};
- my $filedescription = "";
-
- if ($onelanguage eq "")
- {
- $onelanguage = "00"; # files without language into directory "00"
- }
-
- my $replacedir = $replacedirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator;
- installer::systemactions::create_directory($replacedir); # creating language specific directories
-
- # copy files and edit them with the variables defined in the zip.lst
-
- my $onefilename = $onefile->{'Name'};
- my $sourcepath = $onefile->{'sourcepath'};
- my $destinationpath = $replacedir . $onefilename;
- my $movepath = $destinationpath . ".orig";
-
- my $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath);
-
- if ( $copysuccess )
- {
- # Now the file can be patch (binary!)
- my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref, $onefile, $styles);
-
- if ($found == 0)
- {
- my $infoline = "Did not patch the file $destinationpath\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
- else
- {
- my $infoline = "Successfully patched $destinationpath, Count: $found\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
- }
-
- # Saving the original source, where the file was found
- $onefile->{'originalsourcepath'} = $onefile->{'sourcepath'};
-
- # Saving the original source, where the file was found
- $onefile->{'originalsourcepath'} = $onefile->{'sourcepath'};
-
- # Writing the new sourcepath into the hashref, even if it was no copied
-
- $onefile->{'sourcepath'} = $destinationpath;
- }
- }
-
- my $infoline = "\n";
- push( @installer::globals::logfileinfo, $infoline);
-}
-
-1;
More information about the Libreoffice-commits
mailing list