diff options
| author | Ingo Schmidt <is@openoffice.org> | 2009-12-03 17:28:42 +0100 |
|---|---|---|
| committer | Ingo Schmidt <is@openoffice.org> | 2009-12-03 17:28:42 +0100 |
| commit | 0e1fee4e4454d449049fb5e4fa26fdf32b83df30 (patch) | |
| tree | 393c3a19fd89363812c9e22b9ac264dd8346d911 /scp2/source/ooo/vc_redist.scp | |
| parent | d087b17922d93ebf00fd6a9111f27e35173dc5fa (diff) | |
native273 #i106809# exchange mergemodules by redistributables
Diffstat (limited to 'scp2/source/ooo/vc_redist.scp')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 427f698bd467..88d15d9f0102 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 |