summaryrefslogtreecommitdiff
path: root/solenv/bin
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-02-21 20:40:59 -0500
committerDavid Ostrovsky <David.Ostrovsky@gmx.de>2013-02-24 17:26:19 +0000
commit1d84e9d1d363bd550129efcbeafe670c0a049dd0 (patch)
tree8dcabefa0b1456c1a509e1973485c3f8497326c2 /solenv/bin
parent80dd07381bc7207520a4b7fb0d06e8cc5583ee76 (diff)
instsetoo_native: convert to gbuild
Removes: * instsetoo_native/util/update.xml - gen_update_info.pl can be removed ? On Windows the binary artifacts are created now in: workdir/*/installation/LibreOffice_Dev/native/install/en-US/*.msi Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259eeeed49 Reviewed-on: https://gerrit.libreoffice.org/2242 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de> Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Diffstat (limited to 'solenv/bin')
-rw-r--r--solenv/bin/modules/installer/control.pm1
-rw-r--r--solenv/bin/modules/installer/windows/idtglobal.pm2
2 files changed, 1 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 6baced7633c3..26ab41aa4724 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -327,7 +327,6 @@ sub check_logfile
my $compareline = $line;
$compareline =~ s/Error\.idt//g; # removing all occurrences of "Error.idt"
- $compareline =~ s/Error\.mlf//g; # removing all occurrences of "Error.mlf"
$compareline =~ s/Error\.ulf//g; # removing all occurrences of "Error.ulf"
$compareline =~ s/Error\.idl//g; # removing all occurrences of "Error.idl"
$compareline =~ s/Error\.html//g; # removing all occurrences of "Error.html"
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 909dc34e43eb..e5ce42d13050 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -606,7 +606,7 @@ sub get_languagefilename
{
my ($idtfilename, $basedir) = @_;
- $idtfilename =~ s/\.idt/\.mlf/;
+ $idtfilename =~ s/\.idt/\.ulf/;
my $languagefilename = $basedir . $installer::globals::separator . $idtfilename;