From 66ce41fc33019af420cc87d41ed7cc8c010a6915 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Thu, 7 May 2009 23:07:40 +0200
Subject: [PATCH] generate zip files on Windows and OS X when packaging NDK
 releases

---
 ndk/build/tools/make-release.sh | 34 +++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/ndk/build/tools/make-release.sh b/ndk/build/tools/make-release.sh
index cc79d3c83..a6c228c9e 100755
--- a/ndk/build/tools/make-release.sh
+++ b/ndk/build/tools/make-release.sh
@@ -56,19 +56,37 @@ for SYSTEM in $PREBUILT_SYSTEMS; do
         echo "Could not copy reference. Aborting."
         exit 2
     fi
+
     echo "Unpacking $PREBUILT.tar.bz2"
-    (cd $DSTDIR && tar xjf $PREBUILT.tar.bz2)
+    (cd $DSTDIR && tar xjf $PREBUILT.tar.bz2) 2>/dev/null 1>&2
     if [ $? != 0 ] ; then
         echo "Could not unpack prebuilt for system $SYSTEM. Aborting."
         exit 1
     fi
-    echo "Creating $BIN_RELEASE.tar.bz2"
-    (cd $TMPDIR && tar cjf $BIN_RELEASE.tar.bz2 $RELEASE_PREFIX && rm -rf $DSTDIR)
-    if [ $? != 0 ] ; then
-        echo "Could not create archive. Aborting."
-        exit 1
-    fi
-    chmod a+r $TMPDIR/$BIN_RELEASE.tar.bz2
+
+    case $SYSTEM in
+        # prefer zip format for windows and darwin
+        windows|darwin-*)
+            ARCHIVE=$BIN_RELEASE.zip
+            echo "Creating $ARCHIVE"
+            (cd $TMPDIR && zip -9qr $ARCHIVE $RELEASE_PREFIX && rm -rf $DSTDIR) 2>/dev/null 1>&2
+            if [ $? != 0 ] ; then
+                echo "Could not create zip archive. Aborting."
+                exit 1
+            fi
+            ;;
+        # or tar.bz2 for others
+        *)
+            ARCHIVE=$BIN_RELEASE.tar.bz2
+            echo "Creating $ARCHIVE"
+            (cd $TMPDIR && tar cjf $ARCHIVE $RELEASE_PREFIX && rm -rf $DSTDIR) 2>/dev/null 1>&2
+            if [ $? != 0 ] ; then
+                echo "Could not create archive. Aborting."
+                exit 1
+            fi
+            ;;
+    esac
+    chmod a+r $TMPDIR/$ARCHIVE
 done
 
 echo "Cleaning up."