From 266250d9ccd3f6a89d85556ff66c30239f5def4f Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Tue, 8 Jun 2010 16:15:03 +0200 Subject: native309 #i111420# exchange of vcredist --- scp2/source/ooo/vc_redist.scp | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) (limited to 'scp2/source') diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 70c490d954f8..0b71511c7f0e 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -29,32 +29,9 @@ #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", "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) - Copy = "vcredist_x86_9.0.21022.218.exe"; + Copy = "vcredist_x86_9.0.30729.4148.exe"; #else Copy = "vcredist_x86.exe"; #endif @@ -63,7 +40,11 @@ ScpAction scp_Copy_vcredist_x86 End ScpAction scp_Copy_vcredist_x64 + #if defined(BUILD_SPECIAL) + Copy = "vcredist_x64_9.0.30729.4148.exe"; + #else Copy = "vcredist_x64.exe"; + #endif Name = "vcredist_x64.exe"; Subdir = "redist"; End -- cgit v1.2.3