[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac setup_native/source solenv/bin

[Andras Timar (via logerrit)]

 configure.ac                                         |    2 +-
 setup_native/source/packinfo/finals_instsetoo.txt.in |    2 +-
 solenv/bin/modules/installer/windows/admin.pm        |    2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5c30093f5bcc9f2d2c5ec072263ca0d58337924e
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri Oct 22 22:30:01 2021 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Oct 23 19:33:14 2021 +0200

    [cp] Fix of Win32 MSP creation
    
    Change-Id: Id7743b45958a53fa5e3034836ba280dfddcc2e2e

diff --git a/configure.ac b/configure.ac
index ed5f5a3c2ad5..491c9338a31c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3660,7 +3660,7 @@ cygwin*|wsl*)
     esac
 
     SCPDEFS="$SCPDEFS -D_MSC_VER"
-    AC_SUBST(WIN_BUILD_ARCH)
+    AC_SUBST(WIN_HOST_ARCH)
     ;;
 esac
 
diff --git a/setup_native/source/packinfo/finals_instsetoo.txt.in 
b/setup_native/source/packinfo/finals_instsetoo.txt.in
index 104fc9564e6c..993b41dacc63 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt.in
+++ b/setup_native/source/packinfo/finals_instsetoo.txt.in
@@ -30,4 +30,4 @@
 # OpenOffice   pro             de                      
\\<server>\<path>\msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi
 # OpenOfficeLanguagePack       pro     es      
\\<server>\<path>\msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi
 # URE                  pro             en-US           
\\<server>\<path>\msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi
-CollaboraOffice                pro             
en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW
           
c:\lo\src\co-21.06.3-@WIN_BUILD_ARCH@\Collabora_Office_21.06.3.1_Win_@WIN_BUILD_ARCH@.msi
+CollaboraOffice                pro             
en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW
           
c:\lo\src\co-21.06.3-@WIN_HOST_ARCH@\Collabora_Office_21.06.3.1_Win_@WIN_HOST_ARCH@.msi
diff --git a/solenv/bin/modules/installer/windows/admin.pm 
b/solenv/bin/modules/installer/windows/admin.pm
index 3dfba9e7a8de..c0c98f9e5ab5 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -291,6 +291,8 @@ sub create_directory_structure
     $fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"} 
= $targetdir . $installer::globals::separator . "System";
     $fullpathhash{"SystemFolder_x86_VC.E281B893_10D7_34CE_BB0E_B69D88E154A5"} 
= $targetdir . $installer::globals::separator . "System";
     
$fullpathhash{"System64Folder_amd64_VC.AF4EABEE_4589_3789_BA0A_C83A71662E1D"} = 
$targetdir . $installer::globals::separator . "System64";
+    # FIXME DefaultDir in MSI was '.', why is this a problem now?
+    $fullpathhash{"Colla_progr_shlxt_a8b47146a"} = $targetdir . 
$installer::globals::separator . "program" . $installer::globals::separator . 
"shlxthdl";
 
     return \%fullpathhash;
 }