summaryrefslogtreecommitdiff
path: root/solenv/bin/modules/installer/scriptitems.pm
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-01-08 23:47:02 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-01-10 09:32:36 +0000
commit26c142ca5f2b405b02ab5701dfaeab7bf281a727 (patch)
tree5f13ab387169c4a17ce6c1304430e23eb49f868d /solenv/bin/modules/installer/scriptitems.pm
parenta5838b19bc774efd261c1d6c78a2b6eb62f1b502 (diff)
Kill the ancient StarOffice "patch" concept
For Windows, superseded by Windows Installer patching (i.e., creating .msp files), which is something completely different. (And quite hard to get working... but still a saner approach, I think.) For Linux, many distros use delta RPMs or similar, so no home-grown LO-specific patching mechanism is needed. Remove the -patch and -patchinc command-line options to make_installer.pl and all code that was invoked only when using those. Remove the PATCH and PATCH_ONLY flags in scp2. Remove the patchmsi.dll Windows Installer custom action. Change-Id: I09e949e601a969f88eff60067faa2352f4f89537 Reviewed-on: https://gerrit.libreoffice.org/1605 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'solenv/bin/modules/installer/scriptitems.pm')
-rw-r--r--solenv/bin/modules/installer/scriptitems.pm67
1 files changed, 0 insertions, 67 deletions
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 3f32f9488622..77fa1d3619b9 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -516,21 +516,6 @@ sub use_langpack_hostname
# Using different HostName for language packs
################################################################################
-sub use_patch_hostname
-{
- my ($dirsref) = @_;
-
- for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
- {
- my $onedir = ${$dirsref}[$i];
- if (( $onedir->{'PatchHostName'} ) && ( $onedir->{'PatchHostName'} ne "" )) { $onedir->{'HostName'} = $onedir->{'PatchHostName'}; }
- }
-}
-
-################################################################################
-# Using different HostName for language packs
-################################################################################
-
sub use_langpack_copy_scpaction
{
my ($scpactionsref) = @_;
@@ -558,21 +543,6 @@ sub use_devversion_copy_scpaction
}
################################################################################
-# Using different HostName for language packs
-################################################################################
-
-sub use_patch_copy_scpaction
-{
- my ($scpactionsref) = @_;
-
- for ( my $i = 0; $i <= $#{$scpactionsref}; $i++ )
- {
- my $onescpaction = ${$scpactionsref}[$i];
- if (( $onescpaction->{'PatchCopy'} ) && ( $onescpaction->{'PatchCopy'} ne "" )) { $onescpaction->{'Copy'} = $onescpaction->{'PatchCopy'}; }
- }
-}
-
-################################################################################
# Shifting parent directories of URE and Basis layer, so that
# these directories are located below the Brand layer.
# Style: SHIFT_BASIS_INTO_BRAND_LAYER
@@ -728,7 +698,6 @@ sub replace_setup_variables
$value =~ s/\<alllanguages\>/$languagesstring/;
$value =~ s/\<productmajor\>/$localbuild/;
$value =~ s/\<productminor\>/$localminor/;
- $value =~ s/\<productbuildid\>/$installer::globals::buildid/;
$value =~ s/\<sourceid\>/$installer::globals::build/;
$value =~ s/\<updateid\>/$updateid/;
$value =~ s/\<pkgformat\>/$installer::globals::packageformat/;
@@ -1616,42 +1585,6 @@ sub remove_Helppacklibraries_from_Installset
}
############################################################################
-# Removing all files with flag PATCH_ONLY from installation set.
-# This function is not called during patch creation.
-############################################################################
-
-sub remove_patchonlyfiles_from_Installset
-{
- my ($itemsarrayref) = @_;
-
- my $infoline;
-
- my @newitemsarray = ();
-
- for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
- {
- my $oneitem = ${$itemsarrayref}[$i];
- my $styles = "";
- if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-
- if ( $styles =~ /\bPATCH_ONLY\b/ )
- {
- $infoline = "Removing file with flag PATCH_ONLY $oneitem->{'gid'} from the installation set.\n";
- push( @installer::globals::globallogfileinfo, $infoline);
-
- next;
- }
-
- push(@newitemsarray, $oneitem);
- }
-
- $infoline = "\n";
- push( @installer::globals::globallogfileinfo, $infoline);
-
- return \@newitemsarray;
-}
-
-############################################################################
# Some files cotain a $ in their name. epm conflicts with such files.
# Solution: Renaming this files, converting "$" to "$$"
############################################################################