revision: change revision generation, no effect on output

This doesn't change the behavior of any command, but adds revision.c as a real source file rather than something created by make using "echo ... > revision.c". In any case, the file is recompiled each time you call "make", so the date and time reflect the last build. However, this introduces CONFIG_DETERMINISTIC_BINARY (that nobody sets at this point in time) to build a binary withouth __DATE__ and __TIME__ strings, so it is the same at every rebuild. See next commit. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

revision: change revision generation, no effect on output
This doesn't change the behavior of any command, but adds revision.c as a real source file rather than something created by make using "echo ... > revision.c". In any case, the file is recompiled each time you call "make", so the date and time reflect the last build. However, this introduces CONFIG_DETERMINISTIC_BINARY (that nobody sets at this point in time) to build a binary withouth __DATE__ and __TIME__ strings, so it is the same at every rebuild. See next commit. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
5d4ef29f · Alessandro Rubini · 6c5c7358 · 5d4ef29f · 5d4ef29f · 5d4ef29f
Commit 5d4ef29f authored Oct 15, 2012 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 5 deletions

.gitignore .gitignore +0 -1

Makefile Makefile +1 -3

revision.c revision.c +9 -0

cmd_version.c shell/cmd_version.c +1 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 *.bin
 *.*~
 include/board.h
-revision.c
 tools/zpu-loader
 tools/vuart_console
 tools/genraminit

--- a/Makefile
+++ b/Makefile
@@ -83,9 +83,7 @@ REVISION=$(shell git describe --dirty --always)
 all: tools wrc
 wrc: silentoldconfig $(OBJS)
-	echo "const char *build_revision = \"$(REVISION)\";" > revision.c
+	$(CC) $(CFLAGS) -DGIT_REVISION=\"$(REVISION)\" -c revision.c
-	echo "const char *build_date = __DATE__ \" \" __TIME__;" >> revision.c
-	$(CC) $(CFLAGS) -c revision.c
 	$(SIZE) -t $(OBJS)
 	${CC} -o $(OUTPUT).elf revision.o $(OBJS) $(LDFLAGS)
 	${OBJCOPY} -O binary $(OUTPUT).elf $(OUTPUT).bin

--- a/revision.c
+++ b/revision.c
+const char *build_revision = GIT_REVISION;
+#ifdef CONFIG_DETERMINISTIC_BINARY
+const char *build_date = "";
+#else
+const char *build_date = ", compiled on: " __DATE__ " " __TIME__;
+#endif
--- a/shell/cmd_version.c
+++ b/shell/cmd_version.c
@@ -5,7 +5,7 @@ extern const char *build_revision, *build_date;
 int cmd_version(const char *args[])
 {
-	mprintf("WR Core build: %s, compiled on: %s (memory size: %d kB)\n",
+	mprintf("WR Core build: %s%s (memory size: %d kB)\n",
 		build_revision, build_date, sysc_get_memsize());
 	return 0;
 }