CWS-TOOLING: integrate CWS native273

instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf

 [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."

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

scp2/source/ooo/makefile.mk

@@ -301,7 +301,6 @@ PARFILES +=                        \
         folder_ooo.par             \
         folderitem_ooo.par         \
         registryitem_ooo.par       \
-        mergemodules_ooo.par       \
         vc_redist.par              \
         windowscustomaction_ooo.par
 .ENDIF

scp2/source/ooo/vc_redist.scp

@@ -30,25 +30,29 @@
 #include "macros.inc"
 
 #if defined(WITH_VC_REDIST)
-WindowsCustomAction gid_Customaction_InstallRuntime
-	Name = "InstallRuntime";
-	Typ = "98";
-	Source = "SystemFolder";
-	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");
-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");
-End
+// WindowsCustomAction gid_Customaction_InstallRuntime
+//	Name = "InstallRuntime";
+//	Typ = "98";
+//	Source = "SystemFolder";
+//	Target = "[SourceDir]redist\vcredist_x86.exe /qb";
+//	Inbinarytable = 0;
+//    Styles = (NO_FILE);
+//	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
   #if defined(BUILD_SPECIAL)
@@ -65,4 +69,5 @@ ScpAction scp_Copy_vcredist_x64
     Name = "vcredist_x64.exe";
     Subdir = "redist";
 End
+
 #endif

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     \