len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change to versioning for mkamsboot to <rXXXXX>-<DATE> for svn builds. A fixed number like 1.1 can (and should) be used for releases.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21652 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-07-05 10:35:47 +00:00
parent 4368b59b09
commit ff2f839c39
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rbutil/mkamsboot/Makefile
View file

@ -2,6 +2,9 @@
CFLAGS=-I../../tools/ucl/include -Wall CFLAGS=-I../../tools/ucl/include -Wall
LIBUCL=../../tools/ucl/src/libucl.a LIBUCL=../../tools/ucl/src/libucl.a
#change for releases
APPVERSION=`../../tools/version.sh`
ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
OUTPUT=mkamsboot.exe OUTPUT=mkamsboot.exe
CFLAGS+=-mno-cygwin CFLAGS+=-mno-cygwin
@ -32,7 +35,7 @@ md5.o: md5.c md5.h
$(CC) $(CFLAGS) -c -o md5.o -W -Wall md5.c $(CC) $(CFLAGS) -c -o md5.o -W -Wall md5.c
mkamsboot.o: mkamsboot.c dualboot.h md5.h 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) $(OUTPUT): mkamsboot.o md5.o dualboot.o $(LIBUCL)
$(CC) $(CFLAGS) -o $(OUTPUT) mkamsboot.o md5.o dualboot.o $(LIBUCL) $(CC) $(CFLAGS) -o $(OUTPUT) mkamsboot.o md5.o dualboot.o $(LIBUCL)

5
rbutil/mkamsboot/mkamsboot.c
View file

@ -109,8 +109,6 @@ execution to the uncompressed firmware.
#define O_BINARY 0 #define O_BINARY 0
#endif #endif
#define VERSION "1.1"
/* 4 for m200, 2 for e200/c200, 1 or 2 for fuze/clop */ /* 4 for m200, 2 for e200/c200, 1 or 2 for fuze/clop */
static const unsigned short hw_revisions[] = { static const unsigned short hw_revisions[] = {
[MODEL_FUZE] = 1, [MODEL_FUZE] = 1,
@ -592,8 +590,9 @@ int main(int argc, char* argv[])
sum.md5 = md5sum; sum.md5 = md5sum;
/* VERSION comes frome the Makefile */
fprintf(stderr, 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" "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" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"\n"); "\n");