Improved versioning stuff

amiitool.c

@@ -19,7 +19,7 @@ static char * self;
 
 void usage() {
 	fprintf(stderr,
-		"amiitool v%s (commit %08x)\n"
+		"amiitool build %i (commit %s-%08x)\n"
 		"by Marcos Del Sol Vives <[email protected]>\n"
 		"\n"
 		"Usage: %s (-e|-d) -k keyfile [-i input] [-o output]\n"
@@ -29,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",
-		nfc3d_version(), nfc3d_commit_id(), self
+		nfc3d_version_build(), nfc3d_version_fork(), nfc3d_version_commit(), self
 	);
 }
 

include/nfc3d/version.h

@@ -9,9 +9,8 @@
 
 #include <stdint.h>
 
-const char * nfc3d_version();
-uint32_t nfc3d_version_code();
-uint32_t nfc3d_commit_id();
-uint32_t nfc3d_commit_count();
+const char * nfc3d_version_fork();
+uint32_t nfc3d_version_build();
+uint32_t nfc3d_version_commit();
 
 #endif

version.c

@@ -1,6 +1,5 @@
 /*
- * (c) 2015-2017 Marcos Del Sol Vives
- * (c) 2016      javiMaD
+ * (c) 2017      Marcos Del Sol Vives
  *
  * SPDX-License-Identifier: MIT
  */
@@ -9,31 +8,15 @@
 #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;
+const char * nfc3d_version_fork() {
+	// TODO: maybe this should go in another file?
+	return "socram";
 }
 
-uint32_t nfc3d_commit_id() {
+uint32_t nfc3d_version_commit() {
 	return GIT_COMMIT_ID;
 }
 
-uint32_t nfc3d_commit_count() {
+uint32_t nfc3d_version_build() {
 	return GIT_COMMIT_COUNT;
 }