diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2010-06-21 00:18:29 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2010-06-21 00:18:29 +0000 |
commit | 2b0ef19900295ef4e8da0fa52a13a04ccf76cb65 (patch) | |
tree | 6c6e445a398904780e4843bedf7c543e238197b1 | |
parent | a2ab719d57c2da0a66ece6d6ab1e2eb2a9192413 (diff) | |
download | rockbox-2b0ef19900295ef4e8da0fa52a13a04ccf76cb65.tar.gz rockbox-2b0ef19900295ef4e8da0fa52a13a04ccf76cb65.zip |
Don't autogenerate version.c. Just version.h is enough
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27003 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/SOURCES | 1 | ||||
-rw-r--r-- | firmware/common/version.c | 23 | ||||
-rw-r--r-- | firmware/firmware.make | 6 | ||||
-rwxr-xr-x | tools/genversion.sh | 34 |
4 files changed, 34 insertions, 30 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 3d9c60de6c..c95946dd0d 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -64,6 +64,7 @@ libc/mktime.c | |||
64 | #endif /* !defined(SIMULATOR)*/ | 64 | #endif /* !defined(SIMULATOR)*/ |
65 | 65 | ||
66 | /* Common */ | 66 | /* Common */ |
67 | common/version.c | ||
67 | common/config.c | 68 | common/config.c |
68 | common/crc32.c | 69 | common/crc32.c |
69 | #ifdef MI4_FORMAT | 70 | #ifdef MI4_FORMAT |
diff --git a/firmware/common/version.c b/firmware/common/version.c new file mode 100644 index 0000000000..762842c6de --- /dev/null +++ b/firmware/common/version.c | |||
@@ -0,0 +1,23 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2010 by Frank Gevaerts | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | |||
22 | #include "version.h" | ||
23 | const char rbversion[] = RBVERSION; | ||
diff --git a/firmware/firmware.make b/firmware/firmware.make index badd22ae76..3ccff00dde 100644 --- a/firmware/firmware.make +++ b/firmware/firmware.make | |||
@@ -17,7 +17,6 @@ FIRMLIB_OBJ := $(call c2obj, $(FIRMLIB_SRC)) | |||
17 | ifeq (,$(findstring -DARCHOS_PLAYER,$(TARGET))) | 17 | ifeq (,$(findstring -DARCHOS_PLAYER,$(TARGET))) |
18 | FIRMLIB_OBJ += $(BUILDDIR)/sysfont.o | 18 | FIRMLIB_OBJ += $(BUILDDIR)/sysfont.o |
19 | endif | 19 | endif |
20 | FIRMLIB_OBJ += $(BUILDDIR)/version.o | ||
21 | OTHER_SRC += $(FIRMLIB_SRC) | 20 | OTHER_SRC += $(FIRMLIB_SRC) |
22 | 21 | ||
23 | FIRMLIB = $(BUILDDIR)/firmware/libfirmware.a | 22 | FIRMLIB = $(BUILDDIR)/firmware/libfirmware.a |
@@ -51,8 +50,5 @@ ifneq ($(SVNVERSION),$(OLDSVNVERSION)) | |||
51 | .PHONY: $(BUILDDIR)/version.h | 50 | .PHONY: $(BUILDDIR)/version.h |
52 | endif | 51 | endif |
53 | 52 | ||
54 | $(BUILDDIR)/version.c: $(BUILDDIR)/version.h | ||
55 | $(TOOLSDIR)/genversion.sh c $(BUILDDIR) $(TOOLSDIR)/version.sh $(ROOTDIR) | ||
56 | |||
57 | $(BUILDDIR)/version.h: | 53 | $(BUILDDIR)/version.h: |
58 | $(TOOLSDIR)/genversion.sh h $(BUILDDIR) $(TOOLSDIR)/version.sh $(ROOTDIR) | 54 | $(TOOLSDIR)/genversion.sh $(BUILDDIR) $(TOOLSDIR)/version.sh $(ROOTDIR) |
diff --git a/tools/genversion.sh b/tools/genversion.sh index b49d9f30e7..485263d152 100755 --- a/tools/genversion.sh +++ b/tools/genversion.sh | |||
@@ -6,40 +6,24 @@ | |||
6 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | # \/ \/ \/ \/ \/ | 7 | # \/ \/ \/ \/ \/ |
8 | 8 | ||
9 | # Usage: genversion.sh c/h destination-dir path-to-version.sh [source-root] | 9 | # Usage: genversion.sh destination-dir path-to-version.sh [source-root] |
10 | 10 | ||
11 | # Generate version.[ch] files (if first argument is c or h) | 11 | # Generate version.h file |
12 | 12 | ||
13 | # XXX DO NOT TWEAK VERSION HERE, EDIT version.sh INSTEAD | 13 | # XXX DO NOT TWEAK VERSION HERE, EDIT version.sh INSTEAD |
14 | 14 | ||
15 | VERSION=`$3 $4` | 15 | VERSION=`$2 $3` |
16 | 16 | ||
17 | if [ "$1" = "h" ]; then | 17 | cat > "$1/_version.h" << EOF |
18 | cat > "$2/_version.h" << EOF | ||
19 | /* Generated by genversion.sh */ | 18 | /* Generated by genversion.sh */ |
20 | extern const char rbversion[]; | 19 | extern const char rbversion[]; |
21 | #define RBVERSION "$VERSION" | 20 | #define RBVERSION "$VERSION" |
22 | EOF | 21 | EOF |
23 | 22 | ||
24 | if [ -f "$2/version.h" ] | 23 | if [ -f "$1/version.h" ] |
25 | then if diff "$2/_version.h" "$2/version.h" > /dev/null | 24 | then if diff "$1/_version.h" "$1/version.h" > /dev/null |
26 | then rm -f "$2/_version.h" | 25 | then rm -f "$1/_version.h" |
27 | else mv "$2/_version.h" "$2/version.h" | 26 | else mv "$1/_version.h" "$1/version.h" |
28 | fi | ||
29 | else mv "$2/_version.h" "$2/version.h" | ||
30 | fi | ||
31 | elif [ "$1" = "c" ]; then | ||
32 | cat > "$2/_version.c" << EOF | ||
33 | /* Generated by genversion.sh */ | ||
34 | #include "version.h" | ||
35 | const char rbversion[] = RBVERSION; | ||
36 | EOF | ||
37 | |||
38 | if [ -f "$2/version.c" ] | ||
39 | then if diff "$2/_version.c" "$2/version.c" > /dev/null | ||
40 | then rm -f "$2/_version.c" | ||
41 | else mv "$2/_version.c" "$2/version.c" | ||
42 | fi | ||
43 | else mv "$2/_version.c" "$2/version.c" | ||
44 | fi | 27 | fi |
28 | else mv "$1/_version.h" "$1/version.h" | ||
45 | fi | 29 | fi |