Replaced date with Git hash.

diff --git a/Makefile.gh-pages b/Makefile.gh-pages
index f90a34c332c9ab87f5619c48cbbe2eea3f5389ae..4c6734ca64f623d8ecbb42d4784df05b8378b5e5 100644 (file)
--- a/Makefile.gh-pages
+++ b/Makefile.gh-pages
@@ -5,7 +5,7 @@
 GH_PAGES = ../gh-pages
 
 all:
-       date +%F | zip -z cc65
+       echo $(TRAVIS_COMMIT) | zip -z cc65
 ifdef GH_TOKEN
        git clone --branch=gh-pages https://$(GH_TOKEN)@github.com/cc65/cc65.git $(GH_PAGES)
        cd $(GH_PAGES) && git config user.name "Oliver Schmidt"

diff --git a/src/Makefile b/src/Makefile
index 17754190c501bc38a065c0e53c0dc419ae8201e4..2c2267ae78b76605181926c0769829a350ddb325 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -39,9 +39,17 @@ ifdef USER_CFLAGS
   $(info USER_CFLAGS: $(USER_CFLAGS))
 endif
 
+ifndef GIT_SHA
+  GIT_SHA := $(if $(wildcard ../.git),$(shell git rev-parse --short HEAD))
+  ifneq ($(words $(GIT_SHA)),1)
+    GIT_SHA := N/A
+  endif
+endif
+$(info GIT_SHA: $(GIT_SHA))
+
 CFLAGS += -MMD -MP -O -I common \
           -Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS) \
-          -DCA65_INC=$(CA65_INC) -DCC65_INC=$(CC65_INC) \
+          -DGIT_SHA=$(GIT_SHA) -DCA65_INC=$(CA65_INC) -DCC65_INC=$(CC65_INC) \
           -DLD65_LIB=$(LD65_LIB) -DLD65_OBJ=$(LD65_OBJ) -DLD65_CFG=$(LD65_CFG)
 
 LDLIBS += -lm

diff --git a/src/common/version.c b/src/common/version.c
index 51921d19079c1288c10ff6bdf12d21bacd7afec1..d2fcf4f409379745b0feacf27efbb42a54520d58 100644 (file)
--- a/src/common/version.c
+++ b/src/common/version.c
@@ -33,8 +33,10 @@
 
 
 
-#include "version.h"
+/* common */
 #include "xsprintf.h"
+#include "searchpath.h"
+#include "version.h"
 
 
 
@@ -58,8 +60,12 @@
 const char* GetVersionAsString (void)
 /* Returns the version number as a string in a static buffer */
 {
-    static char Buf[40];
-    xsnprintf (Buf, sizeof (Buf), "%u.%u - %s", VER_MAJOR, VER_MINOR, __DATE__);
+    static char Buf[60];
+#if defined(GIT_SHA)
+    xsnprintf (Buf, sizeof (Buf), "%u.%u - Git %s", VER_MAJOR, VER_MINOR, STRINGIZE (GIT_SHA));
+#else
+    xsnprintf (Buf, sizeof (Buf), "%u.%u", VER_MAJOR, VER_MINOR);
+#endif
     return Buf;
 }