Merge branch 'master' of git://cadel.mutabah.net/acess2

[tpg/acess2.git] / MakeReleaseSet

diff --git a/MakeReleaseSet b/MakeReleaseSet
index e3d7532..83d5fe8 100755 (executable)
--- a/MakeReleaseSet
+++ b/MakeReleaseSet
@@ -8,8 +8,10 @@ fi
 
 if [ $# -ge 2 ]; then
        PLATFORM=$2
+       PSUFFIX=-$2
 else
        PLATFORM=default
+       PSUFFIX=""
 fi
 
 mkdir -p Releases/
@@ -18,8 +20,9 @@ while [ $# -ge 2 ]; do
        BUILD_DIST=y ARCH=$ARCH PLATFORM=$2 make
        shift
 done
-tar --transform="s|Dist/($ARCH/)*|Acess/|x" -zcf Releases/Acess2_latest_${ARCH}_bin.tar.gz Dist/$ARCH Dist/Acess2.$ARCH.gz
-mdeltree b:/Acess2 2>&1 >/dev/null || true
-mcopy -s Dist/$ARCH/ b:/Acess2
-mcopy Dist/Acess2* b:/Acess2/Acess2.gz
-gzip -c AcessRelease.img > Releases/Acess2_latest_${ARCH}.img.gz
+tar --transform="s|Dist/($ARCH/)*|Acess/|x" -zcf Releases/Acess2_latest_${ARCH}$PSUFFIX_bin.tar.gz Dist/$ARCH Dist/Acess2.$ARCH$PSUFFIX.gz
+IMGNAME=AcessRelease.img
+./Tools/BootFloppy/MakeDiskImage $IMGNAME
+mcopy -i $IMGNAME -s Dist/$ARCH/ ::/Acess2
+mcopy -i $IMGNAME Dist/Acess2.$ARCH$PSUFFIX.gz ::/Acess2/Acess2.gz
+gzip -c AcessRelease.img > Releases/Acess2_latest_${ARCH}$PSUFFIX.img.gz