Changeset 1371

Timestamp:

10/19/11 07:47:16 (20 months ago)

Author:

philmoz

Message:

Update from CHDK-DE changeset 831 to the new batch build makefile version.
This now supports the case where one CHDK version can be used on two or more other firmware versions (e.g. A2000 1.00c).
Updated the A2000 1.00c build definition in camera_list.csv to include the 1.00a and 1.00b versions.

Location:

trunk

Files:

• Makefile (modified) (2 diffs)
• camera_list.csv (modified) (1 diff)

trunk/Makefile

@@ -67 +67 @@
         LANG=C echo -e "CHDK-$(VER) for $(PLATFORM) fw:$(PLATFORMSUB) build:$(BUILD_NUMBER) date:`date -R`" | \
             zip -9jz $(topdir)bin/$(VER)-$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/DISKBOOT.BIN > $(DEVNULL)
-ifdef PLATFORMOS
-  ifeq ($(PLATFORMOS),vxworks)
-        zip -9j $(topdir)bin/$(VER)-$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/PS.FIR > $(DEVNULL)
-        rm -f $(topdir)bin/PS.FIR
-  endif
-  ifeq ($(PLATFORMOS),dryos)
-    ifdef OPT_FI2
-      ifdef FI2KEY
-            zip -9j $(topdir)bin/$(VER)-$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/PS.FI2 > $(DEVNULL)
-            rm -f $(topdir)bin/PS.FI2
+    ifdef PLATFORMOS
+      ifeq ($(PLATFORMOS),vxworks)
+                zip -9j $(topdir)bin/$(VER)-$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/PS.FIR > $(DEVNULL)
+                rm -f $(topdir)bin/PS.FIR
+      endif
+      ifeq ($(PLATFORMOS),dryos)
+        ifdef OPT_FI2
+          ifdef FI2KEY
+                        zip -9j $(topdir)bin/$(VER)-$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/PS.FI2 > $(DEVNULL)
+                        rm -f $(topdir)bin/PS.FI2
+          endif
+        endif
       endif
     endif
-  endif
-endif
-# if COPY_TO is defined then copy this camera/firmware version to the copied firmware version
-# Define COPY_TO in $(topdir)/platform/$(PLATFORM)/sub/$(PLATFORMSUB)/makefile.inc of the source
-# firmware version that needs to be copied to another firmware version
-ifdef COPY_TO
-        cp $(topdir)bin/$(VER)-$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/$(VER)-$(PLATFORM)-$(COPY_TO)-$(BUILD_NUMBER)$(STATE).zip
-endif
+        # if COPY_TO is defined then copy this camera/firmware version to the copied firmware version
+        # Define COPY_TO in $(topdir)/platform/$(PLATFORM)/sub/$(PLATFORMSUB)/makefile.inc of the source
+        # firmware version that needs to be copied to another firmware version
+        # For the case where one CHDK version applies to two or more other Canon firmware version place all the
+        # 'copy to' firmware versions together seperated by ':' - e.g. "a2000,100c,BETA,100a:100b,"
+    ifdef COPY_TO
+                @echo "**** Copying duplicate Firmwares"
+                $(foreach COPY_PLATFORMSUB, $(subst :, ,$(COPY_TO)), \
+                        cp $(topdir)bin/$(VER)-$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/$(VER)-$(PLATFORM)-$(COPY_PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip ; \
+                )
+    endif
         rm -f $(topdir)bin/DISKBOOT.BIN
 
@@ -124 +129 @@
         zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)doc/readme.txt  > $(DEVNULL)
 
-ifdef PLATFORMOS
-  ifeq ($(PLATFORMOS),vxworks)
-        zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)bin/PS.FIR > $(DEVNULL)
-        zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/PS.FIR > $(DEVNULL)
-        rm -f $(topdir)bin/PS.FIR
-  endif
-  ifeq ($(PLATFORMOS),dryos)
-    ifdef OPT_FI2
-      ifdef FI2KEY
-            zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)bin/PS.FI2 > $(DEVNULL)
-            zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/PS.FI2 > $(DEVNULL)
-            rm -f $(topdir)bin/PS.FI2
+    ifdef PLATFORMOS
+      ifeq ($(PLATFORMOS),vxworks)
+                zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)bin/PS.FIR > $(DEVNULL)
+                zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/PS.FIR > $(DEVNULL)
+                rm -f $(topdir)bin/PS.FIR
+      endif
+      ifeq ($(PLATFORMOS),dryos)
+        ifdef OPT_FI2
+          ifdef FI2KEY
+                        zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)bin/PS.FI2 > $(DEVNULL)
+                        zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/PS.FI2 > $(DEVNULL)
+                        rm -f $(topdir)bin/PS.FI2
+          endif
+        endif
       endif
     endif
-  endif
-endif
-# if COPY_TO is defined then copy this camera/firmware version to the copied firmware version
-# Define COPY_TO in $(topdir)/platform/$(PLATFORM)/sub/$(PLATFORMSUB)/makefile.inc of the source
-# firmware version that needs to be copied to another firmware version
-ifdef COPY_TO
-        cp $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)bin/$(PLATFORM)-$(COPY_TO)-$(BUILD_NUMBER)-full$(STATE).zip
-        cp $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/$(PLATFORM)-$(COPY_TO)-$(BUILD_NUMBER)$(STATE).zip
-endif
+        # if COPY_TO is defined then copy this camera/firmware version to the copied firmware version
+        # Define COPY_TO in $(topdir)/platform/$(PLATFORM)/sub/$(PLATFORMSUB)/makefile.inc of the source
+        # firmware version that needs to be copied to another firmware version
+        # For the case where one CHDK version applies to two or more other Canon firmware version place all the
+        # 'copy to' firmware versions together seperated by ':' - e.g. "a2000,100c,BETA,100a:100b,"
+    ifdef COPY_TO
+                @echo "**** Copying duplicate Firmwares"
+                $(foreach COPY_PLATFORMSUB, $(subst :, ,$(COPY_TO)), \
+                        cp $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)bin/$(PLATFORM)-$(COPY_PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip ; \
+                        cp $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/$(PLATFORM)-$(COPY_PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip ; \
+                )
+    endif
         rm -f $(topdir)bin/DISKBOOT.BIN
 

trunk/camera_list.csv

@@ -1 +1 @@
 CAMERA,FIRMWARE,BETA_STATUS,COPY_TO,SKIP_AUTOBUILD
 a1100,100c,BETA,,
-a2000,100c,BETA,,
+a2000,100c,BETA,100a:100b,
 a430,100b,BETA,,SKIP_AUTOBUILD
 a450,100d,,,