native273 #i106809# exchange mergemodules by redistributables

5 files changed, 24 insertions, 5 deletions

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
index f4da77d0d..20f2a60dd 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
@@ -1,3 +1,4 @@
 [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 = "Please use the file setup.exe to start the installation."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
index 35d78694a..c53ccda8d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
@@ -2,3 +2,4 @@ Condition	Description
 s255	l255
 WINDOWSENCODINGTEMPLATE	LaunchCondition	Condition
 Privileged	OOO_LAUNCH_1
+SETUP_USED=1 Or Installed	OOO_LAUNCH_2
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 0d85cc529..b7183112d 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -293,7 +293,6 @@ PARFILES +=                        \
         folder_ooo.par             \
         folderitem_ooo.par         \
         registryitem_ooo.par       \
-        mergemodules_ooo.par       \
         vc_redist.par              \
         windowscustomaction_ooo.par
 .ENDIF
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 427f698bd..88d15d9f0 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -30,6 +30,7 @@
 #include "macros.inc"
 
 #if defined(WITH_VC_REDIST)
+
 WindowsCustomAction gid_Customaction_InstallRuntime
 	Name = "InstallRuntime";
 	Typ = "98";
@@ -37,7 +38,19 @@ WindowsCustomAction gid_Customaction_InstallRuntime
 	Target = "[SourceDir]redist\vcredist_x86.exe /qb";
 	Inbinarytable = 0;
     Styles = (NO_FILE);
-	Assignment1 = ("InstallUISequence", "VersionNT >= 600 and VersionNT < 700 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction");
+	Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction");
+	// Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "FileCost");
+End
+
+WindowsCustomAction gid_Customaction_InstallRuntime_X64
+	Name = "InstallRuntimeX64";
+	Typ = "98";
+	Source = "SystemFolder";
+	Target = "[SourceDir]redist\vcredist_x64.exe /qb";
+	Inbinarytable = 0;
+    Styles = (NO_FILE);
+	Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction");
+	// Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "FileCost");
 End
 
 ScpAction scp_Copy_vcredist_x86
@@ -49,4 +62,11 @@ ScpAction scp_Copy_vcredist_x86
     Name = "vcredist_x86.exe";
     Subdir = "redist";
 End
+
+ScpAction scp_Copy_vcredist_x64
+    Copy = "vcredist_x64.exe";
+    Name = "vcredist_x64.exe";
+    Subdir = "redist";
+End
+
 #endif
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 9ba398eff..bafca8386 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -129,7 +129,6 @@ SCP1FILES +=                           \
              folder_ooo.par            \
              folderitem_ooo.par        \
              windowscustomaction_ooo.par \
-             mergemodules_ooo.par      \
              vc_redist.par             \
              registryitem_writer.par   \
              folderitem_writer.par     \
@@ -283,7 +282,6 @@ SCP2FILES +=                           \
              folder_ooo.par            \
              folderitem_ooo.par        \
              windowscustomaction_ooo.par \
-             mergemodules_ooo.par      \
              vc_redist.par             \
              registryitem_writer.par   \
              folderitem_writer.par     \