[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo

2023-11-02 Thread Mike Kaganski (via logerrit) 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt |2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt  |2 +-
 instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 419866e851c7ad4a39bd508d607baba3590f3d45
Author: Mike Kaganski 
AuthorDate: Thu Nov 2 09:53:21 2023 +0300
Commit: Mike Kaganski 
CommitDate: Thu Nov 2 09:42:43 2023 +0100

MSI: Fix Signature table's FileName column type

It was "Filename" [1] since commit 68d28e25348ced2619733d8b177423d3aefab900
(#i28464# ooo native installer, 2004-05-24). But according to the spec [2],
it should be "Text" [3].

Found accidentally, because of an MSM bug in VS 2022 [4]. The unnecessary
entries there for Signature table conflicted with ours, preventing merge.

[1] https://learn.microsoft.com/en-us/windows/win32/msi/filename
[2] https://learn.microsoft.com/en-us/windows/win32/msi/signature-table
[3] https://learn.microsoft.com/en-us/windows/win32/msi/text
[4] 
https://developercommunity.visualstudio.com/t/Microsoft_VC143_CRT_x64msm-v14363253/10505819

Change-Id: I9911b8c02df57f202d197c634b565ce74b35d7e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158783
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
index 80ab50b265cb..53dcdd84e45c 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
@@ -421,7 +421,7 @@ ShortcutShortcutN   
Identifier  Primary key, non-localized token.
 Shortcut   ShowCmd Y   1;3;7   
The show command for the application window.The following values may be used.
 Shortcut   Target  N   Shortcut
The shortcut target. This is usually a property that is expanded to a 
file or a folder that the shortcut points to.
 Shortcut   WkDir   Y   Identifier  
Name of property defining location of working directory.
-Signature  FileNameN   
FilenameThe name of the file. This may contain a "short 
name|long name" pair.
+Signature  FileNameN   Text
The name of the file. This may contain a "short name|long name" pair.
 Signature  Languages   Y   
LanguageThe languages supported by the file.
 Signature  MaxDate Y   0   2147483647  
The maximum creation date of the file.
 Signature  MaxSize Y   0   2147483647  
The maximum size of the file. 
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
index f3b5648311a7..ea986c0ea1d8 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
@@ -425,7 +425,7 @@ ShortcutShortcutN   
Identifier  Primary key, non-localized token.
 Shortcut   ShowCmd Y   1;3;7   
The show command for the application window.The following values may be used.
 Shortcut   Target  N   Shortcut
The shortcut target. This is usually a property that is expanded to a 
file or a folder that the shortcut points to.
 Shortcut   WkDir   Y   Identifier  
Name of property defining location of working directory.
-Signature  FileNameN   
FilenameThe name of the file. This may contain a "short 
name|long name" pair.
+Signature  FileNameN   Text
The name of the file. This may contain a "short name|long name" pair.
 Signature  Languages   Y   
LanguageThe languages supported by the file.
 Signature  MaxDate Y   0   2147483647  
The maximum creation date of the file.
 Signature  MaxSize Y   0   2147483647  
The maximum size of the file. 
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
index 80ab50b265cb..53dcdd84e45c 100644
---

[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo

2022-02-27 Thread Julien Nabet (via logerrit) 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |2 +-
 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf  |3 ---
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |2 +-
 instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt   |2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit aafd4c8431aa511511375ff39f87a7f8bde726e0
Author: Julien Nabet 
AuthorDate: Sun Feb 27 20:12:22 2022 +0100
Commit: Julien Nabet 
CommitDate: Sun Feb 27 23:02:15 2022 +0100

tdf#135233: Useless looking translatable string: "error text goes here"

Change-Id: I7e25ea89594b8b71e9009d8e9227e039aff8ee32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130657
Reviewed-by: Andras Timar 
Tested-by: Jenkins

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index 47b12d84a87f..fcfcfc8e065f 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -246,7 +246,7 @@ SetupCompleteSuccessTextLine2   Text135 
55  328 45  65538   OOO_CONTROL_199
 SetupCompleteSuccess   TextLine3   Text135 55  328 45  
65538   OOO_CONTROL_200 
 SetupError A   PushButton  222 97  66  17  3   
OOO_CONTROL_204 
 SetupError C   PushButton  222 97  66  17  3   
OOO_CONTROL_205 
-SetupError ErrorText   Text50  15  230 67  3   
OOO_CONTROL_206 
+SetupError ErrorText   Text50  15  230 67  3   
error text goes here  error text goes here  error text goes here  error 
text goes here  error text goes here  error text goes here  error text goes 
here  error text goes here  error text goes here  error text goes here  

 SetupError I   PushButton  222 97  66  17  3   
OOO_CONTROL_207 
 SetupError N   PushButton  222 97  66  17  3   
OOO_CONTROL_208 
 SetupError O   PushButton  222 97  66  17  3   
OOO_CONTROL_209 
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 18bb8fccacdc..fcea59317f08 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -469,9 +469,6 @@ en-US = ""
 [OOO_CONTROL_205]
 en-US = ""
 
-[OOO_CONTROL_206]
-en-US = "error text goes here  error text goes here  error text goes here  
error text goes here  error text goes here  error text goes here  error text 
goes here  error text goes here  error text goes here  error text goes here"
-
 [OOO_CONTROL_207]
 en-US = ""
 
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index eee5c4e8cd48..d60ee7874971 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -248,7 +248,7 @@ SetupCompleteSuccessTextLine2   Text135 
55  328 45  65538   OOO_CONTROL_199
 SetupCompleteSuccess   TextLine3   Text135 55  328 45  
65538   OOO_CONTROL_200 
 SetupError A   PushButton  222 97  66  17  3   
OOO_CONTROL_204 
 SetupError C   PushButton  222 97  66  17  3   
OOO_CONTROL_205 
-SetupError ErrorText   Text50  15  230 67  3   
OOO_CONTROL_206 
+SetupError ErrorText   Text50  15  230 67  3   
error text goes here  error text goes here  error text goes here  error 
text goes here  error text goes here  error text goes here  error text goes 
here  error text goes here  error text goes here  error text goes here  

 SetupError I   PushButton  222 97  66  17  3   
OOO_CONTROL_207 
 SetupError N   PushButton  222 97  66  17  3   
OOO_CONTROL_208 
 SetupError O   PushButton  222 97  66  17  3   
OOO_CONTROL_209 
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
index d9ac9d1a550a..bb64ac5e8e42 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
+++

[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo

2019-11-30 Thread Mike Kaganski (via logerrit) 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |1 +
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |1 +
 instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt   |1 +
 3 files changed, 3 insertions(+)

New commits:
commit b17d6452667d9be8fcbb9c84d042da66713230ea
Author: Mike Kaganski 
AuthorDate: Sat Nov 30 12:45:56 2019 +0200
Commit: Mike Kaganski 
CommitDate: Sat Nov 30 14:24:14 2019 +0100

MSI: Disable creation of system restore points during installation

We don't install low-level system components that have potential of
ruining the system, which would be the reason to create the restore
points. Some systems suffer from very long creation of the restore
points, like in tdf#129087:

...
MSI (s) (60:00) [09:18:54:201]: Calling SRSetRestorePoint API. 
dwRestorePtType: 1, dwEventType: 102, llSequenceNumber: 0, szDescription: 
"Removed LibreOffice 6.3 Help Pack (English (United Kingdom))".
MSI (s) (60:00) [09:26:57:699]: The call to SRSetRestorePoint API 
succeeded. Returned status: 0, llSequenceNumber: 73.
...

So let's just disable the generation of restore points, as per [1].

[1] https://docs.microsoft.com/en-us/windows/win32/msi/msifastinstall

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

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index 9a9721b0dbb2..ca9abc8110e1 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -27,6 +27,7 @@ ISSCRIPT_VERSION_MISSING  IDS_ISSCRIPT_VERSION_MISSING
 ISSCRIPT_VERSION_OLD   IDS_ISSCRIPT_VERSION_OLD
 ISVROOT_PORT_NO0
 Manufacturer   MANUFACTURERTEMPLATE
+MSIFASTINSTALL 1
 PIDTemplate12345<###-%%%>@
 ProductCodePRODUCTCODETEMPLATE
 ProductID  none
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 03fab1ce9347..e528cac384ec 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -28,6 +28,7 @@ ISSCRIPT_VERSION_MISSING  IDS_ISSCRIPT_VERSION_MISSING
 ISSCRIPT_VERSION_OLD   IDS_ISSCRIPT_VERSION_OLD
 ISVROOT_PORT_NO0
 Manufacturer   MANUFACTURERTEMPLATE
+MSIFASTINSTALL 1
 MSIRESTARTMANAGERCONTROL   0
 MsiUIRMOption  DontUseRM
 PIDTemplate12345<###-%%%>@
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
index bea6abe6af03..bd9065fd92b5 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
@@ -28,6 +28,7 @@ ISSCRIPT_VERSION_MISSING  IDS_ISSCRIPT_VERSION_MISSING
 ISSCRIPT_VERSION_OLD   IDS_ISSCRIPT_VERSION_OLD
 ISVROOT_PORT_NO0
 Manufacturer   MANUFACTURERTEMPLATE
+MSIFASTINSTALL 1
 PIDTemplate12345<###-%%%>@
 ProductCodePRODUCTCODETEMPLATE
 ProductID  none
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo

2018-04-16 Thread dennisroczek 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |1 -
 instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf  |9 
+++--
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |1 -
 instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt   |1 -
 4 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit defa12ce4d1c3fa550dbbe3a9ae1c54f4392f39c
Author: dennisroczek 
Date:   Sat Mar 31 14:01:39 2018 +0100

Remove dummy "Support help number" under Windows' "Apps and Features"
section.

The OOO_ARPURLINFOABOUTTEMPLATE is simply missleading as the caption in
Windows itself is "Supportlink". As the help states that the product
homepage can be used, switch to libreoffice.org, see documentation at
https://msdn.microsoft.com/en-us/library/aa367752

Additionally switch some links to https.

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

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index 9fc042166a49..a165a025020a 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -9,7 +9,6 @@ ALLUSERS1
 ARPCOMMENTSARPCOMMENTSTEMPLATE
 ARPCONTACT OOO_ARPCONTACTTEMPLATE
 ARPHELPLINKOOO_ARPHELPLINKTEMPLATE
-ARPHELPTELEPHONE   OOO_ARPHELPTELEPHONETEMPLATE
 ARPURLINFOABOUTOOO_ARPURLINFOABOUTTEMPLATE
 ARPURLUPDATEINFO   OOO_ARPURLUPDATEINFOTEMPLATE
 DefaultUIFont  Tahoma8
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
index a8764b0745e9..fb1f0b0e61a9 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
@@ -20,16 +20,13 @@
 en-US = "LibreOffice Community"
 
 [OOO_ARPHELPLINKTEMPLATE]
-en-US = "http://www.libreoffice.org/get-help;
-
-[OOO_ARPHELPTELEPHONETEMPLATE]
-en-US = "x-xxx-xxx-xxx"
+en-US = "https://www.libreoffice.org/get-help;
 
 [OOO_ARPURLINFOABOUTTEMPLATE]
-en-US = "http://www.documentfoundation.org;
+en-US = "https://www.libreoffice.org/;
 
 [OOO_ARPURLUPDATEINFOTEMPLATE]
-en-US = "http://www.libreoffice.org/download;
+en-US = "https://www.libreoffice.org/download;
 
 [OOO_STR_NEW_DISPLAY_NAME]
 en-US = "~New"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index fcdd9162d680..326b70fcddc7 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -9,7 +9,6 @@ ALLUSERS1
 ARPCOMMENTSARPCOMMENTSTEMPLATE
 ARPCONTACT OOO_ARPCONTACTTEMPLATE
 ARPHELPLINKOOO_ARPHELPLINKTEMPLATE
-ARPHELPTELEPHONE   OOO_ARPHELPTELEPHONETEMPLATE
 ARPURLINFOABOUTOOO_ARPURLINFOABOUTTEMPLATE
 ARPURLUPDATEINFO   OOO_ARPURLUPDATEINFOTEMPLATE
 DefaultUIFont  Tahoma8
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
index 8848ac8e88cd..bea6abe6af03 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
@@ -8,7 +8,6 @@ ApplicationUsersAllUsers
 ARPCOMMENTSARPCOMMENTSTEMPLATE
 ARPCONTACT OOO_ARPCONTACTTEMPLATE
 ARPHELPLINKOOO_ARPHELPLINKTEMPLATE
-ARPHELPTELEPHONE   OOO_ARPHELPTELEPHONETEMPLATE
 ARPURLINFOABOUTOOO_ARPURLINFOABOUTTEMPLATE
 ARPURLUPDATEINFO   OOO_ARPURLUPDATEINFOTEMPLATE
 ARPNOREPAIR1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo solenv/bin

2018-04-12 Thread Mike Kaganski 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |2 
 instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf |3 -
 instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf |4 +
 instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/DrLocato.idt |4 +
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt |4 +
 instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt   |2 
 solenv/bin/modules/installer/windows/msiglobal.pm  |   29 
++
 13 files changed, 47 insertions(+), 9 deletions(-)

New commits:
commit 8faa1bc61fa8f09365d483364aea2b1c2751b587
Author: Mike Kaganski 
Date:   Wed Apr 11 21:30:20 2018 +0300

tdf#108580 related: check for Windows 8.1 April 2014 update rollup

... since it's the required prerequisite for Universal CRT.
This moves Windows version check to LaunchCondition table; and adds a
check for kernel32.dll version associated with the said update level.

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

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index 55f1fcfe6b20..24c02f85f7b8 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -249,7 +249,7 @@ SetupError  I   PushButton  192 80  66  
17  3   OOO_CONTROL_207
 SetupError N   PushButton  192 80  66  17  3   
OOO_CONTROL_208 
 SetupError O   PushButton  192 80  66  17  3   
OOO_CONTROL_209 
 SetupError R   PushButton  192 80  66  17  3   
OOO_CONTROL_210 
-SetupError WarningIcon Icon15  15  24  24  5242881 
CautionIco  
+SetupError ErrorIcon   Icon15  15  24  24  5242881 
CautionIco  
 SetupError Y   PushButton  192 80  66  17  3   
OOO_CONTROL_211 
 SetupInitializationActionData  Text135 125 228 12  
65539   
 SetupInitializationActionText  Text135 109 220 36  
65539   
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
index 742cb8cbfb84..1038d6ca5679 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
@@ -21,6 +21,3 @@ en-US  = "A newer version of [ProductName] was found. To 
install an older versio
 
 [OOO_CUSTOMACTION_2]
 en-US  = "The same version of this product is already installed."
-
-[OOO_CUSTOMACTION_5]
-en-US = "[ProductName] cannot be installed on this Windows version. 
[WindowsMinVersionText] or newer is required."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
index e3f6f7fa8f53..5e57eb1c3c0e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
@@ -1,2 +1,6 @@
 [OOO_LAUNCH_1]
 en-US = "The Installation Wizard cannot be run properly because you are logged 
in as a user without sufficient administrator rights for this system."
+[OOO_LAUNCH_2]
+en-US = "[ProductName] cannot be installed on this Windows version. 
[WindowsMinVersionText] or newer is required."
+[OOO_LAUNCH_3]
+en-US = "To install [ProductName] on Windows 8.1, at least April 2014 update 
rollup (MS KB 2919355) must be installed."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index 095cf907bf46..60793dd69ded 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -7,3 +7,4 @@ INSTALLLOCATION installmachine
 INSTALLLOCATIONinstallmachine_
 VCREDISTINSTALLED_X86

[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo scp2/source

2017-12-15 Thread Mike Kaganski 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt |3 -
 instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt  |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt  |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt  |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt  |   16 
--
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt  |2 -
 instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt   |3 -
 scp2/source/ooo/windowscustomaction_ooo.scp |4 +-
 8 files changed, 12 insertions(+), 19 deletions(-)

New commits:
commit cfbc934609aaa303d03fd73b58bde1370ea312dc
Author: Mike Kaganski 
Date:   Thu Dec 14 08:37:45 2017 +0200

MSI cleanup: remove redundant conditions

VersionNT is now always greated than 600 (only needs checking in version
checking action). ISSETUPDRIVEN and ISSCHEDULEREBOOT are specific to
InstallShield and aren't relevant to LibreOffice installer.

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

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
index b30ebc27d9f6..d4f1c0f9a9e5 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
@@ -12,7 +12,7 @@ CreateShortcuts   2150
 DeleteServices VersionNT   1000
 DuplicateFiles 2050
 FileCost   400
-FindRelatedProductsNOT ISSETUPDRIVEN   100
+FindRelatedProducts100
 InstallFiles   1950
 InstallFinalize3150
 InstallInitialize  700
@@ -51,7 +51,6 @@ RemoveRegistryValues  1300
 RemoveShortcuts1600
 RMCCPSearchNot CCP_SUCCESS And CCP_TEST250
 SameProductFound   SAMEPRODUCTS120
-ScheduleReboot ISSCHEDULEREBOOT3125
 SetARPInstallLocation  990
 SetARPNoRemove VersionNT < 600 995
 SetODBCFolders 550
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
index 2377f5c5661f..7959472331a0 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
@@ -10,5 +10,4 @@ InstallFiles  350
 InstallFinalize400
 InstallInitialize  250
 InstallValidate200
-ScheduleReboot ISSCHEDULEREBOOT375
 SetAdminInstallProperty248
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt
index 32b74d61a9f5..132df0855f18 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt
@@ -16,4 +16,3 @@ RegisterExtensionInfo 350
 RegisterMIMEInfo   450
 RegisterProgIdInfo 400
 RegisterTypeLibraries  500
-ScheduleReboot ISSCHEDULEREBOOT675
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 602c683b85d6..8aa06a155b46 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -5,7 +5,6 @@ ISInitAllUsers  307 ALLUSERS1
 setAllUsersProfile 51  ALLUSERSPROFILE [%ALLUSERSPROFILE]
 setUserProfile 51  USERPROFILE [%USERPROFILE]
 SetARPInstallLocation  51  ARPINSTALLLOCATION  [INSTALLLOCATION]
-SetARPNoRemove 51  ARPNOREMOVE 1
 NewProductFound19  OOO_CUSTOMACTION_1
 SameProductFound   19  OOO_CUSTOMACTION_2
 WrongWindowsVersion19  OOO_CUSTOMACTION_5
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 680961b4f744..0a0d60f09832 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -1,7 +1,7 @@
 Action Condition   Sequence
 s72S255I2
 InstallExecuteSequence Action
-AllocateRegistrySpace  NOT Installed   750
+AllocateRegistrySpace  Not Installed   750
 AppSearch  25
 BindImage  2100
 CCPSearch  CCP_TEST200
@@ -9,17 +9,17 @@ CostFinalize  500
 CostInitialize 350
 CreateFolders  1850
 CreateShortcuts

[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo

2017-01-29 Thread fakabbir 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt|   38 
-
 instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt |   38 
-
 instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt |   40 
+-
 instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt  |   40 
+-
 instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt  |   38 
-
 5 files changed, 97 insertions(+), 97 deletions(-)

New commits:
commit 78220c485cf9d25bd4078299b2d6e96a49bad7de
Author: fakabbir 
Date:   Sun Jan 29 19:23:04 2017 +0530

tdf#105568 Language code has to be arranged

Language code has been arranged in
alphabetical order for given files.

Change-Id: Ib2ade0857bc5dd1a77348fbec470747abae4893e
Reviewed-on: https://gerrit.libreoffice.org/33661
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
index ed072ed..45c1acc 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
@@ -17,36 +17,36 @@
 #
 
 [PRODUCTCODE]
-en-US = "{0F961BE5-98E8-408E-9F74-23CBA0523922}"
-pt = "{2C127D50-B7E4-46C3-A845-CF6684481024}"
-ru = "{8B523028-4AAC-4607-9711-667AA6C37D45}"
+ar = "{FF72555B-A96D-49F8-8998-9359E9F9F7E1}"
+ca = "{9810C5F8-C061-4D02-AD98-049452A5DC76}"
+cs = "{781C904C-8768-4271-AA69-1A2CFA248002}"
+da = "{92CA37C8-B2E6-403F-932C-1A33E48BCD7E}"
+de = "{5014304D-99B3-4451-8EB3-97D34658E4E7}"
 el = "{F980E77E-21FD-40B8-BE66-8BC60284D24B}"
-nl = "{7FE69A49-6825-47E0-8179-72336E7B4250}"
-fr = "{3BB61EBF-5BC1-4E4D-859F-3ED5D92DD25E}"
+en-GB = "{DD0CE074-E875-4428-991B-A9B3734701F9}"
+en-US = "{0F961BE5-98E8-408E-9F74-23CBA0523922}"
 es = "{12A4616B-D51B-4013-964B-0ACCCA5E9AF2}"
+et = "{956362F1-C89B-4008-B15F-968BD4023F3F}"
 fi = "{89623507-9F44-44CF-BD4C-042F9E26F903}"
+fr = "{3BB61EBF-5BC1-4E4D-859F-3ED5D92DD25E}"
+he = "{F59C6731-12DA-4A46-BE6D-30934E7CD763}"
+hi = "{61B2E7EA-DC12-4A51-B152-2B95A4FC2ABF}"
 hu = "{2246FA05-4B7A-499B-A19E-AA6599EA28D0}"
-ca = "{9810C5F8-C061-4D02-AD98-049452A5DC76}"
 it = "{2F78D54B-CE1D-4607-AA5B-D52114BDEBDB}"
-cs = "{781C904C-8768-4271-AA69-1A2CFA248002}"
-sk = "{A1D39E12-FF85-4619-BC69-001C55AD5B35}"
-en-GB = "{DD0CE074-E875-4428-991B-A9B3734701F9}"
-da = "{92CA37C8-B2E6-403F-932C-1A33E48BCD7E}"
-sv = "{942C29ED-A013-436E-861C-28271FD60AAE}"
+ja = "{01C118C0-57AB-4745-8D4C-5A34E6677E8D}"
+ko = "{B0DEE1A7-88FC-423B-AA1F-F51D94D02996}"
+nl = "{7FE69A49-6825-47E0-8179-72336E7B4250}"
 no = "{0EF3EE40-3690-472E-A693-5C9AE4FA7D5A}"
 pl = "{2A7F7A26-EF8B-4990-8836-688508886215}"
-de = "{5014304D-99B3-4451-8EB3-97D34658E4E7}"
+pt = "{2C127D50-B7E4-46C3-A845-CF6684481024}"
 pt-BR = "{55837A64-5B73-4CDC-8950-AF56E09A7961}"
+ru = "{8B523028-4AAC-4607-9711-667AA6C37D45}"
+sk = "{A1D39E12-FF85-4619-BC69-001C55AD5B35}"
+sv = "{942C29ED-A013-436E-861C-28271FD60AAE}"
 th = "{2EEACF3C-C38E-4043-8B4D-33A461083348}"
-et = "{956362F1-C89B-4008-B15F-968BD4023F3F}"
-ja = "{01C118C0-57AB-4745-8D4C-5A34E6677E8D}"
-ko = "{B0DEE1A7-88FC-423B-AA1F-F51D94D02996}"
+tr = "{467D9E65-2614-4D19-B40F-0B12FE6E472F}"
 zh-CN = "{0C596167-BA94-4D5A-B63B-6566FE06259A}"
 zh-TW = "{C31C87A1-5918-4178-8696-DDD36EDAEE99}"
-tr = "{467D9E65-2614-4D19-B40F-0B12FE6E472F}"
-hi = "{61B2E7EA-DC12-4A51-B152-2B95A4FC2ABF}"
-ar = "{FF72555B-A96D-49F8-8998-9359E9F9F7E1}"
-he = "{F59C6731-12DA-4A46-BE6D-30934E7CD763}"
 multiwestern = "{FA30E08E-DD61-4E47-B3D6-51B2814CA881}"
 multiasia = "{222033CB-A588-4302-9942-311F160B63B1}"
 
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
index 477c091..3f5b6e9 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
@@ -17,36 +17,36 @@
 #
 
 [PRODUCTCODE]
-en-US = "{0FA6115B-EB2C-4878-AE77-A6BB9BD95DE3}"
-pt = "{5908E447-DD83-466C-989A-4DD73EEB9E1C}"
-ru = "{A2FA035D-6AD1-4A42-8C94-514862DDF9F1}"
+ar = "{11EDE09B-CE84-4042-B40D-09F3A9CF7484}"
+ca = "{A398A8FC-7E6B-45D0-9869-63D67B38AEEE}"
+cs = "{2288EAF3-AC96-4EE5-BEFB-1384DC1C4703}"
+da = "{DBF68601-B962-4B0F-8791-E91225E6AF4E}"
+de = "{5A5DE00E-D6F0-426E-A510-AFCD45564AFB}"
 el = "{ED03F985-453B-4C05-9D4F-5A5DABC5E383}"
-nl = "{3F832B47-935F-45D2-870F-59CBC55EBAF5}"
-fr = "{C96C5113-0A94-4D78-8B56-63335845A6DB}"
+en-GB = "{4840BF58-E8E1-4625-9F65-D7A6B26438C7}"
+en-US = "{0FA6115B-EB2C-4878-AE77-A6BB9BD95DE3}"
 es = "{00393DC6-C022-4013-85D6-7421431A1BBC}"
+et = "{5A742EFB-07B8-42AB-A451-60BBE2461102}"
 fi = "{B2414CEC-4AF1-4943-88F8-C5011A860483}"
+fr = "{C96C5113-0A94-4D78-8B56-63335845A6DB}"
+he

[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo

2014-05-03 Thread Markus Mohrhard 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt |2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt  |2 +-
 instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 20778b037c688759a4dc46acb8aeb66c9d1290cc
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun May 4 01:14:33 2014 +0200

fix windows packaging

Change-Id: I97b1d2432dadf7239a8500544f7e54b667ca4dfc

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
index 789a6d5..00b4810 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
@@ -112,7 +112,7 @@ CreateFolderComponent_  N   
Component   1   Identifier  Foreign key into the Compone
 CreateFolder   Directory_  N   Directory   1   
Identifier  Primary key, could be foreign key into the Directory 
table.
 CustomAction   Action  N   Identifier  
Primary key, name of action, normally appears in sequence table unless 
private use.
 CustomAction   Source  Y   CustomSource
The table reference of the source of the code.
-CustomAction   Target  Y   Formatted   
Execution parameter, depends on the type of custom action
+CustomAction   Target  Y   Formatted   
Excecution parameter, depends on the type of custom action
 CustomAction   TypeN   1   32767   
The numeric custom action type, consisting of source location, code type, 
entry, option flags.
 Dialog Attributes  Y   0   2147483647  
A 32-bit word that specifies the attribute flags to be applied to this 
dialog.
 Dialog Control_Cancel  Y   Control 2   Identifier  
Defines the cancel control. Hitting escape or clicking on the close 
icon on the dialog is equivalent to pushing this button.
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
index 4f3830d..d937499 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
@@ -111,7 +111,7 @@ CreateFolderComponent_  N   
Component   1   Identifier  Foreign key into the Compone
 CreateFolder   Directory_  N   Directory   1   
Identifier  Primary key, could be foreign key into the Directory 
table.
 CustomAction   Action  N   Identifier  
Primary key, name of action, normally appears in sequence table unless 
private use.
 CustomAction   Source  Y   CustomSource
The table reference of the source of the code.
-CustomAction   Target  Y   Formatted   
Execution parameter, depends on the type of custom action
+CustomAction   Target  Y   Formatted   
Excecution parameter, depends on the type of custom action
 CustomAction   TypeN   1   32767   
The numeric custom action type, consisting of source location, code type, 
entry, option flags.
 Dialog Attributes  Y   0   2147483647  
A 32-bit word that specifies the attribute flags to be applied to this 
dialog.
 Dialog Control_Cancel  Y   Control 2   Identifier  
Defines the cancel control. Hitting escape or clicking on the close 
icon on the dialog is equivalent to pushing this button.
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
index 789a6d5..00b4810 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
@@ -112,7 +112,7 @@ CreateFolderComponent_  N   
Component   1   Identifier  Foreign key into the Compone
 CreateFolder   Directory_  N   Directory   1   
Identifier  Primary key, could be foreign key into the Directory 
table.
 CustomAction   Action  N   Identifier  
Primary key, name of action, normally appears in sequence table unless 
private use.
 CustomAction   Source  Y

[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo

2013-10-02 Thread Andras Timar 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt |2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt  |2 +-
 instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fe6063a28b4d9bd922d6ced1b63914c54a17fc86
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Oct 2 06:11:05 2013 -0700

Media/LastSequence is i4, so it has to be 32767-65535 in _Validation table

Change-Id: Icfcd8c70da350e5b431d6ac802a34b35adf8035b

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
index e5f06c7..00b4810 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
@@ -216,7 +216,7 @@ LockPermissions UserN   
Formatted   User for permissions to be set.  (usually
 Media  Cabinet Y   Cabinet If some 
or all of the files stored on the media are compressed in a cabinet, the name 
of that cabinet.
 Media  DiskId  N   1   32767   Primary 
key, integer to determine sort order for table.
 Media  DiskPrompt  Y   Text
Disk name: the visible text actually printed on the disk.  This will be used to 
prompt the user when this disk needs to be inserted.
-Media  LastSequenceN   0   32767   
File sequence number for the last file for this media.
+Media  LastSequenceN   0   65535   
File sequence number for the last file for this media.
 Media  Source  Y   Property
The property defining the location of the cabinet file.
 Media  VolumeLabel Y   Text
The label attributed to the volume.
 MIME   CLSID   Y   Guid
Optional associated CLSID.
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
index c5945ae..d937499 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
@@ -215,7 +215,7 @@ LockPermissions UserN   
Formatted   User for permissions to be set.  (usually
 Media  Cabinet Y   Cabinet If some 
or all of the files stored on the media are compressed in a cabinet, the name 
of that cabinet.
 Media  DiskId  N   1   32767   Primary 
key, integer to determine sort order for table.
 Media  DiskPrompt  Y   Text
Disk name: the visible text actually printed on the disk.  This will be used to 
prompt the user when this disk needs to be inserted.
-Media  LastSequenceN   0   32767   
File sequence number for the last file for this media.
+Media  LastSequenceN   0   65535   
File sequence number for the last file for this media.
 Media  Source  Y   Property
The property defining the location of the cabinet file.
 Media  VolumeLabel Y   Text
The label attributed to the volume.
 MIME   CLSID   Y   Guid
Optional associated CLSID.
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
index e5f06c7..00b4810 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
@@ -216,7 +216,7 @@ LockPermissions UserN   
Formatted   User for permissions to be set.  (usually
 Media  Cabinet Y   Cabinet If some 
or all of the files stored on the media are compressed in a cabinet, the name 
of that cabinet.
 Media  DiskId  N   1   32767   Primary 
key, integer to determine sort order for table.
 Media  DiskPrompt  Y   Text
Disk name: the visible text actually printed on the disk.  This will be used to 
prompt the user when this disk needs to be inserted.
-Media  LastSequenceN   0   32767   
File sequence number for the last file for this media.
+Media  LastSequenceN   0

[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo

2013-09-21 Thread Andras Timar 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt |1 +
 instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt |1 +
 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt  |1 +
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt  |1 +
 instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt   |1 +
 instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt   |1 +
 6 files changed, 6 insertions(+)

New commits:
commit d5295408b1f69b8fd694dabca00e0a923c3e959f
Author: Andras Timar andras.ti...@collabora.com
Date:   Sat Sep 21 23:09:45 2013 +0200

fdo#58144 - disable the ARP 'Remove' button on Windows XP

Windows installer on Windows XP cannot display messages, when the
installer database is encoded in UTF-8 and support for CTL languages
is not installed. This patch is a workaround, it disables the 'Remove'
button in Control Panel's Add or Remove Programs applet, so the user
has to choose 'Change', and has to uninstall LibreOffice with the
Wizard, which does not exhibit the problem.

Initially this bug was not expected, when we changed the enconding
from legacy codepages to UTF-8 - I would say irreversibly.
Then the severity of the bug was underestimated, because usually
uninstallation needs no user interaction, so it does not matter,
if the text is unreadable. However, in some circumstances
uninstallation needs to reboot the computer, and the user needs
to understand the question, whether to reboot now or later.

Change-Id: I7d6b4e82cbe4142d23c29313e43a90fa43944b2f

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
index 997515a..aaf07ca 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
@@ -5,5 +5,6 @@ setAllUsersProfile2K51  ALLUSERSPROFILE 
[%ALLUSERSPROFILE]
 SetAllUsersProfileNT   51  ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
 setUserProfileNT   51  USERPROFILE [%USERPROFILE]
 SetARPInstallLocation  51  ARPINSTALLLOCATION  [INSTALLLOCATION]
+SetARPNoRemove 51  ARPNOREMOVE 1
 NewProductFound19  OOO_CUSTOMACTION_1
 SameProductFound   19  OOO_CUSTOMACTION_2
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
index 3d29abe..b30ebc2 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
@@ -53,6 +53,7 @@ RMCCPSearch   Not CCP_SUCCESS And CCP_TEST250
 SameProductFound   SAMEPRODUCTS120
 ScheduleReboot ISSCHEDULEREBOOT3125
 SetARPInstallLocation  990
+SetARPNoRemove VersionNT  600 995
 SetODBCFolders 550
 StartServices  VersionNT   2800
 StopServices   VersionNT   950
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index d582840..9372705 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -5,6 +5,7 @@ ISInitAllUsers  307 ALLUSERS1
 setAllUsersProfile 51  ALLUSERSPROFILE [%ALLUSERSPROFILE]
 setUserProfile 51  USERPROFILE [%USERPROFILE]
 SetARPInstallLocation  51  ARPINSTALLLOCATION  [INSTALLLOCATION]
+SetARPNoRemove 51  ARPNOREMOVE 1
 NewProductFound19  OOO_CUSTOMACTION_1
 SameProductFound   19  OOO_CUSTOMACTION_2
 WrongWindowsVersion19  OOO_CUSTOMACTION_4
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 62cb174..6dd5ede 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -54,6 +54,7 @@ RMCCPSearch   Not CCP_SUCCESS And CCP_TEST250
 SameProductFound   SAMEPRODUCTS120
 ScheduleReboot ISSCHEDULEREBOOT3125
 SetARPInstallLocation  990
+SetARPNoRemove VersionNT  600 995
 SetODBCFolders 550
 StartServices  VersionNT   2800
 StopServices   VersionNT   950
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt
index e787b93..04cde2a 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt
@@ -6,3 +6,4 @@ setAllUsersProfile2K51  ALLUSERSPROFILE 
[%ALLUSERSPROFILE]
 SetAllUsersProfileNT   51

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

2013-04-30 Thread Andras Timar 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |2 
 instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt   |2 
 instsetoo_native/util/openoffice.lst.in |4 
 scp2/source/ooo/windowscustomaction_ooo.scp |4 
 setup_native/source/win32/customactions/tools/checkversion.cxx  |   40 
-
 setup_native/source/win32/customactions/tools/seterror.hxx  |   10 -
 solenv/bin/modules/installer/windows/upgrade.pm |   80 
--
 8 files changed, 7 insertions(+), 137 deletions(-)

New commits:
commit 5b77c93b28b7f7b705617839eb72798568ce9f15
Author: Andras Timar ati...@suse.com
Date:   Thu Apr 25 01:54:20 2013 -0700

remove unused product variables from Windows installer

OLDPRODUCT2 - it was a workaround for OOo 1.9, obsolete
SAMEPRODUCTS - same product have the same ProductCode, so installer detect 
it
anyway under normal circumstances. It is possible that a tester/developer 
tries
to install the same version with different ProductCode over an existing 
installation
(e.g. dailyes or RCs). Then we are in trouble. However, SAMEPRODUCTS was 
not in use.
Moreover, Windows Installer uses only the first three fields of the product 
version.
So we cannot make difference between e.g. 4.0.3.1 and 4.0.3.2, and this is 
the new versioning
scheme.
BETAPRODUCTS - LibreOffice have never used different upgrade code 
(BETAUPGRADECODE) for betas.
OLDPRODUCTSPATCH, SAMEPRODUCTSPATCH, NEWPRODUCTSPATCH - related to old Star 
Division patching
mechanism, they were commented out anyway.
STUBPRODUCTS, STUBUPGRADECODE - these look useless

Change-Id: I77d67b72e18fa6b3ba4182b99e198c42f247cea4

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index b8a970c..9fc0421 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -40,7 +40,7 @@ ProgressType2 installed
 ProgressType3  installs
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS
 SetupType  Typical
 STR_NEW_DISPLAY_NAME   OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT   OOO_STR_EDIT
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 44d2c38..9923857 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -42,7 +42,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
index cdcaea4..8848ac8 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
@@ -41,7 +41,7 @@ ProgressType2 installed
 ProgressType3  installs
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties 
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS
 SetupType  Typical
 STR_NEW_DISPLAY_NAME   OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT   OOO_STR_EDIT
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 61d295b..ffef5c7 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -68,8 +68,6 @@ LibreOffice
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
 OOODOWNLOADNAME 1
-BETAUPGRADECODE
-STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 CHANGETARGETDIR 1
 PATCHCODEFILE ooo_patchcodes.txt
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
@@ -124,8 +122,6 @@ LibreOffice_Dev
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
 OOODOWNLOADNAME 1
-BETAUPGRADECODE
-STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 CHANGETARGETDIR 1
 PATCHCODEFILE ooodev_patchcodes.txt
 CODEFILENAME codes_ooodev.txt
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp