diff --git a/build_bin b/build_bin index 166fe9f..4284ae8 100755 --- a/build_bin +++ b/build_bin @@ -1,5 +1,10 @@ +# Path defititions +bin="/home/ftp/hive/spinix" +sd="${bin}/sdcard" +flash="${bin}/flash" + cd src bstc -b -O cgru $1.spin -cp $1.binary ../root/bin/$1 +cp $1.binary ${sd}/bin/$1 rm $1.binary cd .. diff --git a/build_boot b/build_boot index 14f1593..16099f7 100755 --- a/build_boot +++ b/build_boot @@ -1,6 +1,11 @@ +# Path defititions +bin="/home/ftp/hive/spinix" +sd="${bin}/sdcard" +flash="${bin}/flash" + # Build the the boot program cd src bstc -b -O cgru boot.spin -cp boot.binary .. +cp boot.binary ${flash}/ rm boot.binary cd .. diff --git a/build_spinix b/build_spinix index ded247c..f435d17 100755 --- a/build_spinix +++ b/build_spinix @@ -1,47 +1,51 @@ +# Path defititions +bin="/home/ftp/hive/spinix" +sd="${bin}/sdcard" +flash="${bin}/flash" + # Clean directories and remake them -rm -rf root -mkdir root -mkdir root/bin -mkdir root/tmp -mkdir root/manpages -mkdir root/devel -mkdir root/demos -mkdir root/forth -mkdir root/scripts +rm -rf ${bin} +mkdir ${bin} +mkdir ${sd} +mkdir ${flash} +mkdir ${sd}/bin +mkdir ${sd}/tmp +mkdir ${sd}/manpages +mkdir ${sd}/devel +mkdir ${sd}/demos +mkdir ${sd}/forth +mkdir ${sd}/scripts # Build the boot program ./build_boot # Copy license and startup script to root -cp license.txt root -cp src/_shellrc root/bin +cp license.txt ${sd} +cp src/_shellrc ${sd}/bin # Generate _sysparm and copy to root -cd src -date +%s >_sysparm -echo -6 3 0 >>_sysparm -echo 0 0 0 >>_sysparm -echo "GPWD /" >>_sysparm -echo "LSCRIPT_FILE /bin/_shellrc" >>_sysparm -echo "P# 0" >>_sysparm -cd .. -cp src/_sysparm root +date +%s >${sd}/_sysparm +echo -6 3 0 >>${sd}/_sysparm +echo 0 0 0 >>${sd}/_sysparm +echo "GPWD /" >>${sd}/_sysparm +echo "LSCRIPT_FILE /bin/_shellrc" >>${sd}/_sysparm +echo "P# 0" >>${sd}/_sysparm # Build the bin apps ./build_src # Copy the devel files -cp devel/* root/devel +cp devel/* ${sd}/devel # Copy the man pages -cp manpages/* root/manpages +cp manpages/* ${sd}/manpages # Build lerner cd lerner cp ../src/sysdefs.spin . cp ../src/exit.spin . bstc -b -O cgru lerner.spin -cp lerner.binary ../root/demos/lerner +cp lerner.binary ${sd}/demos/lerner rm *.binary cd .. @@ -50,32 +54,32 @@ cd vga512 cp ../src/sysdefs.spin . cp ../src/exit.spin . bstc -b VGA_512x384_Bitmap_Demo.spin -cp VGA_512x384_Bitmap_Demo.binary ../root/demos/vga512 +cp VGA_512x384_Bitmap_Demo.binary ${sd}/demos/vga512 rm *.binary cd .. # Move vgatdemo from bin to demos -mv root/bin/vgatdemo root/demos +mv ${sd}/bin/vgatdemo ${sd}/demos -# Copy the C demos -cp cdemos/dry/dry.binary root/demos/dry -cp cdemos/fibo/fibo.binary root/demos/fibo -cp cdemos/hello/hello.binary root/demos/hello +# Move the C demos +mv cdemos/dry/dry.binary ${sd}/demos/dry +mv cdemos/fibo/fibo.binary ${sd}/demos/fibo +mv cdemos/hello/hello.binary ${sd}/demos/hello -# Copy C filetest program -cp filetest/filetest.binary root/demos/filetest +# Move C filetest program +mv filetest/filetest.binary ${sd}/demos/filetest -# Copy C chess program -cp chess/chess.binary root/demos/chess +# Move C chess program +mv chess/chess.binary ${sd}/demos/chess # Build pfth and copy the Forth files cd pfth bstc -b ospfth.spin -cp ospfth.binary ../root/bin/pfth -cp *.fth ../root/forth -cp *.txt ../root/forth -mv ../root/forth/_startup.fth ../root +mv ospfth.binary ${sd}/bin/pfth +cp *.fth ${sd}/forth +cp *.txt ${sd}/forth +mv ${sd}/forth/_startup.fth ${sd} cd .. # Copy the script files -cp scripts/* root/scripts +cp scripts/* ${sd}/scripts diff --git a/build_src b/build_src index c1bc17f..d6fb78f 100755 --- a/build_src +++ b/build_src @@ -1,3 +1,8 @@ +# Path defititions +bin="/home/ftp/hive/spinix" +sd="${bin}/sdcard" +flash="${bin}/flash" + # Build the bin apps ./build_bin alias ./build_bin cat @@ -47,16 +52,16 @@ ./build_bin wc # Copy the shell scripts -cp src/spc root/bin +cp src/spc ${sd}/bin # Copy text files -cp src/*.txt root/bin +cp src/*.txt ${sd}/bin # Build files for spasm cd src -grep PUB clibsd.spin >../root/devel/clibsd.spn -cp ../root/devel/clibsd.spn ../root/devel/clibsd.spa +grep PUB clibsd.spin >${sd}/devel/clibsd.spn +cp ${sd}/devel/clibsd.spn ${sd}/devel/clibsd.spa bstc -b clibsd.spin -cp clibsd.binary ../root/devel/clibsd.bin +cp clibsd.binary ${sd}/devel/clibsd.bin rm clibsd.binary cd .. diff --git a/src/_sysparm b/src/_sysparm deleted file mode 100644 index 763a49d..0000000 --- a/src/_sysparm +++ /dev/null @@ -1,6 +0,0 @@ -1384486575 --6 3 0 -0 0 0 -GPWD / -LSCRIPT_FILE /bin/_shellrc -P# 0