[Libreoffice-commits] core.git: config_host.mk.in configure.ac instsetoo_native/util solenv/bin

[Andras Timar]

 config_host.mk.in                                 |    1 +
 configure.ac                                      |    2 ++
 instsetoo_native/util/openoffice.lst.in           |    1 +
 solenv/bin/modules/installer/windows/directory.pm |    4 ++--
 4 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 06bc1914ddf2e3d814f9589ce0ae84e5e708a7c3
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Feb 2 09:26:30 2015 -0800

    MSI packaging tweaks for Windows 64-bit
    
    Change-Id: I69d52554b531dab6fc12ffe16e6ca91241fda3a5
    Reviewed-on: https://gerrit.libreoffice.org/14283
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    Tested-by: David Ostrovsky <david at ostrovsky.org>

diff --git a/config_host.mk.in b/config_host.mk.in
index ac811c9..e8d0ec4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -609,6 +609,7 @@ export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@
 export WINDOWS_SDK_LIB_SUBDIR=@WINDOWS_SDK_LIB_SUBDIR@
 export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@
 export WINDOWS_SDK_WILANGID=@WINDOWS_SDK_WILANGID@
+export WINDOWS_X64=@WINDOWS_X64@
 export WINDRES=@WINDRES@
 export WINEGCC=@WINEGCC@
 export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@
diff --git a/configure.ac b/configure.ac
index 7156e8f..1cecb38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3947,6 +3947,7 @@ cygwin*)
             CPUNAME=X86_64
             RTL_ARCH=X86_64
             PLATFORMID=windows_x86_64
+            WINDOWS_X64=1
         else
             CPUNAME=INTEL
             RTL_ARCH=x86
@@ -4359,6 +4360,7 @@ AC_SUBST(OS)
 AC_SUBST(P_SEP)
 AC_SUBST(WORKDIR)
 AC_SUBST(PLATFORMID)
+AC_SUBST(WINDOWS_X64)
 AC_DEFINE_UNQUOTED(WORKDIR,"$WORKDIR")
 
 dnl ===================================================================
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index d2b3bff..77f566d 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -33,6 +33,7 @@ Globals
             OOOVENDOR The Document Foundation
             OOODOWNLOADNAME 1
             STARTCENTER_HIDE_EXTERNAL_LINKS 0
+            64BITPRODUCT @WINDOWS_X64@
         }
     }
 }
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index b84b05a..a1d6773 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -62,9 +62,9 @@ sub overwrite_programfilesfolder
 {
     my ( $allvariables ) = @_;
 
-    if ( $allvariables->{'PROGRAMFILESFOLDERNAME'} )
+    if (( $allvariables->{'64BITPRODUCT'} ) && ( $allvariables->{'64BITPRODUCT'} == 1 ))
     {
-        $installer::globals::programfilesfolder = $allvariables->{'PROGRAMFILESFOLDERNAME'};
+        $installer::globals::programfilesfolder = "ProgramFiles64Folder";
     }
 }