Changeset 1745 for branches/release-1_0

Timestamp:

03/17/12 04:19:12 (14 months ago)

Author:

philmoz

Message:

Re-align CHDK and CHDK-DE code base (part 12) - ​http://chdk.setepontos.com/index.php?topic=7601.0

• make differences in 'make' files dependent on CHDK/CHDK-DE version (language, native calls etc)
• move VER=CHDK(-DE) into a separate file

Location:

branches/release-1_0

Files:

• Makefile (modified) (3 diffs)
• buildconf.inc (modified) (2 diffs)
• chdk_ver.inc (added)
• makefile.inc (modified) (1 diff)

branches/release-1_0/Makefile

@@ -2 +2 @@
 srcdir=./
 
-include buildconf.inc
 tmp:=$(shell echo "BUILD_SVNREV := $(DEF_SVN_REF)" > revision.inc)
 
@@ -133 +132 @@
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/BOOKS/*  > $(DEVNULL)
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/CURVES/*  > $(DEVNULL)
+    ifeq ($(VER),CHDK-DE)
+                zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/CURVES/ISOBoost/*  > $(DEVNULL)
+    endif
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/DATA/*  > $(DEVNULL)
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/FONTS/*  > $(DEVNULL)
@@ -143 +145 @@
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/EXAM/*     > $(DEVNULL)
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/TEST/*     > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/EDITOR/*   > $(DEVNULL)
+    ifeq ($(VER),CHDK-DE)
+                zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/MD/*   > $(DEVNULL)
+                zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/CURV/*     > $(DEVNULL)
+                zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/USER/* > $(DEVNULL)
+    else
+                zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/EDITOR/*   > $(DEVNULL)
+    endif
         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)

branches/release-1_0/buildconf.inc

@@ -20 +20 @@
 # WARNING: This is DANGEROUS. e.g. call_event_proc("EraseSectorOfRom",...)
 # NOTE: the interface for this may change in the future, to support better support buffers etc
-#OPT_LUA_CALL_NATIVE=1
+ifeq ($(VER),CHDK-DE)
+OPT_LUA_CALL_NATIVE=1
+endif
 
 # experimental - allocate memory from alternate heap. Default 2MB from EXMEM_RAMDISK
@@ -53 +55 @@
 # desired language.
 # Set the value to the language file name without extension - e.g. OPT_DEFAULT_LANG=russian
-#OPT_DEFAULT_LANG=
+ifeq ($(VER),CHDK-DE)
+OPT_DEFAULT_LANG=german
+endif
 
 # Default svn revsion. Used when svnversion fail.

branches/release-1_0/makefile.inc

@@ -1 @@
-VER=CHDK
+include $(topdir)chdk_ver.inc
 
 MEMISOSIZE="(&_end-&_start)"