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

[Tor Lillqvist]

 bin/unpack  |   22 ----------------------
 download.in |    2 --
 2 files changed, 24 deletions(-)

New commits:
commit 3e50ab06302101ffdaf8c9c21efdbbbbeab65cf2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Dec 21 18:51:21 2010 +0200

    Actually we don't seem to need instmsiw.exe anywhere

diff --git a/bin/unpack b/bin/unpack
index 93043a1..a994bec 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -164,22 +164,6 @@ if test "z$BUILD_WIN32" != "z"; then
 	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
-    # with the installer.
-
-    $echo_n "Looking for $SRCDIR/instmsiw.exe ... $echo_c"
-    if test -f $SRCDIR/instmsiw.exe; then
-	echo "ok"
-    else
-	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://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe"
-	exit 1
-    fi
-
     $echo_n "Looking for $SRCDIR/gdiplus.dll ... $echo_c"
     if test -f $SRCDIR/gdiplus.dll; then
 	echo "ok"
@@ -544,12 +528,6 @@ if test "z$BUILD_WIN32" != "z"; then
 	exit 1
     fi
  
-   if test -f $OOBUILDDIR/external/msi/instmsiw.exe; then
-	echo "Already have instmsiw.exe"
-    else
-	cp $SRCDIR/instmsiw.exe $OOBUILDDIR/external/msi
-    fi
-
     case "$DISTRO" in
         NovellWin32*)
             if test -f $SRCDIR/$AGFA_MONOTYPE_FONTS_SOURCE; then
diff --git a/download.in b/download.in
index 5d1963f..2bdff68 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',
-    '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',
@@ -435,7 +434,6 @@ if ('@BUILD_WIN32@' || $requires_ant{@DISTRO@})
 if ('@BUILD_WIN32@' ne '')
 {
     source_file( 'dbghinst.EXE' );
-    source_file( 'instmsiw.exe' );
 
     source_file( 'vcredist_x86.exe' );
     source_file( 'vcredist_x64.exe' );