[ooo-build-commit] .: bin/unpack

Tor Lillqvist tml at kemper.freedesktop.org
Thu Oct 7 05:24:46 PDT 2010


 bin/unpack |   21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

New commits:
commit 8c07d3041c7cbbac00e2dd6ca0a2093b52e620c1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 7 15:23:44 2010 +0300

    Don't bother with instmsia.exe
    
    We don't need that in any brand of Windows build, surely.

diff --git a/bin/unpack b/bin/unpack
index 2f1fd77..a977e9d 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -176,13 +176,7 @@ if test "z$BUILD_WIN32" != "z"; then
     # Win9x, Windows NT 4 and Windows 2000, that nobody really needs
     # (I hope). But the installer-builder insists on including them
     # with the installer.
-    case "$DISTRO" in
-	NovellWin32*|GoOoWin32*)
-	    ;;
-	*)
-	    check_file $SRCDIR/instmsia.exe
-	    ;;
-    esac
+
     $echo_n "Looking for $SRCDIR/instmsiw.exe ... $echo_c"
     if test -f $SRCDIR/instmsiw.exe; then
 	echo "ok"
@@ -575,19 +569,6 @@ if test "z$BUILD_WIN32" != "z"; then
 	$GNUCP $SRCDIR/instmsiw.exe $OOBUILDDIR/external/msi
     fi
 
-    case "$DISTRO" in
-	NovellWin32*|GoOoWin32*)
-	    ;;
-	*)
-	    if test -f $OOBUILDDIR/external/msi/instmsia.exe; then
-		 echo "Already have instmsia.exe"
-	    else
-		 $GNUCP -p $SRCDIR/instmsia.exe $OOBUILDDIR/external/msi
-		 chmod a+x $OOBUILDDIR/external/msi/instmsia.exe
-	    fi
-	    ;;
-    esac
-	    
     if test -f $SRCDIR/$AGFA_MONOTYPE_FONTS_SOURCE; then
 	agfa_md5=`md5sum $SRCDIR/$AGFA_MONOTYPE_FONTS_SOURCE | cut -d' ' -f1`
         if test -f $OOBUILDDIR/agfa_monotype_fonts/download/${agfa_md5}-agfa-monotype-fonts.tar.gz; then


More information about the ooo-build-commit mailing list