MakeReleaseSet - Fixing up script

diff --git a/MakeReleaseSet b/MakeReleaseSet
index e3d7532..4553a00 100755 (executable)
--- a/MakeReleaseSet
+++ b/MakeReleaseSet
@@ -19,7 +19,8 @@ while [ $# -ge 2 ]; do
        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
+IMGNAME=AcessRelease.img
+./Tools/BootFloppy/MakeDiskImage $IMGNAME
+mcopy -i $IMGNAME -s Dist/$ARCH/ ::/Acess2
+mcopy -i $IMGNAME Dist/Acess2* ::/Acess2/Acess2.gz
 gzip -c AcessRelease.img > Releases/Acess2_latest_${ARCH}.img.gz

diff --git a/Makefile.cfg b/Makefile.cfg
index 3ec9975..022a02e 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -64,3 +64,10 @@ MODULES += Input/Keyboard Input/Mouse
 MODULES += IPStack     # So the other modules are loaded before it
 #DYNMODS := USB/Core
 #DYNMODS += Filesystems/InitRD
+
+# BUILD_DIST=y - Install to ./Dist
+ifneq ($(BUILD_DIST),)
+       DISTROOT := $(ACESSDIR)/Dist
+       xCP := cp
+       xMKDIR := mkdir -p
+endif

diff --git a/Tools/BootFloppy/MakeDiskImage b/Tools/BootFloppy/MakeDiskImage
index 4412afb..7a45556 100755 (executable)
--- a/Tools/BootFloppy/MakeDiskImage
+++ b/Tools/BootFloppy/MakeDiskImage
@@ -3,12 +3,13 @@ if [[ $# -ne 1 ]]; then
        echo "Usage: $0 <image>" >&2
        exit 1
 fi
+DIR=`dirname $0`
 IMGNAME=$1
 dd if=/dev/zero of="$IMGNAME" bs=512 count=2880
 mformat -i "$IMGNAME" ::/ -f 1440 -v Acess
-dd if=stage1 bs=1 seek=0 count=3 "of=$IMGNAME" conv=notrunc
-dd if=stage1 bs=1 skip=$((0x3E)) seek=$((0x3E)) "of=$IMGNAME" conv=notrunc
+dd if=$DIR/stage1 bs=1 seek=0 count=3 "of=$IMGNAME" conv=notrunc
+dd if=$DIR/stage1 bs=1 skip=$((0x3E)) seek=$((0x3E)) "of=$IMGNAME" conv=notrunc
 mmd -i "$IMGNAME" ::/boot
-mcopy stage1 stage2 -i "$IMGNAME" ::/boot/
+mcopy $DIR/stage1 $DIR/stage2 -i "$IMGNAME" ::/boot/
 /bin/echo -ne '\x23' | dd seek=$((0x44)) bs=1 count=1 "of=$IMGNAME" conv=notrunc
-mcopy menu.lst -i "$IMGNAME" ::/boot/
+mcopy $DIR/menu.lst -i "$IMGNAME" ::/boot/

diff --git a/Tools/BootFloppy/menu.lst b/Tools/BootFloppy/menu.lst
index 17ce630..a956fa7 100644 (file)
--- a/Tools/BootFloppy/menu.lst
+++ b/Tools/BootFloppy/menu.lst
@@ -1,5 +1,5 @@
 timeout 1
 
-title Acess2 (x86,FDD)
-       kernel /Acess2/Acess2.x86.gz /System=fat:/Devices/fdd/0 /Acess=/System/Acess2/x86
+title Acess2 (FDD)
+       kernel /Acess2/Acess2.gz /System=fat:/Devices/fdd/0 /Acess=/System/Acess2/