From faee1d05c671a0581ad64c0b946badfdb2ef9fa9 Mon Sep 17 00:00:00 2001
From: kimu_shu <alfvegardrisc@gmail.com>
Date: Wed, 21 Aug 2019 05:29:28 +0000
Subject: [PATCH] Improve packaging

---
 package.sh            | 15 ++++++++++-----
 platform/nios2/.pack  | 10 +++++++---
 platform/pic32m/.pack | 10 +++++++---
 platform/zynq/.pack   | 11 ++++++++---
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/package.sh b/package.sh
index 09b272f..bcfda1b 100755
--- a/package.sh
+++ b/package.sh
@@ -11,11 +11,16 @@ for pack in platform/*/.pack; do
 	pdir=$(dirname $pack)
 	name=$(basename $pdir)
 	echo "Packaging $name ..."
-	rm -rf $top/$ddir/$name
-	rsync -a $top/$pdir --exclude .pack $top/$ddir/
-	cd $top/$ddir/$name
-	bash -e $top/$pdir/.pack
+	export DEST_DIR=$top/$ddir/$name
+	rm -rf $DEST_DIR
+	mkdir $DEST_DIR
+	cd $top/$pdir
+	bash -e .pack
+	cd $DEST_DIR
 	out=$ddir/tinythreads-$name-$tag.tar.gz
-	tar czf $top/$out *
+	tar czf $top/$out --group=0 --owner=0 *
+	echo " => $out"
+	out=$ddir/tinythreads-$name-$tag.zip
+	zip -rq $top/$out *
 	echo " => $out"
 done
diff --git a/platform/nios2/.pack b/platform/nios2/.pack
index 32b632a..8df2a24 100644
--- a/platform/nios2/.pack
+++ b/platform/nios2/.pack
@@ -1,3 +1,7 @@
-rsync -a $SRC_DIR/ TINYTH/src/
-rsync -a $INC_DIR/ TINYTH/inc/
-rsync -a $DOCS ./
+# Packaging script for NiosII platform
+OUT=$DEST_DIR/tinythreads
+mkdir $OUT
+rsync -a ./ $OUT/
+rsync -a $SRC_DIR/ $OUT/TINYTH/src/
+rsync -a $INC_DIR/ $OUT/TINYTH/inc/
+rsync -a $DOCS $OUT/
diff --git a/platform/pic32m/.pack b/platform/pic32m/.pack
index 32b632a..6b6db1e 100644
--- a/platform/pic32m/.pack
+++ b/platform/pic32m/.pack
@@ -1,3 +1,7 @@
-rsync -a $SRC_DIR/ TINYTH/src/
-rsync -a $INC_DIR/ TINYTH/inc/
-rsync -a $DOCS ./
+# Packaging script for PIC32M platform
+OUT=$DEST_DIR/tinythreads
+mkdir $OUT
+rsync -a ./ $OUT/
+rsync -a $SRC_DIR/ $OUT/TINYTH/src/
+rsync -a $INC_DIR/ $OUT/TINYTH/inc/
+rsync -a $DOCS $OUT/
diff --git a/platform/zynq/.pack b/platform/zynq/.pack
index 37bbc47..35552ec 100644
--- a/platform/zynq/.pack
+++ b/platform/zynq/.pack
@@ -1,3 +1,8 @@
-rsync -a $SRC_DIR/ src/
-rsync -a $INC_DIR/ src/
-rsync -a $DOCS ./
+# Packaging script for Zynq platform
+VER=$(sed -ne 's/^OPTION VERSION = \([0-9]\+\)\.\([0-9]\+\);$/v\1_\2/p' data/tinythreads.mld)
+OUT=$DEST_DIR/tinythreads_$VER
+mkdir $OUT
+rsync -a ./ $OUT/
+rsync -a $SRC_DIR/ $OUT/src/
+rsync -a $INC_DIR/ $OUT/src/
+rsync -a $DOCS $OUT/
\ No newline at end of file