Added build and clean scripts to simplify release building

Should just require movement of executables into the /bin folder now for things to work
CE-Programming · Feb 11, 2017 · 61d915f · 61d915f
1 parent 3017951
commit 61d915f
Show file tree

Hide file tree

Showing 40 changed files with 78 additions and 6 deletions.
diff --git a/CEdev/bin/main_makefile b/CEdev/bin/main_makefile
@@ -23,6 +23,7 @@ CD = cd
 RM = del /F /Q
 CP = copy /Y
 NULL = >nul 2>&1
+RM_DIR = rmdir /s /q
 
 #Generate the default names for input and object files
 TARGETHEX := $(TARGET).hex
@@ -256,8 +257,14 @@ $(OBJDIR)/%.obj :
 
 #This rule cleans up everything
 clean :
-	@$(RM) $(call WINPATH,$(BINDIR)/$(TARGETHEX) $(BINDIR)/$(TARGETTYPE) $(BINDIR)/$(TARGETMAP) $(OBJECTS) $(OBJDIR)/*.src $(OBJDIR)/$(ICON_ASM)) $(NULL)
+	@$(RM) $(call WINPATH,$(BINDIR)/$(TARGETHEX) $(BINDIR)/$(TARGETTYPE) $(BINDIR)/$(TARGETMAP) $(OBJECTS) $(OBJDIR)/*.src $(OBJDIR)/*.asm) $(NULL)
 	@echo Cleaned build files.
+
+#This rule cleans up everything except the executable
+clean-leave-executable :
+	@$(RM) $(call WINPATH,$(BINDIR)/$(TARGETHEX) $(BINDIR)/$(TARGETMAP)) $(NULL)
+	@$(RM_DIR) $(call WINPATH,$(OBJDIR)) $(NULL)
+	@echo Cleaned $(TARGET)
 
 version :
 	@echo C CE SDK Version $(VERSION)

diff --git a/CEdev/examples/demo_0/bin/DEMO0.8xp b/CEdev/examples/demo_0/bin/DEMO0.8xp
diff --git a/CEdev/examples/demo_1/bin/DEMO1.8xp b/CEdev/examples/demo_1/bin/DEMO1.8xp
diff --git a/CEdev/examples/demo_2/bin/DEMO2.8xp b/CEdev/examples/demo_2/bin/DEMO2.8xp
diff --git a/CEdev/examples/demo_3/bin/DEMO3.8xp b/CEdev/examples/demo_3/bin/DEMO3.8xp
diff --git a/CEdev/examples/demo_4/bin/DEMO4.8xp b/CEdev/examples/demo_4/bin/DEMO4.8xp
diff --git a/CEdev/examples/demo_5/bin/DEMO5.8xp b/CEdev/examples/demo_5/bin/DEMO5.8xp
diff --git a/CEdev/examples/demo_6/bin/DEMO6.8xp b/CEdev/examples/demo_6/bin/DEMO6.8xp
diff --git a/CEdev/examples/demo_7/bin/DEMO7.8xp b/CEdev/examples/demo_7/bin/DEMO7.8xp
diff --git a/CEdev/examples/demo_8/bin/DEMO8.8xp b/CEdev/examples/demo_8/bin/DEMO8.8xp
diff --git a/CEdev/examples/library_examples/fileio/demo_0/bin/FILEIO0.8xp b/CEdev/examples/library_examples/fileio/demo_0/bin/FILEIO0.8xp
diff --git a/CEdev/examples/library_examples/fileio/demo_1/bin/FILEIO1.8xp b/CEdev/examples/library_examples/fileio/demo_1/bin/FILEIO1.8xp
diff --git a/CEdev/examples/library_examples/fileio/demo_2/bin/FILEIO2.8xp b/CEdev/examples/library_examples/fileio/demo_2/bin/FILEIO2.8xp
diff --git a/CEdev/examples/library_examples/fileio/demo_3/bin/FILEIO3.8xp b/CEdev/examples/library_examples/fileio/demo_3/bin/FILEIO3.8xp
diff --git a/CEdev/examples/library_examples/fileio/demo_4/bin/FILEIO4.8xp b/CEdev/examples/library_examples/fileio/demo_4/bin/FILEIO4.8xp
diff --git a/CEdev/examples/library_examples/graphics/demo_0/bin/GRAPHX0.8xp b/CEdev/examples/library_examples/graphics/demo_0/bin/GRAPHX0.8xp
diff --git a/CEdev/examples/library_examples/graphics/demo_1/bin/GRAPHX1.8xp b/CEdev/examples/library_examples/graphics/demo_1/bin/GRAPHX1.8xp
diff --git a/CEdev/examples/library_examples/graphics/demo_10/bin/GRAPHX10.8xp b/CEdev/examples/library_examples/graphics/demo_10/bin/GRAPHX10.8xp
diff --git a/CEdev/examples/library_examples/graphics/demo_2/bin/GRAPHX2.8xp b/CEdev/examples/library_examples/graphics/demo_2/bin/GRAPHX2.8xp
diff --git a/CEdev/examples/library_examples/graphics/demo_3/bin/GRAPHX3.8xp b/CEdev/examples/library_examples/graphics/demo_3/bin/GRAPHX3.8xp
diff --git a/CEdev/examples/library_examples/graphics/demo_4/bin/GRAPHX4.8xp b/CEdev/examples/library_examples/graphics/demo_4/bin/GRAPHX4.8xp
diff --git a/CEdev/examples/library_examples/graphics/demo_5/bin/GRAPHX5.8xp b/CEdev/examples/library_examples/graphics/demo_5/bin/GRAPHX5.8xp
diff --git a/CEdev/examples/library_examples/graphics/demo_6/bin/GRAPHX6.8xp b/CEdev/examples/library_examples/graphics/demo_6/bin/GRAPHX6.8xp
diff --git a/CEdev/examples/library_examples/graphics/demo_7/bin/GRAPHX7.8xp b/CEdev/examples/library_examples/graphics/demo_7/bin/GRAPHX7.8xp
diff --git a/CEdev/examples/library_examples/graphics/demo_8/bin/GRAPHX8.8xp b/CEdev/examples/library_examples/graphics/demo_8/bin/GRAPHX8.8xp
diff --git a/CEdev/examples/library_examples/graphics/demo_9/bin/GRAPHX9.8xp b/CEdev/examples/library_examples/graphics/demo_9/bin/GRAPHX9.8xp
diff --git a/CEdev/examples/library_examples/keypad/demo_0/bin/KEYPAD0.8xp b/CEdev/examples/library_examples/keypad/demo_0/bin/KEYPAD0.8xp
diff --git a/CEdev/examples/library_examples/keypad/demo_1/bin/KEYPAD1.8xp b/CEdev/examples/library_examples/keypad/demo_1/bin/KEYPAD1.8xp
diff --git a/CEdev/examples/library_examples/keypad/demo_2/bin/KEYPAD2.8xp b/CEdev/examples/library_examples/keypad/demo_2/bin/KEYPAD2.8xp
diff --git a/CEdev/examples/library_examples/keypad/demo_3/bin/KEYPAD3.8xp b/CEdev/examples/library_examples/keypad/demo_3/bin/KEYPAD3.8xp
diff --git a/CEdev/lib/ce/graphx/graphx.asm b/CEdev/lib/ce/graphx/graphx.asm
@@ -1,6 +1,6 @@
- .assume ADL=1
  define .GRAPHX_HEADER,space=ram
  define .GRAPHX,space=ram
  segment .GRAPHX_HEADER
+ .assume ADL=1
  db 192,"GRAPHX",0,4
  end
diff --git a/CEdev/lib/src/buildexamples.bat b/CEdev/lib/src/buildexamples.bat
@@ -0,0 +1,17 @@
+@echo off
+
+REM ----------------------------------------------------
+REM  Builds all examples for easy compile testing
+REM  By Matt "MateoConLechuga" Waltz
+REM ----------------------------------------------------
+
+echo -- Cleaning examples...
+cd /D %CEDEV%\examples
+for /D %%a in (demo*) do cd %%a && make && cd ..
+cd /D %CEDEV%\examples\library_examples\fileio
+for /D %%a in (demo*) do cd %%a && make && cd ..
+cd /D %CEDEV%\examples\library_examples\graphics
+for /D %%a in (demo*) do cd %%a && make && cd ..
+cd /D %CEDEV%\examples\library_examples\keypad
+for /D %%a in (demo*) do cd %%a && make && cd ..
+cd %CEDEV%\lib\src
diff --git a/CEdev/lib/src/cleanall.bat b/CEdev/lib/src/cleanall.bat
@@ -0,0 +1,9 @@
+@echo off
+
+REM ----------------------------------------------------
+REM  Executes cleanup scripts for release
+REM  By Matt "MateoConLechuga" Waltz
+REM ----------------------------------------------------
+
+call cleanexamples.bat
+call cleanlibs.bat
diff --git a/CEdev/lib/src/cleanexamples.bat b/CEdev/lib/src/cleanexamples.bat
@@ -0,0 +1,17 @@
+@echo off
+
+REM ----------------------------------------------------
+REM  Deletes built examples for release cleanup
+REM  By Matt "MateoConLechuga" Waltz
+REM ----------------------------------------------------
+
+echo -- Cleaning examples...
+cd /D %CEDEV%\examples
+for /D %%a in (demo*) do cd %%a && make clean-leave-executable && cd ..
+cd /D %CEDEV%\examples\library_examples\fileio
+for /D %%a in (demo*) do cd %%a && make clean-leave-executable && cd ..
+cd /D %CEDEV%\examples\library_examples\graphics
+for /D %%a in (demo*) do cd %%a && make clean-leave-executable && cd ..
+cd /D %CEDEV%\examples\library_examples\keypad
+for /D %%a in (demo*) do cd %%a && make clean-leave-executable && cd ..
+cd %CEDEV%\lib\src
diff --git a/CEdev/lib/src/cleanlibs.bat b/CEdev/lib/src/cleanlibs.bat
@@ -0,0 +1,19 @@
+@echo off
+
+REM ----------------------------------------------------
+REM  Deletes built shared libraries for release cleanup
+REM  By Matt "MateoConLechuga" Waltz
+REM ----------------------------------------------------
+
+echo -- Deleting built shared libs...
+cd fileio
+rmdir /S /Q lib
+cd ..
+cd keypad
+rmdir /S /Q lib
+cd ..
+cd graphics/graphc
+rmdir /S /Q lib
+cd ../graphx
+rmdir /S /Q lib
+cd ../..
diff --git a/CEdev/lib/src/fileio/build.bat b/CEdev/lib/src/fileio/build.bat
@@ -5,7 +5,7 @@
 
 set LIB_NAME=FILEIOC
 set LIB_SRC=fileio_lib.asm
-set SPASM_EXE=%CEDEV%\lib\src\include\spasm.exe
+set SPASM_EXE=%CEDEV%\bin\spasm.exe
 
 echo Assembling Library...
 mkdir lib

diff --git a/CEdev/lib/src/graphics/graphc/build.bat b/CEdev/lib/src/graphics/graphc/build.bat
@@ -5,7 +5,7 @@
 
 set LIB_NAME=GRAPHC
 set LIB_SRC=graphics_lib_old.asm
-set SPASM_EXE=%CEDEV%\lib\src\include\spasm.exe
+set SPASM_EXE=%CEDEV%\bin\spasm.exe
 
 echo Assembling Library...
 mkdir lib

diff --git a/CEdev/lib/src/graphics/graphx/build.bat b/CEdev/lib/src/graphics/graphx/build.bat
@@ -5,7 +5,7 @@
 
 set LIB_NAME=GRAPHX
 set LIB_SRC=graphics_lib.asm
-set SPASM_EXE=%CEDEV%\lib\src\include\spasm.exe
+set SPASM_EXE=%CEDEV%\bin\spasm.exe
 
 echo Assembling Library...
 mkdir lib

diff --git a/CEdev/lib/src/keypad/build.bat b/CEdev/lib/src/keypad/build.bat
@@ -5,7 +5,7 @@
 
 set LIB_NAME=KEYPADC
 set LIB_SRC=keypad_lib.asm
-set SPASM_EXE=%CEDEV%\lib\src\include\spasm.exe
+set SPASM_EXE=%CEDEV%\bin\spasm.exe
 
 echo Assembling Library...
 mkdir lib

diff --git a/CEdev/lib/src/readme.txt b/CEdev/lib/src/readme.txt
@@ -0,0 +1,3 @@
+To build all required libraries and files, execute 'buildall.bat'.
+
+When preparing for a release, execute 'cleanall.bat'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		To build all required libraries and files, execute 'buildall.bat'.

		When preparing for a release, execute 'cleanall.bat'