Changeset 1362

Timestamp:

10/10/11 10:37:50 (20 months ago)

Author:

philmoz

Message:

Some more cleanup of the Makefile batch build:

• removed some test entries from camera_list.csv
• changed auto_build.sh to stop on build errors
• fixed up the dummy empty recipes in the makefiles to stop gmake from recursively trying to rebuild the makefiles themselves. this speeds up the build process.
• fixed handling or PLATFORM/PLATFORMSUB error message to that the batch targets can be specified without these; but the default target will produce an error if either is undefined.

Location:

branches/philmoz

Files:

• Makefile (modified) (3 diffs)
• auto_build.sh (modified) (1 diff)
• bottom.inc (modified) (1 diff)
• camera_list.csv (modified) (4 diffs)
• makefile.inc (modified) (4 diffs)
• platform/makefile_sub.inc (modified) (1 diff)

branches/philmoz/Makefile

@@ -5 +5 @@
 
 SUBDIRS=tools lib platform core loader CHDK
-
-all: all-recursive
-
-clean: clean-recursive
-
-distclean: distclean-recursive
 
 .PHONY: fir
@@ -118 +112 @@
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/4Pack/*    > $(DEVNULL)
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/4Pack/Lua/*        > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/4Pack/uBasic/*     > $(DEVNULL)
+        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/4Pack/uBasic/* > $(DEVNULL)
+        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/EDITOR/*   > $(DEVNULL)
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/syscurves.CVF      > $(DEVNULL)
         zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)doc/changelog.txt  > $(DEVNULL)
@@ -176 +171 @@
 batch-clean:
         sh auto_build.sh $(MAKE) clean camera_list.csv
-
-
-# Define empty recipes for all the included makefiles (including this one)
-# This stops gmake from attempting to see if the makefiles need to be rebuilt
-Makefile: ;
-makefile.inc: ;
-version.inc: ;
-buildconf.inc: ;
-localbuildconf.inc: ;
-$(topdir)/platform/fi2.inc: ;
-$(topdir)/platform/$(PLATFORM)/sub/$(PLATFORMSUB)/makefile.inc: ;

branches/philmoz/auto_build.sh

@@ -9 +9 @@
   if [ ${cam} != "CAMERA" ] && [ "${skip}" = "" ]; then \
     if [ "${state}" != "" ]; then state=_${state}; fi; \
-    $1 -s --no-print-directory PLATFORM=${cam} PLATFORMSUB=${fw} STATE=${state} COPY_TO=${copy} $2; \
+    $1 -s --no-print-directory PLATFORM=${cam} PLATFORMSUB=${fw} STATE=${state} COPY_TO=${copy} $2 || exit 1; \
   fi;
 done < $3

branches/philmoz/bottom.inc

@@ -4 +4 @@
 #-include $(OBJS:%.o=.dep/%.d)
 #endif
+
+
+# Define empty recipes for all the included makefiles (including this one)
+# This stops gmake from attempting to see if the makefiles need to be rebuilt
+$(topdir)bottom.inc: ;

branches/philmoz/camera_list.csv

@@ -1 +1 @@
 CAMERA,FIRMWARE,BETA_STATUS,COPY_TO,SKIP_AUTOBUILD
-a1100,100a,BETA,,
-a1100,100b,BETA,,
 a1100,100c,BETA,,
 a2000,100c,BETA,,
@@ -12 +10 @@
 a480,100b,,,
 a490,100d,BETA,,
-a490,100e,BETA,,
 a490,100f,BETA,,
 a495,100d,BETA,,
@@ -60 +57 @@
 ixus120_sd940,103b,BETA,,
 ixus120_sd940,103c,BETA,,
-ixus200_sd980,100c,BETA,,
 ixus200_sd980,101c,BETA,,
 ixus200_sd980,101d,BETA,,
@@ -137 +133 @@
 sx130is,101d,BETA,,
 sx130is,101f,BETA,,
-sx20,100f,,,
 sx20,102b,,,
 sx20,102d,,,

branches/philmoz/makefile.inc

@@ -10 +10 @@
 # you may also set your default camera here
 -include $(topdir)localbuildconf.inc
-
-ifndef PLATFORM
-$(error PLATFORM has not been defined. Specify the PLATFORM to build on the command line or in localbuildconf.inc)
-endif
-ifndef PLATFORMSUB
-$(error PLATFORMSUB has not been defined. Specify the PLATFORMSUB to build on the command line or in localbuildconf.inc)
-endif
-
 include $(topdir)version.inc
-include $(topdir)platform/$(PLATFORM)/sub/$(PLATFORMSUB)/makefile.inc
+
+ifdef PLATFORM
+  ifdef PLATFORMSUB
+    include $(topdir)platform/$(PLATFORM)/sub/$(PLATFORMSUB)/makefile.inc
+  endif
+endif
 
 # Used in gui_debug.c for controlling memory browser allowed address ranges
@@ -223 +220 @@
 endif
 
+.PHONY: all
 all: all-recursive
+
+.PHONY: clean
 clean: clean-recursive
+
+.PHONY: distclean
 distclean: distclean-recursive
 
@@ -243 +245 @@
 
 all-recursive:
+ifndef PLATFORM
+        $(error PLATFORM has not been defined. Specify the PLATFORM to build on the command line or in localbuildconf.inc)
+endif
+ifndef PLATFORMSUB
+        $(error PLATFORMSUB has not been defined. Specify the PLATFORMSUB to build on the command line or in localbuildconf.inc)
+endif
         @for i in $(SUBDIRS); do \
                 echo \>\> Entering to $(FOLDER)$$i; \
@@ -259 +267 @@
 .SILENT:
 endif
+
+
+# Define empty recipes for all the included makefiles (including this one)
+# This stops gmake from attempting to see if the makefiles need to be rebuilt
+Makefile: ;
+$(topdir)makefile.inc: ;
+$(topdir)buildconf.inc: ;
+$(topdir)localbuildconf.inc: ;
+$(topdir)version.inc: ;
+$(topdir)platform/$(PLATFORM)/sub/$(PLATFORMSUB)/makefile.inc: ;
+$(topdir)platform/fi2.inc: ;

branches/philmoz/platform/makefile_sub.inc

@@ -73 +73 @@
 
 include $(topdir)bottom.inc
+
+
+# Define empty recipes for all the included makefiles (including this one)
+# This stops gmake from attempting to see if the makefiles need to be rebuilt
+$(topdir)platform/makefile_sub.inc: ;