[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - external/Package_msvc_dlls.mk instsetoo_native/util solenv/bin

[Michael Stahl]

 external/Package_msvc_dlls.mk               |    4 +++-
 instsetoo_native/util/openoffice.lst.in     |    4 ++--
 solenv/bin/modules/installer/environment.pm |    3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 31f9f18f86a4dd587661f210cd866f6ce1608634
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jun 27 13:29:08 2013 +0200

    fdo#65975: do not put MSVC 64bit runtimes in solver/bin
    
    Apparently causes problems for some people.
    
    Unfortunately the scp2 entries are "non-standard" so i've had to add
    another variable to let the installer find it.
    
    (cherry picked from commit 9a6d5f15afa16e68d38e4a0cfd5ef904be481a17)
    
    Conflicts:
    	instsetoo_native/util/openoffice.lst.in
    
    Change-Id: I7a01160369ed8dc401625c06760008341afcee67
    Reviewed-on: https://gerrit.libreoffice.org/4576
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/external/Package_msvc_dlls.mk b/external/Package_msvc_dlls.mk
index b8bec8f..cbf09aa 100644
--- a/external/Package_msvc_dlls.mk
+++ b/external/Package_msvc_dlls.mk
@@ -9,7 +9,9 @@
 
 $(eval $(call gb_Package_Package,msvc_dlls,$(MSVC_DLL_PATH)))
 
-$(eval $(call gb_Package_add_files,msvc_dlls,bin,\
+$(eval $(call gb_Package_set_outdir,msvc_dlls,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,msvc_dlls,program/shlxthdl,\
 	$(MSVC_DLLS) \
 ))
 
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 589781e..034aedb 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -82,7 +82,7 @@ LibreOffice
         downloadname    LibreOffice_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOffice_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOffice_{productversion}_helppack_{os}_install_{languages}
-        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
+        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath}
     }
 }
 
@@ -138,7 +138,7 @@ LibreOffice_Dev
         downloadname    LibreOfficeDev_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
+        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath}
     }
 }
 
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 9e2b880..63689a0 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -39,6 +39,9 @@ sub create_pathvariables
     my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . "common" . $installer::globals::productextension;
     $variables{'solarcommonpath'} = $solarcommonpath;
 
+    my $shlxthdlpath = $ENV{'INSTDIR'} . $installer::globals::separator . "program" . $installer::globals::separator . "shlxthdl";
+    $variables{'shlxthdlpath'} = $shlxthdlpath;
+
     $variables{'os'} = $installer::globals::compiler;
 
     my $solarenvpath = "";