Further tweaks to buildinfo

Summary:
Old idea with changes since previous release tag
didn't work good enough. In most of the cases tag
was done in a branch hence not actually reachable
from the master branch.

Now change since release is gone, and date of
the latest commit is used instead.

The date is displayed in format YYYY-MM-DD HH:mm
in the splash.

New bpy.app fields:

- build_commit_timestamp is an unix timestamp of
  the commit blender was build from.
- build_commit_date is a date of that commit.
- build_commit_time is a time of that commit.

Reviewers: campbellbarton

Differential Revision: http://developer.blender.org/D5

7 files changed, 45 insertions, 42 deletions

diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h
index 36c1f5dcf1f..629eda3b583 100644
--- a/source/blender/blenkernel/BKE_main.h
+++ b/source/blender/blenkernel/BKE_main.h
@@ -53,7 +53,8 @@ typedef struct Main {
 	char name[1024]; /* 1024 = FILE_MAX */
 	short versionfile, subversionfile;  /* see BLENDER_VERSION, BLENDER_SUBVERSION */
 	short minversionfile, minsubversionfile;
-	char build_change[16], build_hash[16];  /* change number and hash from buildinfo */
+	unsigned long build_commit_timestamp; /* commit's timestamp from buildinfo */
+	char build_hash[16];  /* hash from buildinfo */
 	short recovered;	/* indicate the main->name (file) is the recovered one */
 	
 	struct Library *curlib;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 910ff1d9ebe..e2876317e38 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7293,7 +7293,7 @@ static BHead *read_global(BlendFileData *bfd, FileData *fd, BHead *bhead)
 	bfd->main->subversionfile = fg->subversion;
 	bfd->main->minversionfile = fg->minversion;
 	bfd->main->minsubversionfile = fg->minsubversion;
-	BLI_strncpy(bfd->main->build_change, fg->build_change, sizeof(bfd->main->build_change));
+	bfd->main->build_commit_timestamp = fg->build_commit_timestamp;
 	BLI_strncpy(bfd->main->build_hash, fg->build_hash, sizeof(bfd->main->build_hash));
 	
 	bfd->winpos = fg->winpos;
@@ -7929,9 +7929,14 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 	/* WATCH IT!!!: pointers from libdata have not been converted */
 	
 	if (G.debug & G_DEBUG) {
-		printf("read file %s\n  Version %d sub %d change %s hash %s\n",
+		char build_commit_datetime[32];
+		time_t temp_time = main->build_commit_timestamp;
+		struct tm *tm = gmtime(&temp_time);
+		strftime(build_commit_datetime, sizeof(build_commit_datetime), "%Y-%m-%d %H:%M", tm);
+
+		printf("read file %s\n  Version %d sub %d date %s hash %s\n",
 		       fd->relabase, main->versionfile, main->subversionfile,
-		       main->build_change, main->build_hash);
+		       build_commit_datetime, main->build_hash);
 	}
 	
 	blo_do_versions_pre250(fd, lib, main);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index cf7a5329a35..1f417df38d2 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -3285,13 +3285,14 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar)
 	fg.minsubversion= BLENDER_MINSUBVERSION;
 #ifdef WITH_BUILDINFO
 	{
-		extern char build_change[], build_hash[];
+		extern unsigned long build_commit_timestamp;
+		extern char build_hash[];
 		/* TODO(sergey): Add branch name to file as well? */
-		BLI_strncpy(fg.build_change, build_change, sizeof(fg.build_change));
+		fg.build_commit_timestamp = build_commit_timestamp;
 		BLI_strncpy(fg.build_hash, build_hash, sizeof(fg.build_hash));
 	}
 #else
-	BLI_strncpy(fg.build_change, "unknown", sizeof(fg.build_change));
+	fg.build_commit_timestamp = 0;
 	BLI_strncpy(fg.build_hash, "unknown", sizeof(fg.build_hash));
 #endif
 	writestruct(wd, GLOB, "FileGlobal", 1, &fg);
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp
index 9aa0f6e2831..9d590968481 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@ -101,7 +101,8 @@ extern "C"
 
 #include "ED_keyframing.h"
 #ifdef WITH_BUILDINFO
