[ooo-build-commit] bin/unpack

[Tor Lillqvist]

 bin/unpack |   28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

New commits:
commit daf7be90a824ba82c97f36833206efbce78f968d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 19:57:49 2009 +0300

    Tweak Windows build
    
    * bin/unpack: Let's try not to unpack the l10n tarball always on
      Windows. As the prebuilt Mozilla DLLs for 3.2 are linked to
      msvcr80.dll, no need to look for and copy msvc?71.dll. Let's see
      what the Mozilla DLLs actually need once the build can proceed as
      far as to actually producing an installer...

diff --git a/bin/unpack b/bin/unpack
index 8b04ee6..062d837 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -80,7 +80,7 @@ if test "z$OOO_GIT" = "z" ; then
 	else
 	    CORE_PKGS=$ALL_CORE_PKGS
 	fi
-	if test \( "z$OOO_LANGS" != "z" -a "z$OOO_LANGS" != "zen-US" \) -o "z$BUILD_WIN32" != "z"; then
+	if test "z$OOO_LANGS" != "z" -a "z$OOO_LANGS" != "zen-US"; then
 	    CORE_PKGS="$CORE_PKGS l10n"
 	fi
 	for pkg in $CORE_PKGS; do
@@ -131,24 +131,6 @@ if test "z$BUILD_WIN32" != "z"; then
     check_file $SRCDIR/WNTMSCIlib.zip
     check_file $SRCDIR/WNTMSCIruntime.zip
 
-    # msvc?71.dll that the prebuilt Mozilla needs and the
-    # installer-builder wants to put in the installer
-    for F in msvcr71.dll msvcp71.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 the prebuilt Mozilla binaries that you have to use"
-	    echo "because Mozilla 1.7.5 can't be built with MSVS 2005."
-	    exit 1
-	fi
-    done
-
     # instmsi?.exe are the installers for Windows Installer 2.0 for
     # Win9x, Windows NT 4 and Windows 2000, that nobody really needs
     # (I hope). But the installer-builder insists on including them
@@ -492,14 +474,6 @@ if test "z$BUILD_WIN32" != "z"; then
 	echo "done";
     fi
 
-    if test -f $OOBUILDDIR/external/msvcp71/msvcr71.dll -a \
-            -f $OOBUILDDIR/external/msvcp71/msvcp71.dll; then
-	echo "Already have msvcr71.dll and msvcp71.dll"
-    else
-	$GNUCP -p $SRCDIR/msvcr71.dll $OOBUILDDIR/external/msvcp71
-	$GNUCP -p $SRCDIR/msvcp71.dll $OOBUILDDIR/external/msvcp71
-    fi
-
     if test -f $OOBUILDDIR/external/msm90/Microsoft_VC90_CRT_x86.msm -a \
             -f $OOBUILDDIR/external/msm90policy_9_0_Microsoft_VC90_CRT_x86.msm; then
 	echo "Already have Microsoft_VC90_CRT_x86.msm and policy_9_0_Microsoft_VC90_CRT_x86.msm"