[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source solenv/bin

2018-04-18 Thread Mike Kaganski 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 -
 scp2/source/ooo/vc_redist.scp  |2 -
 solenv/bin/modules/installer/windows/upgrade.pm|   15 
+-
 3 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 606852089e32a2065ee5fc3224f7b2940e6b1323
Author: Mike Kaganski 
Date:   Wed Apr 18 07:05:04 2018 +0100

Revert two last changes to Upgrade table

This reverts commits 914f6385d98f8c898102c971a4d5b0eb9f075ef0 and
a6045159237419ce8fa49202c672e3895f0ab30a. A investigation required why
is the problem with them; meanwhile, they break builds.

Change-Id: I713b27dd64e8ac7beb2757c362765b60ce191f8d
Reviewed-on: https://gerrit.libreoffice.org/53078
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 326b70fcddc7..12ba10f300c9 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -43,7 +43,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED;VCRUNTIME_DETECTED_32
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index c4750ff5ad69..921a9433e820 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -93,7 +93,7 @@ WindowsCustomAction gid_Customaction_InstallVCRedist
 Source = VCREDIST_EXE_NAME;
 Target = "/repair /norestart /passive";
 Inbinarytable = 1;
-Assignment1 = ("InstallUISequence", "Not Installed And Not ( 
(VCRUNTIME_DETECTED Or VCRUNTIME_DETECTED_32) And UCRT_DETECTED ) And VC_REDIST 
= 1", "behind_ExecuteAction");
+Assignment1 = ("InstallUISequence", "Not Installed And Not ( 
VCRUNTIME_DETECTED And UCRT_DETECTED ) And VC_REDIST = 1", 
"behind_ExecuteAction");
 End
 
 #endif
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm 
b/solenv/bin/modules/installer/windows/upgrade.pm
index b008d010fb15..9e0d7ea79fb7 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -46,15 +46,16 @@ sub create_upgrade_table
 push(@upgradetable, $newline);
 
 # Detecting if VC Runtime is installed on system
-$newline = "{36F68A90-239C-34DF-B58C-64B30153CE35}" . "\t" . "14.0.24215" 
. "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . 
"VCRUNTIME_DETECTED";
-push(@upgradetable, $newline);
-
-# 32-bit installer must also detect if 32-bit Runtime is installed
-if ( $installer::globals::cpuname ne 'X86_64' )
+$newline = "VCRUNTIME_UPGRADE_CODE" . "\t" . "14.0.24215" . "\t" . 
"15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . "VCRUNTIME_DETECTED";
+if ( $installer::globals::cpuname eq 'X86_64' )
 {
-$newline = "{65E5BD06-6392-3027-8C26-853107D3CF1A}" . "\t" . 
"14.0.24215" . "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . 
"VCRUNTIME_DETECTED_32";
-push(@upgradetable, $newline);
+$newline =~ 
s/VCRUNTIME_UPGRADE_CODE/{36F68A90-239C-34DF-B58C-64B30153CE35}/;
 }
+else
+{
+$newline =~ 
s/VCRUNTIME_UPGRADE_CODE/{65E5BD06-6392-3027-8C26-853107D3CF1A}/;
+}
+push(@upgradetable, $newline);
 
 # Saving the file
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source solenv/bin

2018-04-16 Thread Mike Kaganski 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 +-
 scp2/source/ooo/vc_redist.scp  |2 +-
 solenv/bin/modules/installer/windows/upgrade.pm|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a6045159237419ce8fa49202c672e3895f0ab30a
Author: Mike Kaganski 
Date:   Mon Apr 16 16:41:21 2018 +0100

Use different properties in Upgrade table

Change-Id: I7e2cc08a1312da629e4644be97ebc7ed40250702
Reviewed-on: https://gerrit.libreoffice.org/52995
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 2b633b8eb37a..fcdd9162d680 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -44,7 +44,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED
+SecureCustomProperties 
NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED;VCRUNTIME_DETECTED_32
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 921a9433e820..c4750ff5ad69 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -93,7 +93,7 @@ WindowsCustomAction gid_Customaction_InstallVCRedist
 Source = VCREDIST_EXE_NAME;
 Target = "/repair /norestart /passive";
 Inbinarytable = 1;