-extern char build_change[];
+extern char build_commit_date[];
+extern char build_commit_time[];
 extern char build_hash[];
 #endif
 
@@ -227,16 +228,12 @@ void DocumentExporter::exportCurrentScene(Scene *sce)
 	}
 	char version_buf[128];
 #ifdef WITH_BUILDINFO
-	/* TODO(sergey): As soon as we fully switched to GIT, no need to check build_hash. */
-	if (build_hash[0] != '\0') {
-		sprintf(version_buf, "Blender %d.%02d.%d change:%s, hash:", BLENDER_VERSION / 100, BLENDER_VERSION % 100, BLENDER_SUBVERSION,
-		        build_change, build_hash);
-	}
-	else {
-		sprintf(version_buf, "Blender %d.%02d.%d r%s", BLENDER_VERSION / 100, BLENDER_VERSION % 100, BLENDER_SUBVERSION, build_change);
-	}
+	BLI_snprintf(version_buf, sizeof(version_buf), "Blender %d.%02d.%d commit date:%s, hash:",
+	             BLENDER_VERSION / 100, BLENDER_VERSION % 100, BLENDER_SUBVERSION,
+	             build_commit_date, blender_commit_time, build_hash);
 #else
-	sprintf(version_buf, "Blender %d.%02d.%d", BLENDER_VERSION / 100, BLENDER_VERSION % 100, BLENDER_SUBVERSION);
+	BLI_snprintf(version_buf, sizeof(version_buf), "Blender %d.%02d.%d",
+	             BLENDER_VERSION / 100, BLENDER_VERSION % 100, BLENDER_SUBVERSION);
 #endif
 	asset.getContributor().mAuthoringTool = version_buf;
 	asset.add();
diff --git a/source/blender/makesdna/DNA_fileglobal_types.h b/source/blender/makesdna/DNA_fileglobal_types.h
index 734741fa687..f0f8fe7d40c 100644
--- a/source/blender/makesdna/DNA_fileglobal_types.h
+++ b/source/blender/makesdna/DNA_fileglobal_types.h
@@ -48,7 +48,8 @@ typedef struct FileGlobal {
 	struct Scene *curscene;
 	int fileflags;
 	int globalf;
-	char build_change[16], build_hash[16];  /* change number and hash from buildinfo */
+	unsigned long build_commit_timestamp;  /* commit timestamp from buildinfo */
+	char build_hash[12];  /* hash from buildinfo */
 	/* file path where this was saved, for recover */
 	char filename[1024]; /* 1024 = FILE_MAX */
 } FileGlobal;
diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c
index 3a529496f02..21767196e11 100644
--- a/source/blender/python/intern/bpy_app.c
+++ b/source/blender/python/intern/bpy_app.c
@@ -53,7 +53,9 @@
 #ifdef BUILD_DATE
 extern char build_date[];
 extern char build_time[];
-extern char build_change[];
+extern unsigned long build_commit_timestamp;
+extern char build_commit_date[];
+extern char build_commit_time[];
 extern char build_hash[];
 extern char build_branch[];
 extern char build_platform[];
