[ooo-build-commit] .: download.in

[Fridrich Strba]

 download.in |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 44948e65657c9945d6ef1e68aa2b54ad5af6cbec
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Oct 5 16:18:46 2010 +0200

    Download the VS2008SP1 redist if building on Windows

diff --git a/download.in b/download.in
index 4064aa2..8d7e3b9 100755
--- a/download.in
+++ b/download.in
@@ -139,6 +139,8 @@ sub download_tests_dependencies() {
     'dbghinst\.EXE'                      => 'http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.1/W9XNT4/EN-US',
     'instmsia.exe'                       => 'http://download.microsoft.com/download/WindowsInstaller/Install/2.0/W9XMe/EN-US',
     'instmsiw.exe'                       => 'http://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US',
+	'vcredist_x86.exe'                   => 'http://download.microsoft.com/download/d/d/9/dd9a82d0-52ef-40db-8dab-795376989c03',
+	'vcredist_x64.exe'                   => 'http://download.microsoft.com/download/2/d/6/2d61c766-107b-409d-8fba-c39e61ca08e8',
     '5_11_98Odma20\.zip'                 => '@MIRROR@/support',
     'openclipart-.*'                     => 'http://www.openclipart.org/downloads/@OPENCLIPART_VER@',
 #Update fonts:
@@ -402,17 +404,23 @@ if ($download_all && '@BUILD_WIN32@' eq '')
     source_file( '@BUILD_MOZILLA_SOURCE@' );
 }
 
-# Misc. bits for Win32
 if ('@BUILD_WIN32@' ne '' || '@DISTRO@' eq 'LibreOfficeLinux'
       || '@DISTRO@' eq 'LibreOfficeWin32' || '@DISTRO@' eq 'LibreOfficeMacOSX')
 {
+    source_file( '@APACHE_ANT_TARBALL@' );
+}
+
+# Misc. bits for Win32
+if ('@BUILD_WIN32@' ne '')
+{
     source_file( 'unicows.exe' ) unless '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
     source_file( 'dbghinst.EXE' );
     source_file( 'instmsiw.exe' );
     source_file( 'instmsia.exe' ) unless '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
     # instmsiw.exe can't be downloaded without Genuine Windows validation
 
-    source_file( '@APACHE_ANT_TARBALL@' );
+    source_file( 'vcredist_x86.exe' );
+    source_file( 'vcredist_x64.exe' );
 
 # Comment out the Mozilla source bits until we can compile it
 # with MSVS2008