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 /bootloader/iriver_h1x0.c | |
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 'bootloader/iriver_h1x0.c')
-rw-r--r-- | bootloader/iriver_h1x0.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c index f16a5128c9..1afbafa830 100644 --- a/bootloader/iriver_h1x0.c +++ b/bootloader/iriver_h1x0.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include "eeprom_settings.h" | 46 | #include "eeprom_settings.h" |
47 | #include "rbunicode.h" | 47 | #include "rbunicode.h" |
48 | #include "common.h" | 48 | #include "common.h" |
49 | #include "version.h" | ||
49 | 50 | ||
50 | #include <stdarg.h> | 51 | #include <stdarg.h> |
51 | 52 | ||
@@ -58,8 +59,6 @@ | |||
58 | static bool recovery_mode = false; | 59 | static bool recovery_mode = false; |
59 | #endif | 60 | #endif |
60 | 61 | ||
61 | char version[] = APPSVERSION; | ||
62 | |||
63 | /* Reset the cookie for the crt0 crash check */ | 62 | /* Reset the cookie for the crt0 crash check */ |
64 | inline void __reset_cookie(void) | 63 | inline void __reset_cookie(void) |
65 | { | 64 | { |
@@ -254,7 +253,7 @@ void failsafe_menu(void) | |||
254 | extern int line; | 253 | extern int line; |
255 | 254 | ||
256 | reset_screen(); | 255 | reset_screen(); |
257 | printf("Bootloader %s", version); | 256 | printf("Bootloader " RBVERSION); |
258 | check_battery(); | 257 | check_battery(); |
259 | printf("========================="); | 258 | printf("========================="); |
260 | line += FAILSAFE_OPTIONS; | 259 | line += FAILSAFE_OPTIONS; |
@@ -502,7 +501,7 @@ void main(void) | |||
502 | lcd_setfont(FONT_SYSFIXED); | 501 | lcd_setfont(FONT_SYSFIXED); |
503 | 502 | ||
504 | printf("Rockbox boot loader"); | 503 | printf("Rockbox boot loader"); |
505 | printf("Version %s", version); | 504 | printf("Version " RBVERSION); |
506 | 505 | ||
507 | /* No need to wait here more because lcd_init and others already do that. */ | 506 | /* No need to wait here more because lcd_init and others already do that. */ |
508 | // sleep(HZ/50); /* Allow the button driver to check the buttons */ | 507 | // sleep(HZ/50); /* Allow the button driver to check the buttons */ |