CWS-TOOLING: integrate CWS dv07

2009-02-12 13:22:37 +0100 dv  r267650 : #i94560# Removed string, which needed translation
2009-01-27 16:09:50 +0100 dv  r267004 : #i94560# Allow building without redistributable
2009-01-27 10:56:38 +0100 is  r266965 : #i98509# InstallOrder for extension module
2009-01-26 08:08:16 +0100 dv  r266899 : #i94560# Work around Windows Vista installation problems
2009-01-19 14:28:56 +0100 dv  r266498 : CWS-TOOLING: rebase CWS dv07 to trunk@266428 (milestone: DEV300:m39)
2009-01-19 09:56:07 +0100 dv  r266477 : #i94560# Added custom action to work around 'major upgrade' problem on Windows Vista
2009-01-19 09:54:30 +0100 dv  r266476 : #i94560# Added custom action to work around 'major upgrade' problem on Windows Vista
2009-01-19 09:13:06 +0100 dv  r266474 : #i94347# Changed LaunchCondition from AdminUser to Privileged
2008-12-18 08:42:04 +0100 dv  r265662 : #i97201# remove old release notes when notified about updates
2008-12-15 14:50:33 +0100 dv  r265501 : #i96844# Use fputs instead of fprintf

3 files changed, 73 insertions, 2 deletions

diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 766ce6fdf681..18828834ea16 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -242,6 +242,10 @@ SCPDEFS+=-DSYSTEM_PYTHON
 SCPDEFS+=-DENABLE_SVCTAGS
 .ENDIF
 
+.IF "$(WITH_VC_REDIST)" == "TRUE"
+SCPDEFS+=-DWITH_VC_REDIST
+.ENDIF
+
 SCP_PRODUCT_TYPE=osl
 
 ICUVERSION_DEPENDENT_FILES= \
@@ -287,6 +291,7 @@ PARFILES +=                        \
         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
new file mode 100644
index 000000000000..afbbd452517f
--- /dev/null
+++ b/scp2/source/ooo/vc_redist.scp
@@ -0,0 +1,48 @@
+/*************************************************************************

+*

+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

+ * 

+ * Copyright 2009 by Sun Microsystems, Inc.

+ *

+ * OpenOffice.org - a multi-platform office productivity suite

+ *

+ * $RCSfile: vc_redist.scp,v $

+ *

+ * This file is part of OpenOffice.org.

+ *

+ * OpenOffice.org is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU Lesser General Public License version 3

+ * only, as published by the Free Software Foundation.

+ *

+ * OpenOffice.org is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU Lesser General Public License version 3 for more details

+ * (a copy is included in the LICENSE file that accompanied this code).

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * version 3 along with OpenOffice.org.  If not, see

+ * <http://www.openoffice.org/license.html>

+ * for a copy of the LGPLv3 License.

+ *

+************************************************************************/

+

+#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

+

+ScpAction scp_Copy_vcredist_x86

+    Copy = "vcredist_x86.exe";

+    Name = "vcredist_x86.exe";

+    Subdir = "redist";

+End

+#endif

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 257835bbd9e9..44130af0664c 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -30,6 +30,24 @@
 
 #include "macros.inc"
 
+WindowsCustomAction gid_Customaction_RenamePrgFolder
+	Name = "RenamePrgFolder";
+	Typ = "1";
+	Source = "shlxtmsi.dll";
+	Target = "RenamePrgFolder";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID");
+End
+
+WindowsCustomAction gid_Customaction_RemovePrgFolder
+	Name = "RemovePrgFolder";
+	Typ = "1";
+	Source = "shlxtmsi.dll";
+	Target = "RemovePrgFolder";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "end");
+End
+
 WindowsCustomAction gid_Customaction_Regallmsdocdll
 	Name = "Regallmsdocdll";
 	Typ = "65";
@@ -81,7 +99,7 @@ WindowsCustomAction gid_Customaction_sdqsmsidll
 	Source = "sdqsmsi.dll";
 	Target = "ShutDownQuickstarter";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "InstallInitialize");
+	Assignment1 = ("InstallExecuteSequence", "", "IsOfficeRunning");
 End
 
 WindowsCustomAction gid_Customaction_qslnkmsidll
@@ -348,7 +366,7 @@ WindowsCustomAction gid_Customaction_Full_Isofficerunning
 	Source = "shlxtmsi.dll";
 	Target = "IsOfficeRunning";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "PATCH", "RunningOffice");
+	Assignment1 = ("InstallExecuteSequence", "", "RunningOffice");
 End
 
 WindowsCustomAction gid_Customaction_Langpack_Isofficerunning