diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-27 09:41:46 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-27 09:41:46 +0000 |
| commit | 5d236b2bfda7b460e6b970c3b6f6dc539b14020e (patch) | |
| tree | 27316274323f1de2f7da190f269061d1c4280847 /firmware | |
| parent | 6ca9f232a817ed6717354ae68812f67b08cbc2a9 (diff) | |
| download | rockbox-5d236b2bfda7b460e6b970c3b6f6dc539b14020e.tar.gz rockbox-5d236b2bfda7b460e6b970c3b6f6dc539b14020e.zip | |
Generate C file / header for svn version string
It's now easier to force rebuild of files depending on the svn revision
version.c/version.h are generated once with new tools/genversion.sh
Changes in the VCS are still not auto detected, so you'll have to remove
builddir/version.* if you want to change the string in your binaries
APPSVERSION is now called RBVERSION and is defined in the generated
header instead of being defined by the Makefiles
appsversion is now called rbversion (the plugin api number didn't change
since old modules are still binary compatible)
Change some bootloaders to use knwon-at-buildtime RBVERSION instead of
"%s" + rbversion
You'll need to run make clean to regenerate dependencies after the
removal of apps/version.h
To build binaries with a different version string, hand-edit
tools/version.sh or tools/genversion.sh (which calls the former)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26320 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/firmware.make | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/firmware/firmware.make b/firmware/firmware.make index 52b5a19cc6..105fe7e111 100644 --- a/firmware/firmware.make +++ b/firmware/firmware.make | |||
| @@ -17,13 +17,14 @@ FIRMLIB_OBJ := $(call c2obj, $(FIRMLIB_SRC)) | |||
| 17 | ifeq (,$(findstring -DARCHOS_PLAYER,$(TARGET))) | 17 | ifeq (,$(findstring -DARCHOS_PLAYER,$(TARGET))) |
| 18 | FIRMLIB_OBJ += $(BUILDDIR)/sysfont.o | 18 | FIRMLIB_OBJ += $(BUILDDIR)/sysfont.o |
| 19 | endif | 19 | endif |
| 20 | FIRMLIB_OBJ += $(BUILDDIR)/version.o | ||
| 20 | OTHER_SRC += $(FIRMLIB_SRC) | 21 | OTHER_SRC += $(FIRMLIB_SRC) |
| 21 | 22 | ||
| 22 | FIRMLIB = $(BUILDDIR)/firmware/libfirmware.a | 23 | FIRMLIB = $(BUILDDIR)/firmware/libfirmware.a |
| 23 | 24 | ||
| 24 | SYSFONT = $(ROOTDIR)/fonts/08-Schumacher-Clean.bdf | 25 | SYSFONT = $(ROOTDIR)/fonts/08-Schumacher-Clean.bdf |
| 25 | 26 | ||
| 26 | CLEANOBJS += $(BUILDDIR)/sysfont.* | 27 | CLEANOBJS += $(BUILDDIR)/sysfont.* $(BUILDDIR)/version.* |
| 27 | 28 | ||
| 28 | # Limits for the built-in sysfont: ASCII for bootloaders, ISO8859-1 for normal builds | 29 | # Limits for the built-in sysfont: ASCII for bootloaders, ISO8859-1 for normal builds |
| 29 | ifneq (,$(findstring -DBOOTLOADER,$(EXTRA_DEFINES))) | 30 | ifneq (,$(findstring -DBOOTLOADER,$(EXTRA_DEFINES))) |
| @@ -43,3 +44,5 @@ $(BUILDDIR)/sysfont.o: $(SYSFONT) $(BUILDDIR)/sysfont.h | |||
| 43 | $(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -c -o $(BUILDDIR)/sysfont.c $< | 44 | $(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -c -o $(BUILDDIR)/sysfont.c $< |
| 44 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$(BUILDDIR)/sysfont.c))$(CC) $(CFLAGS) -c $(BUILDDIR)/sysfont.c -o $@ | 45 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$(BUILDDIR)/sysfont.c))$(CC) $(CFLAGS) -c $(BUILDDIR)/sysfont.c -o $@ |
| 45 | 46 | ||
| 47 | $(BUILDDIR)/version.c $(BUILDDIR)/version.h: | ||
| 48 | $(TOOLSDIR)/genversion.sh $(BUILDDIR) $(TOOLSDIR)/version.sh $(ROOTDIR) | ||