[Libreoffice-commits] .: 3 commits - bin/unpack download.in

[Tor Lillqvist]

 bin/unpack  |   20 +-------------------
 download.in |    3 ---
 2 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit bab6273bae8b07f5526fdabcbea75f06dda5d259
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Dec 21 17:02:20 2010 +0200

    Instmsiw.exe doesn't seem to need Genuine Windows validation any more

diff --git a/bin/unpack b/bin/unpack
index e91af0a..93043a1 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -176,9 +176,7 @@ if test "z$BUILD_WIN32" != "z"; then
 	echo "missing"
 	echo "Get it from the Microsoft site and put it into $SRCDIR."
 	echo "You may have to search Microsoft's website."
-	echo "Last time it was seen at: http://www.microsoft.com/downloads/details.aspx?familyid=4B6140F9-2D36-4977-8FA1-6F8A0F5DCA8F&displaylang=en"
-	echo "Note that the download requires Genuine Windows validation"
-	echo "and can't easily be automated."
+	echo "Last time it was seen at: http://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe"
 	exit 1
     fi
 
commit f2d5012dfbae6a74ab3a352f3af67d3b50b45232
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Dec 21 17:00:28 2010 +0200

    Don't bother with msvcr71.dll
    
    See fdo#32426.

diff --git a/bin/unpack b/bin/unpack
index d824c8c..e91af0a 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -164,22 +164,6 @@ if test "z$BUILD_WIN32" != "z"; then
 	fi
     done
 
-     # msvcr71.dll that JRE needs
-     for F in msvcr71.dll; do
- 	$echo_n "Looking for $SRCDIR/$F ...  $echo_c"
- 	if test -f $SRCDIR/$F; then
- 	    echo "ok"
- 	elif test -f "$WINDIR/system32/$F"; then
- 	    echo "missing, but copied from $WINDIR/system32"
- 	    cp "$WINDIR/system32/$F" $SRCDIR
- 	else
- 	    echo "missing"
- 	    echo "You can find it in MSVS .NET 2003."
- 	    echo "It is needed by JRE"
- 	    exit 1
- 	fi
-     done
- 
     # instmsiw.exe is the installer for Windows Installer 2.0 for
     # Windows NT 4 and Windows 2000 that nobody really needs
     # (I hope). But the installer-builder insists on including it
commit f266d560eeeff910e4b637a5b99b497117a046e4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Dec 21 16:58:56 2010 +0200

    Don't download instmsia.exe

diff --git a/download.in b/download.in
index 27177ca..5d1963f 100755
--- a/download.in
+++ b/download.in
@@ -153,7 +153,6 @@ sub download_tests_dependencies() {
 # Win32 bits:
     # from http://www.microsoft.com/downloads/release.asp?releaseid=30682'
     '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',
@@ -437,8 +436,6 @@ if ('@BUILD_WIN32@' ne '')
 {
     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( 'vcredist_x86.exe' );
     source_file( 'vcredist_x64.exe' );