diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-07-05 10:35:47 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-07-05 10:35:47 +0000 |
commit | ff2f839c399ab29701f2a0f603444b1e46149c53 (patch) | |
tree | dc8bb34a5f8fe344f1bad5930c7b3bebc1cd5cad | |
parent | 4368b59b09b0e07111b58ac9c6d423ddeec7d9c6 (diff) | |
download | rockbox-ff2f839c399ab29701f2a0f603444b1e46149c53.tar.gz 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
-rw-r--r-- | rbutil/mkamsboot/Makefile | 5 | ||||
-rw-r--r-- | rbutil/mkamsboot/mkamsboot.c | 5 |
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 @@ | |||
2 | CFLAGS=-I../../tools/ucl/include -Wall | 2 | CFLAGS=-I../../tools/ucl/include -Wall |
3 | LIBUCL=../../tools/ucl/src/libucl.a | 3 | LIBUCL=../../tools/ucl/src/libucl.a |
4 | 4 | ||
5 | #change for releases | ||
6 | APPVERSION=`../../tools/version.sh` | ||
7 | |||
5 | ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) | 8 | ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) |
6 | OUTPUT=mkamsboot.exe | 9 | OUTPUT=mkamsboot.exe |
7 | CFLAGS+=-mno-cygwin | 10 | CFLAGS+=-mno-cygwin |
@@ -32,7 +35,7 @@ md5.o: md5.c md5.h | |||
32 | $(CC) $(CFLAGS) -c -o md5.o -W -Wall md5.c | 35 | $(CC) $(CFLAGS) -c -o md5.o -W -Wall md5.c |
33 | 36 | ||
34 | mkamsboot.o: mkamsboot.c dualboot.h md5.h | 37 | mkamsboot.o: mkamsboot.c dualboot.h md5.h |
35 | $(CC) $(CFLAGS) -c -o mkamsboot.o -W -Wall mkamsboot.c | 38 | $(CC) $(CFLAGS) -c -o mkamsboot.o -W -Wall mkamsboot.c -DVERSION=\"$(APPVERSION)\" |
36 | 39 | ||
37 | $(OUTPUT): mkamsboot.o md5.o dualboot.o $(LIBUCL) | 40 | $(OUTPUT): mkamsboot.o md5.o dualboot.o $(LIBUCL) |
38 | $(CC) $(CFLAGS) -o $(OUTPUT) mkamsboot.o md5.o dualboot.o $(LIBUCL) | 41 | $(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. | |||
109 | #define O_BINARY 0 | 109 | #define O_BINARY 0 |
110 | #endif | 110 | #endif |
111 | 111 | ||
112 | #define VERSION "1.1" | ||
113 | |||
114 | /* 4 for m200, 2 for e200/c200, 1 or 2 for fuze/clop */ | 112 | /* 4 for m200, 2 for e200/c200, 1 or 2 for fuze/clop */ |
115 | static const unsigned short hw_revisions[] = { | 113 | static const unsigned short hw_revisions[] = { |
116 | [MODEL_FUZE] = 1, | 114 | [MODEL_FUZE] = 1, |
@@ -592,8 +590,9 @@ int main(int argc, char* argv[]) | |||
592 | 590 | ||
593 | sum.md5 = md5sum; | 591 | sum.md5 = md5sum; |
594 | 592 | ||
593 | /* VERSION comes frome the Makefile */ | ||
595 | fprintf(stderr, | 594 | fprintf(stderr, |
596 | "mkamsboot v" VERSION " - (C) Dave Chapman and Rafaël Carré 2008\n" | 595 | "mkamsboot Version " VERSION " - (C) Dave Chapman and Rafaël Carré 2008\n" |
597 | "This is free software; see the source for copying conditions. There is NO\n" | 596 | "This is free software; see the source for copying conditions. There is NO\n" |
598 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | 597 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
599 | "\n"); | 598 | "\n"); |