diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 13:37:43 +0100 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 13:37:43 +0100 |
| commit | 443c59cebfdf56f95e872d0e5c9d7618dc017a83 (patch) | |
| tree | 8acb9e922954ab37a0f0f1396b7b4655eb0e07f8 /scp2/source/ooo/vc_redist.scp | |
| parent | f36fb10b092bf2c7f675bdcd5caa803a0b9146d2 (diff) | |
| parent | bc2a5e97b5d2400087baa2af4f8c30adfc48c3df (diff) | |
CWS-TOOLING: integrate CWS native273
Diffstat (limited to 'scp2/source/ooo/vc_redist.scp')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index cefdd69ce034..b7e6e81dc331 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/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 |