@@ -77,7 +79,9 @@ static PyStructSequence_Field app_info_fields[] = {
 	/* buildinfo */
 	{(char *)"build_date", (char *)"The date this blender instance was built"},
 	{(char *)"build_time", (char *)"The time this blender instance was built"},
-	{(char *)"build_change", (char *)"The change number this blender instance was built with"},
+	{(char *)"build_commit_timestamp", (char *)"The unix timestamp of commit this blender instance was built"},
+	{(char *)"build_commit_date", (char *)"The date of commit this blender instance was built"},
+	{(char *)"build_commit_time", (char *)"The time of commit this blender instance was built"},
 	{(char *)"build_hash", (char *)"The commit hash this blender instance was built with"},
 	{(char *)"build_branch", (char *)"The branch this blender instance was built from"},
 	{(char *)"build_platform", (char *)"The platform this blender instance was built for"},
@@ -111,10 +115,8 @@ static PyObject *make_app_info(void)
 	if (app_info == NULL) {
 		return NULL;
 	}
-#if 0
 #define SetIntItem(flag) \
 	PyStructSequence_SET_ITEM(app_info, pos++, PyLong_FromLong(flag))
-#endif
 #define SetStrItem(str) \
 	PyStructSequence_SET_ITEM(app_info, pos++, PyUnicode_FromString(str))
 #define SetBytesItem(str) \
@@ -137,7 +139,9 @@ static PyObject *make_app_info(void)
 #ifdef BUILD_DATE
 	SetBytesItem(build_date);
 	SetBytesItem(build_time);
-	SetBytesItem(build_change);
+	SetIntItem(build_commit_timestamp);
+	SetBytesItem(build_commit_date);
+	SetBytesItem(build_commit_time);
 	SetBytesItem(build_hash);
 	SetBytesItem(build_branch);
 	SetBytesItem(build_platform);
@@ -149,6 +153,8 @@ static PyObject *make_app_info(void)
 #else
 	SetBytesItem("Unknown");
 	SetBytesItem("Unknown");
+	SetIntItem(0);
+	SetBytesItem("Unknown");
 	SetBytesItem("Unknown");
 	SetBytesItem("Unknown");
 	SetBytesItem("Unknown");
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index ab8dac396c5..6396ef12495 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1677,24 +1677,19 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
 
 #ifdef WITH_BUILDINFO
 	int label_delta = 0;
-	int hash_width, change_width;
-	char change_buf[128] = "\0";
+	int hash_width, date_width;
+	char date_buf[128] = "\0";
 	char hash_buf[128] = "\0";
-	extern char build_hash[], build_change[], build_branch[];
+	extern unsigned long build_commit_timestamp;
+	extern char build_hash[], build_commit_date[], build_commit_time[], build_branch[];
 
-	/* TODO(sergey): As soon as we fully switched to GIT, no need to check build_hash. */
-	if (build_hash[0] != '\0') {
-		/* Builds made from tag only shows tag sha */
-		BLI_snprintf(hash_buf, sizeof(hash_buf), "Hash: %s", build_hash);
-		BLI_snprintf(change_buf, sizeof(change_buf), "Change: %s", build_change);
-	}
-	else {
-		BLI_snprintf(change_buf, sizeof(change_buf), "r%s", build_change);
-	}
+	/* Builds made from tag only shows tag sha */
+	BLI_snprintf(hash_buf, sizeof(hash_buf), "Hash: %s", build_hash);
+	BLI_snprintf(date_buf, sizeof(date_buf), "Date: %s %s", build_commit_date, build_commit_time);
 	
 	BLF_size(style->widgetlabel.uifont_id, style->widgetlabel.points, U.pixelsize * U.dpi);
 	hash_width = (int)BLF_width(style->widgetlabel.uifont_id, hash_buf) + 0.5f * U.widget_unit;
-	change_width = (int)BLF_width(style->widgetlabel.uifont_id, change_buf) + 0.5f * U.widget_unit;
+	date_width = (int)BLF_width(style->widgetlabel.uifont_id, date_buf) + 0.5f * U.widget_unit;
 #endif  /* WITH_BUILDINFO */
 
 	block = uiBeginBlock(C, ar, "_popup", UI_EMBOSS);
@@ -1710,16 +1705,13 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
 	uiBlockSetFunc(block, wm_block_splash_refreshmenu, block, NULL);
 	
 #ifdef WITH_BUILDINFO
-	if (!STREQ(build_change, "0")) {
-		uiDefBut(block, LABEL, 0, change_buf, U.pixelsize * 494 - change_width, U.pixelsize * 270, change_width, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
+	if (build_commit_timestamp != 0) {
+		uiDefBut(block, LABEL, 0, date_buf, U.pixelsize * 494 - date_width, U.pixelsize * 270, date_width, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
 		label_delta = 12;
 	}
 	uiDefBut(block, LABEL, 0, hash_buf, U.pixelsize * 494 - hash_width, U.pixelsize * (270 - label_delta), hash_width, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
 
-	/* TODO(sergey): As soon as we fully switched to GIT, no need to check
-	 *               whether branch is empty or not.
-	 */
-	if (build_branch[0] != '\0' && !STREQ(build_branch, "master")) {
+	if (!STREQ(build_branch, "master")) {
 		char branch_buf[128] = "\0";
 		int branch_width;
 		BLI_snprintf(branch_buf, sizeof(branch_buf), "Branch: %s", build_branch);