Add versioning functions

Author: Marcos Del Sol Vives

.gitignore

@@ -10,3 +10,6 @@
 *.o
 /amiitool
 /amiitool.exe
+
+# Ignore version files
+/gitversion.h

Makefile

@@ -23,7 +23,7 @@ MBEDTLS_DIR = $(PWD)/mbedtls
 MBEDTLS_CONFIG = $(PWD)/configs/mbedtls.h
 MBEDTLS_CFLAGS = -DMBEDTLS_CONFIG_FILE='\"$(MBEDTLS_CONFIG)\"' $(CFLAGS)
 
-HEADERS := $(wildcard *.h)
+HEADERS := $(wildcard *.h) gitversion.h
 OBJECTS := $(patsubst %.c,%.o,$(wildcard *.c))
 LIBSOBJ := $(filter-out $(BINS:%=%.o),$(OBJECTS))
 
@@ -45,6 +45,10 @@ all: $(BINS)
 %.o: %.c $(HEADERS)
 	$(CC) $(ALL_CFLAGS) -c $< -o $@
 
+gitversion.h:
+	echo "#define GIT_COMMIT_ID 0x`git rev-parse HEAD | head -c8`" > $(PWD)/gitversion.h
+	echo "#define GIT_COMMIT_COUNT `git rev-list --count --all`" >> $(PWD)/gitversion.h
+
 # Static mbed TLS
 mbedtls: $(MBEDTLS_CONFIG)
 	"$(MAKE)" lib -C $(MBEDTLS_DIR) CFLAGS="$(MBEDTLS_CFLAGS)"
@@ -54,7 +58,7 @@ clean: mostlyclean
 	$(MAKE) -C $(MBEDTLS_DIR) clean
 
 mostlyclean:
-	$(RM) $(OBJECTS) $(BINS)
+	$(RM) $(OBJECTS) $(BINS) gitversion.h
 
 # Install
 install: $(BINS:%=install_%)

amiitool.c

@@ -5,7 +5,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "nfc3d/amiibo.h"
+#include <nfc3d/amiibo.h>
+#include <nfc3d/version.h>
 #include "util.h"
 #include <stdio.h>
 #include <string.h>
@@ -18,7 +19,7 @@ static char * self;
 
 void usage() {
 	fprintf(stderr,
-		"amiitool\n"
+		"amiitool v%s (commit %08x)\n"
 		"by Marcos Del Sol Vives <[email protected]>\n"
 		"\n"
 		"Usage: %s (-e|-d) -k keyfile [-i input] [-o output]\n"
@@ -28,7 +29,7 @@ void usage() {
 		"   -i input file. If not specified, stdin will be used.\n"
 		"   -o output file. If not specified, stdout will be used.\n"
 		"   -l decrypt files with invalid signatures.\n",
-		self
+		nfc3d_version(), nfc3d_commit_id(), self
 	);
 }
 

include/nfc3d/version.h

@@ -0,0 +1,17 @@
+/*
+ * (c) 2017      Marcos Del Sol Vives
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef HAVE_NFC3D_VERSION_H
+#define HAVE_NFC3D_VERSION_H
+
+#include <stdint.h>
+
+const char * nfc3d_version();
+uint32_t nfc3d_version_code();
+uint32_t nfc3d_commit_id();
+uint32_t nfc3d_commit_count();
+
+#endif

version.c

@@ -0,0 +1,39 @@
+/*
+ * (c) 2015-2017 Marcos Del Sol Vives
+ * (c) 2016      javiMaD
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <nfc3d/version.h>
+#include <stdio.h>
+#include "gitversion.h"
+
+static char vstr[16] = { 0 };
+
+const char * nfc3d_version() {
+	if (vstr[0]) {
+		return vstr;
+	}
+
+	uint32_t version = nfc3d_version_code();
+	uint32_t major = version >> 24;
+	uint32_t minor = version >> 12 & 0xFFF;
+	uint32_t revision = version & 0xFFF;
+
+	snprintf(vstr, sizeof(vstr) - 1, "%x.%x.%x", major, minor, revision);
+	return vstr;
+}
+
+uint32_t nfc3d_version_code() {
+	// TODO: can we get this from Git tags somehow?
+	return 0x01000000;
+}
+
+uint32_t nfc3d_commit_id() {
+	return GIT_COMMIT_ID;
+}
+
+uint32_t nfc3d_commit_count() {
+	return GIT_COMMIT_COUNT;
+}