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 /apps/plugins | |
| parent | 6ca9f232a817ed6717354ae68812f67b08cbc2a9 (diff) | |
| download | rockbox-5d236b2bfda7b460e6b970c3b6f6dc539b14020e.zip rockbox-5d236b2bfda7b460e6b970c3b6f6dc539b14020e.tar.gz rockbox-5d236b2bfda7b460e6b970c3b6f6dc539b14020e.tar.bz2 rockbox-5d236b2bfda7b460e6b970c3b6f6dc539b14020e.tar.xz | |
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 'apps/plugins')
| -rw-r--r-- | apps/plugins/battery_bench.c | 4 | ||||
| -rw-r--r-- | apps/plugins/iriver_flash.c | 2 | ||||
| -rw-r--r-- | apps/plugins/settings_dumper.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 165ce54..945abe9 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -546,7 +546,7 @@ int main(void) "will continue.\n\n",BATTERY_LOG); rb->fdprintf(fd, "Battery bench run for %s version %s\n\n" - ,MODEL_NAME,rb->appsversion); + ,MODEL_NAME,rb->rbversion); rb->fdprintf(fd, "Battery type: %d mAh Buffer Entries: %d\n" @@ -578,7 +578,7 @@ int main(void) rb->fdprintf(fd, "\n--File already present. Resuming Benchmark--\n"); rb->fdprintf(fd, "Battery bench run for %s version %s\n\n" - ,MODEL_NAME,rb->appsversion); + ,MODEL_NAME,rb->rbversion); rb->close(fd); } diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c index 3f5490e..24542a9 100644 --- a/apps/plugins/iriver_flash.c +++ b/apps/plugins/iriver_flash.c @@ -411,7 +411,7 @@ int flash_rockbox(const char *filename, int section) rb->memset(&hdr, 0, sizeof(struct flash_header)); hdr.magic = FLASH_MAGIC; hdr.length = len; - // rb->strncpy(hdr.version, APPSVERSION, sizeof(hdr.version)-1); + // rb->strncpy(hdr.version, rb->rbversion , sizeof(hdr.version)-1); p16 = (uint16_t *)&hdr; rb->snprintf(buf, sizeof(buf), "Programming..."); diff --git a/apps/plugins/settings_dumper.c b/apps/plugins/settings_dumper.c index ea69353..93c4f67 100644 --- a/apps/plugins/settings_dumper.c +++ b/apps/plugins/settings_dumper.c @@ -129,7 +129,7 @@ enum plugin_status plugin_start( return PLUGIN_ERROR; list = rb->get_settings_list(&setting_count); rb->fdprintf(fd, "# .cfg file created by rockbox %s - " - "http://www.rockbox.org\r\n\r\n", rb->appsversion); + "http://www.rockbox.org\r\n\r\n", rb->rbversion); rb->fdprintf(fd, "# -- Sound settings -- #\r\n"); for(i=0;i<setting_count;i++) |