summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-07-05 10:35:47 +0000
committerThomas Martitz <kugel@rockbox.org>2009-07-05 10:35:47 +0000
commitff2f839c399ab29701f2a0f603444b1e46149c53 (patch)
treedc8bb34a5f8fe344f1bad5930c7b3bebc1cd5cad /rbutil
parent4368b59b09b0e07111b58ac9c6d423ddeec7d9c6 (diff)
downloadrockbox-ff2f839c399ab29701f2a0f603444b1e46149c53.tar.gz
rockbox-ff2f839c399ab29701f2a0f603444b1e46149c53.tar.bz2
rockbox-ff2f839c399ab29701f2a0f603444b1e46149c53.zip
Change to versioning for mkamsboot to <rXXXXX>-<DATE> for svn builds. A fixed number like 1.1 can (and should) be used for releases.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21652 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/mkamsboot/Makefile5
-rw-r--r--rbutil/mkamsboot/mkamsboot.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/rbutil/mkamsboot/Makefile b/rbutil/mkamsboot/Makefile
index 1a5ffd09f3..17baa1177c 100644
--- a/rbutil/mkamsboot/Makefile
+++ b/rbutil/mkamsboot/Makefile
@@ -2,6 +2,9 @@
CFLAGS=-I../../tools/ucl/include -Wall
LIBUCL=../../tools/ucl/src/libucl.a
+#change for releases
+APPVERSION=`../../tools/version.sh`
+
ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
OUTPUT=mkamsboot.exe
CFLAGS+=-mno-cygwin
@@ -32,7 +35,7 @@ md5.o: md5.c md5.h
$(CC) $(CFLAGS) -c -o md5.o -W -Wall md5.c
mkamsboot.o: mkamsboot.c dualboot.h md5.h
- $(CC) $(CFLAGS) -c -o mkamsboot.o -W -Wall mkamsboot.c
+ $(CC) $(CFLAGS) -c -o mkamsboot.o -W -Wall mkamsboot.c -DVERSION=\"$(APPVERSION)\"
$(OUTPUT): mkamsboot.o md5.o dualboot.o $(LIBUCL)
$(CC) $(CFLAGS) -o $(OUTPUT) mkamsboot.o md5.o dualboot.o $(LIBUCL)
diff --git a/rbutil/mkamsboot/mkamsboot.c b/rbutil/mkamsboot/mkamsboot.c
index 79339b4a45..62c33186d7 100644
--- a/rbutil/mkamsboot/mkamsboot.c
+++ b/rbutil/mkamsboot/mkamsboot.c
@@ -109,8 +109,6 @@ execution to the uncompressed firmware.
#define O_BINARY 0
#endif
-#define VERSION "1.1"
-
/* 4 for m200, 2 for e200/c200, 1 or 2 for fuze/clop */
static const unsigned short hw_revisions[] = {
[MODEL_FUZE] = 1,
@@ -592,8 +590,9 @@ int main(int argc, char* argv[])
sum.md5 = md5sum;
+/* VERSION comes frome the Makefile */
fprintf(stderr,
-"mkamsboot v" VERSION " - (C) Dave Chapman and Rafaël Carré 2008\n"
+"mkamsboot Version " VERSION " - (C) Dave Chapman and Rafaël Carré 2008\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"\n");