configure.ac | 2 +-
external/Package_msvc_dlls.mk | 4 +++-
instsetoo_native/util/openoffice.lst.in | 4 ++--
solenv/bin/modules/installer/control.pm | 2 +-
solenv/bin/modules/installer/environment.pm | 6 +++---
5 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit df0ac37929a1ae1bd72279242194d51693a91a8c
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Jun 27 13:39:26 2013 +0200
solarcommonpath is dead
Change-Id: I7cebb54777dc8c2c5331e7b693a1cdc407127acf
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index c1894bd..955158d 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -256,7 +256,7 @@ sub check_makecab_version
######################################################################
# Reading the environment variables for the paths in ziplist.
-# solarpath, solarenvpath, solarcommonpath, os, pmiscpath
+# solarpath, solarenvpath, os, pmiscpath
######################################################################
sub check_system_environment
diff --git a/solenv/bin/modules/installer/environment.pm
b/solenv/bin/modules/installer/environment.pm
index 63689a0..7591fc0 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -31,14 +31,11 @@ sub create_pathvariables
my %variables = ();
# The following variables are needed in the path file list
- # solarpath, solarenvpath, solarcommonpath, os, pmiscpath
+ # solarpath, solarenvpath, os, pmiscpath
my $solarpath = $environment->{'SOLARVERSION'} .
$installer::globals::separator . $installer::globals::compiler .
$installer::globals::productextension;
$variables{'solarpath'} = $solarpath;
- 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;
commit 9a6d5f15afa16e68d38e4a0cfd5ef904be481a17
Author: Michael Stahl <mst...@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.
Change-Id: I7a01160369ed8dc401625c06760008341afcee67
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 f3cdc7a..50ec864 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,{filelistpath}
+ 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,{filelistpath},{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,{filelistpath}
+ 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,{filelistpath},{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 = "";
commit 315c31721ac849e201d5f5c9097226306a7a1c00
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Jun 25 15:23:48 2013 +0200
Revert "fdo#65975 - fix presumed 32bit windows compile bug in configure."
This reverts commit 0cf61137d2a1993d310e2e8ff9bda4d0ed493ef0.
diff --git a/configure.ac b/configure.ac
index 7350d39..12fe94a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4915,7 +4915,7 @@ find_msvc_x64_dlls()
vsarch=x64
fi
- msvcdllpath="$VC_PRODUCT_DIR/redist/$vsarch/Microsoft.VC${VCVER}.CRT"
+ msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT"
MSVC_DEBUG_DLL_PATH="$VC_PRODUCT_DIR/redist/Debug_NonRedist/$vsarch/Microsoft.VC${VCVER}.DebugCRT"
msvcdlls="msvcp${VCVER}.dll msvcr${VCVER}.dll"
MSVC_DEBUG_DLLS="msvcp${VCVER}d.dll msvcr${VCVER}d.dll"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
