solenv/bin/modules/installer.pm | 4 ++--
solenv/bin/modules/installer/scriptitems.pm | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 1f3f3c94458aef5df3d30e32b497885cccf32a52
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Sep 12 19:04:26 2013 +0200
installer: find files in INSTDIR also on WNT
... where everything is inside some artificial "LibreOffice 4"
directory that is set as WINDOWSBASISROOTNAME in openoffice.lst.in
Change-Id: Ib04f84a8064739e0ea9d11b3b79cc1fa167a06e5
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 7093e64..a26196a 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -588,7 +588,7 @@ sub run {
installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($filesinproductlanguageresolvedarrayref,
$dirsinproductarrayref);
-
installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($filesinproductlanguageresolvedarrayref,
$includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref, "Files");
+
installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($filesinproductlanguageresolvedarrayref,
$includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref, "Files",
$allvariableshashref);
$filesinproductlanguageresolvedarrayref =
installer::scriptitems::remove_Files_Without_Sourcedirectory($filesinproductlanguageresolvedarrayref);
@@ -672,7 +672,7 @@ sub run {
installer::scriptitems::changing_name_of_language_dependent_keys($scpactionsinproductlanguageresolvedarrayref);
-
installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($scpactionsinproductlanguageresolvedarrayref,
$includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref,
"ScpActions");
+
installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($scpactionsinproductlanguageresolvedarrayref,
$includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref,
"ScpActions", $allvariableshashref);
# Editing scpactions with flag SCPZIP_REPLACE.
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index e0ed89f..749ada9 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1014,10 +1014,11 @@ sub get_sourcepath_from_filename_and_includepath
sub get_Source_Directory_For_Files_From_Includepathlist
{
- my ($filesarrayref, $includepatharrayref, $dirsref, $item) = @_;
+ my ($filesarrayref, $includepatharrayref, $dirsref, $item, $allvariables)
= @_;
installer::logger::include_header_into_logfile("$item:");
+ my $extrarootdir = $allvariables->{'WINDOWSBASISROOTNAME'};
my $infoline = "";
for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
@@ -1044,7 +1045,11 @@ sub get_Source_Directory_For_Files_From_Includepathlist
my $instdirdestination;
if ($destination)
{
- $instdirdestination = $ENV{'INSTDIR'} .
$installer::globals::separator . $onefile->{'destination'};
+ if ($extrarootdir)
+ {
+ $destination =~ s,$extrarootdir/,,; # remove it from path
+ }
+ $instdirdestination = $ENV{'INSTDIR'} .
$installer::globals::separator . $destination;
}
if ($instdirdestination && -f $instdirdestination)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
