[ooo-build-commit] bin/unpack

[Tor Lillqvist]

 bin/unpack |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit b3ae3d0de4f5db8324b1fedfcdbfb255949c6142
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Sep 11 01:23:13 2009 +0300

    More VC80 CRT stuff
    
    Presumably should handle the VC80 CRT like the VC90 one used by OOo
    itself, i.e. by including its merge module instead of the DLLs and
    manifests individually. But let's try just this for now.

diff --git a/bin/unpack b/bin/unpack
index ea894f5..dfd5ed6 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -488,6 +488,16 @@ if test "z$BUILD_WIN32" != "z"; then
 	echo "done";
     fi
 
+    if test -f $OOBUILDDIR/external/msvcp80/msvcr80.dll -a \
+            -f $OOBUILDDIR/external/msvcp80/msvcp80.dll -a \
+            -f $OOBUILDDIR/external/msvcp80/Microsoft.VC80.CRT.manifest; then
+	echo "Already have msvcr80.dll, msvcp80.dll and Microsoft.VC80.CRT.manifest"
+    else
+	$GNUCP -p $SRCDIR/msvcr80.dll $OOBUILDDIR/external/msvcp80
+	$GNUCP -p $SRCDIR/msvcp80.dll $OOBUILDDIR/external/msvcp80
+	$GNUCP -p $SRCDIR/Microsoft.VC80.CRT.manifest $OOBUILDDIR/external/msvcp80
+    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"