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

Fridrich Strba fridrich at kemper.freedesktop.org
Wed Oct 6 06:19:01 PDT 2010


 bin/unpack |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 5731c0d56a7d08ffa6d2fa77ae3df80e31882de9
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Oct 6 15:05:35 2010 +0200

    Actually copy the vcredist*.exe binaries to their place

diff --git a/bin/unpack b/bin/unpack
index a22e9a5..61cdb61 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -401,9 +401,23 @@ if test "z$BUILD_WIN32" != "z"; then
 
     # gdiplus.dll
     if test -f $OOBUILDDIR/external/gdiplus/gdiplus.dll; then
-    	echo "Already have gdiplus.dll"
+        echo "Already have gdiplus.dll"
     else
-	$GNUCP -p $SRCDIR/gdiplus.dll $OOBUILDDIR/external/gdiplus/gdiplus.dll
+        $GNUCP -p $SRCDIR/gdiplus.dll $OOBUILDDIR/external/gdiplus/gdiplus.dll
+    fi
+
+    # vcredist_x86.exe
+    if test -f $OOBUILDDIR/external/vcredist/vcredist_x86.exe; then
+        echo "Already have vcredist_x86.exe"
+    else
+        $GNUCP -p $SRCDIR/vcredist_x86.exe $OOBUILDDIR/external/vcredist/vcredist_x86.exe
+    fi
+
+    # vcredist_x64.exe
+    if test -f $OOBUILDDIR/external/vcredist/vcredist_x64.exe; then
+        echo "Already have vcredist_x86.exe"
+    else
+        $GNUCP -p $SRCDIR/vcredist_x64.exe $OOBUILDDIR/external/vcredist/vcredist_x64.exe
     fi
 
     # dbghelp


More information about the ooo-build-commit mailing list