-Assignment1 = ("InstallUISequence", "Not Installed And Not ( 
VCRUNTIME_DETECTED And UCRT_DETECTED ) And VC_REDIST = 1", 
"behind_ExecuteAction");
+Assignment1 = ("InstallUISequence", "Not Installed And Not ( 
(VCRUNTIME_DETECTED Or VCRUNTIME_DETECTED_32) And UCRT_DETECTED ) And VC_REDIST 
= 1", "behind_ExecuteAction");
 End
 
 #endif
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm 
b/solenv/bin/modules/installer/windows/upgrade.pm
index cb54a794cbc5..b008d010fb15 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -52,7 +52,7 @@ sub create_upgrade_table
 # 32-bit installer must also detect if 32-bit Runtime is installed
 if ( $installer::globals::cpuname ne 'X86_64' )
 {
-$newline = "{65E5BD06-6392-3027-8C26-853107D3CF1A}" . "\t" . 
"14.0.24215" . "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . 
"VCRUNTIME_DETECTED";
+$newline = "{65E5BD06-6392-3027-8C26-853107D3CF1A}" . "\t" . 
"14.0.24215" . "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . 
"VCRUNTIME_DETECTED_32";
 push(@upgradetable, $newline);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice scp2/source solenv/bin

2018-04-12 Thread Mike Kaganski 
 instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt |4 +--
 instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt |2 +
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 -
 instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt |2 -
 instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt |9 
+++
 scp2/source/ooo/vc_redist.scp  |6 -
 solenv/bin/modules/installer/windows/upgrade.pm|   12 
++
 7 files changed, 27 insertions(+), 10 deletions(-)

New commits:
commit 1f8a3657216e44796cb94087450552aa977ebdae
Author: Mike Kaganski 
Date:   Thu Apr 12 15:18:58 2018 +0300

tdf#108580 related: improve existing redist detection

This uses VC Runtime upgrade code (checked using Upgrade table) to
find installed redist, instead of checking registry keys that change
between versions (while the runtime is still compatible, as with 2015
and 2017).
Also, it checks if UCRT is present. Now, if either VC Runtime or UCRT
is absent, we try to install the redist. This would allow to install
UCRT in scenarios when first install was attempted on a system not
suitable for UCRT (like Win7 w/o SP1, or Win8.1 w/o April 2014 update
rollup), where VC Runtime gets installed, but UCRT is still missing.
We use the ucrtbase.dll version to check that; and as the expected
version is 10.x, we take into account that Win10 lies about versions.

Change-Id: I864dfc09cf1bdc775501729fa2a27dc98295588c
Reviewed-on: https://gerrit.libreoffice.org/52794
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index 60793dd69ded..23c2a77c9f5d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -5,6 +5,6 @@ INSTALLLOCATION installuser
 INSTALLLOCATIONinstalluser_
 INSTALLLOCATIONinstallmachine
 INSTALLLOCATIONinstallmachine_
-VCREDISTINSTALLED_X86  VCREDISTINSTALLED_X86
-VCREDISTINSTALLED_X64  VCREDISTINSTALLED_X64
 WIN81S14   win81s14
+UCRT_DETECTED  ucrt_detected
+UCRT_DETECTED  ucrt_on_win10
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt
index 589ab7c52806..399011e166ca 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt
@@ -2,3 +2,5 @@ Signature_  Parent  PathDepth
 s72S72 S255I2
 DrLocator  Signature_  Parent  Path
 win81s14   [SystemFolder]  
+ucrt_detected  [SystemFolder]  
+ucrt_on_win10  [SystemFolder]  
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index f8eeaf25c105..2b633b8eb37a 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -44,7 +44,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 7e59ef3c6663..c082322086ad 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -5,5 +5,3 @@ installuser 1   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
 installuser_   1   
Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] 
INSTALLLOCATION 2
 installmachine 2   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]  
INSTALLLOCATION 2
 installmachine_2   
Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] 
INSTALLLOCATION 2
-VCREDISTINSTALLED_X86  2   
Software\Microsoft\VisualStudio\14.0\VC\Runtimes\x86Version 2
-VCREDISTINSTALLED_X64  2   
Software\Microsoft\VisualStudio\14.0\VC\Runtimes\x64Version 2
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt
index d5abd9769125..53615298dc6d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt
+++