cleaned .gitignore to target existing files, and

compile-script now places all relevant files into a toplevel "sdcard" dir, and
src/Makefile now downloads the appropriate ROM files, formatting, and
moved *.c to the tools dir

Author: Ben-401

.gitignore

@@ -7,38 +7,51 @@
 *.*~
 
 # files generated using make
-charrom.vhdl
-cpu_test.exe
-cpu_test
-diskchooser
-diskchooser.list
-diskmenu_c000.bin
-diskmenuc000.list
-err.log
-etherload.prg
-ghdl-frame-gen.exe
-ghdl-frame-gen
-kickstart.list
-kickstart.vhdl
-kickstart65gs.bin
-pngprepare.exe
-pngprepare
-version.a65
-version.vhdl
-src/BOOTLOGO.M65
 src/KICKUP.M65
+src/*.prg
+src/diskmenu_c000.bin
+src/tests/*.prg
+src/tools/*.prg
+src/utilities/*.prg
+
+# ophis
+src/*.list
+src/*.map
+src/tests/*.list
+src/tests/*.map
+src/tools/*.list
+src/tools/*.map
+src/utilities/*.list
+src/utilities/*.map
+
+# generated vhdl
+src/vhdl/charrom.vhdl
+src/vhdl/kickstart.vhdl
+src/vhdl/version.vhdl
+
+# generated ASM
+src/version.a65
+
+# executables
+src/tools/etherkick/etherkick
+src/tools/etherload/etherload
+src/tools/hotpatch/hotpatch
+src/tools/pngprepare/pngprepare
+
+# outputs
+sdcard-files/BOOTLOGO.M65
+sdcard-files/CHARROM.M65
+sdcard-files/MEGA65.D81
+sdcard-files/MEGA65.ROM
+sdcard-files/old-bitfiles/*
 
 # files generated during compilation using ./compile.sh script
 compile-*.log
 bit*.bit
+isework/container.bit
 
 # files generated by ISE during compilation using ISE
 isework/container_*
 
 # files generated by src/utilities/getsdcardinfo
 sdcardinfo-*
-
-# unsure why these are here
-work-obj93.cf
-index_range_tests.zip
-index_range_tests/

compile.sh

@@ -8,7 +8,17 @@ ls -al    isework/container.xst
 chmod a-w isework/container.xst
 ls -al    isework/container.xst
 
-( cd src ; make generated_vhdl firmware ../iomap.txt tools utilities )
+# ensure these directory exists, if not, make them
+if test ! -e    "./sdcard-files"; then
+  echo "Creating ./sdcard-files"
+  mkdir          ./sdcard-files
+fi
+if test ! -e    "./sdcard-files/old-bitfiles"; then
+  echo "Creating ./sdcard-files/old-bitfiles"
+  mkdir          ./sdcard-files/old-bitfiles
+fi
+
+( cd src ; make generated_vhdl firmware ../iomap.txt tools utilities roms)
 retcode=$?
 
 if [ $retcode -ne 0 ] ; then
@@ -168,7 +178,17 @@ echo "From $outfile6: =================================================" >> $out
  echo "Nil" >> $outfile0
 
 echo " "
-# now copy the bit-file to the top-level-directory, and timestamp it with time and git-status
-echo "cp ./isework/container.bit ./bit${datetime2}_${branch2}_${gitstring}.bit"
-cp       ./isework/container.bit ./bit${datetime2}_${branch2}_${gitstring}.bit
-ls                               ./bit${datetime2}_${branch2}_${gitstring}.bit
+# now prepare the sdcard-output directory by moving any existing bit-file
+for filename in ./sdcard-files/*.bit; do
+  echo "mv ${filename} ./sdcard-files/old-bitfiles"
+        mv ${filename} ./sdcard-files/old-bitfiles
+done
+# now copy the bit-file to the sdcard-output directory, and timestamp it with time and git-status
+echo "cp ./isework/container.bit ./sdcard-files/bit${datetime2}_${branch2}_${gitstring}.bit"
+cp       ./isework/container.bit ./sdcard-files/bit${datetime2}_${branch2}_${gitstring}.bit
+# and the KICKUP file
+echo "cp ./src/KICKUP.M65 ./sdcard-files"
+      cp ./src/KICKUP.M65 ./sdcard-files
+
+echo " "
+ls -al ./sdcard-files