Mercurial > zcinema / changeset

--- a/.hgignore	Sat Jun 06 22:03:00 2015 +0300
+++ b/.hgignore	Sat Jun 06 22:18:30 2015 +0300
@@ -3,3 +3,6 @@
 release
 build
 CMakeLists.txt.user
+*~
+.kdev4
+*.kdev4

--- a/CMakeLists.txt	Sat Jun 06 22:03:00 2015 +0300
+++ b/CMakeLists.txt	Sat Jun 06 22:18:30 2015 +0300
@@ -76,6 +76,14 @@
 	)
 endif()
 
+add_custom_target (make_hginfo
+	COMMAND python
+		"${CMAKE_SOURCE_DIR}/updaterevision.py"
+		"${CMAKE_CURRENT_BINARY_DIR}/hginfo.h"
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
+add_dependencies (${PROJECT_NAME} make_hginfo)
+
 # With clang, we need to set -Wno-deprecated since Qt headers seem to use the register keyword
 # which clang doesn't seem to like.
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")

--- a/src/main.cpp	Sat Jun 06 22:03:00 2015 +0300
+++ b/src/main.cpp	Sat Jun 06 22:18:30 2015 +0300
@@ -21,6 +21,7 @@
 #include "types.h"
 #include "demo.h"
 #include "prompts.h"
+#include "hginfo.h"
 
 //
 // -------------------------------------------------------------------------------------------------
@@ -67,7 +68,18 @@
 
 QString versionString()
 {
+#ifndef RELEASE
+# ifdef HG_NODE
+	// non-release with hg info
+	return VERSION_STRING "-" HG_NODE;
+# else
+	// non-release, no hg info
+	return VERSION_STRING "-beta";
+# endif
+#else
+	// release
 	return VERSION_STRING;
+#endif
 }
 
 //
@@ -76,5 +88,11 @@
 
 QString versionSignature()
 {
-	return QString (APPNAME) + " " + versionString();
+#ifdef HG_DATE_STRING
+# define DATE_INFO " (" HG_DATE_STRING ")"
+#else
+# define DATE_INFO ""
+#endif
+	
+	return QString (APPNAME) + " " + versionString() + DATE_INFO;
 }
\ No newline at end of file

--- a/src/main.h	Sat Jun 06 22:03:00 2015 +0300
+++ b/src/main.h	Sat Jun 06 22:18:30 2015 +0300
@@ -22,7 +22,7 @@
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 0
 #define VERSION_PATCH 0
-// #define IS_RELEASE
+// #define RELEASE
 
 #define MACRO_TO_STRING(A) MACRO_TO_STRING_(A)
 #define MACRO_TO_STRING_(A) #A

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/updaterevision.py	Sat Jun 06 22:18:30 2015 +0300
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+# coding: utf-8
+#
+#	Copyright 2015 Teemu Piippo
+#	All rights reserved.
+#
+#	Redistribution and use in source and binary forms, with or without
+#	modification, are permitted provided that the following conditions
+#	are met:
+#
+#	1. Redistributions of source code must retain the above copyright
+#	   notice, this list of conditions and the following disclaimer.
+#	2. Redistributions in binary form must reproduce the above copyright
+#	   notice, this list of conditions and the following disclaimer in the
+#	   documentation and/or other materials provided with the distribution.
+#	3. Neither the name of the copyright holder nor the names of its
+#	   contributors may be used to endorse or promote products derived from
+#	   this software without specific prior written permission.
+#
+#	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+#	TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+#	PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+#	OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+#	EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#	PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+#	PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+#	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+#	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+import md5, sys
+
+class OutputFile:
+	def __init__ (self, filename):
+		self.filename = filename
+		try:
+			with open (self.filename, "r") as fp:
+				self.oldsum = fp.readline().replace ('\n', '').replace ('// ', '')
+		except IOError:
+			self.oldsum = ''
+
+		self.body = ''
+
+	def write (self, a):
+		self.body += a
+
+	def save (self):
+		checksum = md5.new (self.body).hexdigest()
+
+		if checksum == self.oldsum:
+			print '%s is up to date' % self.filename
+			return False
+
+		with open (self.filename, "w") as fp:
+			fp.write ('// %s\n' % checksum)
+			fp.write (self.body)
+			return True
+
+def main():
+	import subprocess
+	from datetime import datetime
+
+	if len (sys.argv) != 2:
+		print 'usage: %s <output>' % sys.argv[0]
+		quit (1)
+
+	f = OutputFile (sys.argv[1])
+	data = subprocess.check_output (['hg', 'log', '-r.', '--template',
+		'{node|short} {branch} {date|hgdate}']).replace ('\n', '').split (' ')
+
+	rev = data[0]
+	branch = data[1]
+	timestamp = int (data[2])
+	date = datetime.utcfromtimestamp (timestamp)
+	datestring = date.strftime ('%y%m%d-%H%M') if date.year >= 2000 else '000000-0000'
+
+	if len(rev) > 7:
+		rev = rev[0:7]
+
+	if subprocess.check_output (['hg', 'id', '-n']).replace ('\n', '')[-1] == '+':
+		rev += '+'
+
+	f.write ('#define HG_NODE "%s"\n' % rev)
+	f.write ('#define HG_BRANCH "%s"\n' % branch)
+	f.write ('#define HG_DATE_VERSION "%s"\n' % datestring)
+	f.write ('#define HG_DATE_STRING "%s"\n' % date.strftime ('%d %b %Y'))
+	f.write ('#define HG_DATE_TIME %d\n' % int (timestamp))
+	if f.save():
+		print '%s updated to %s' % (f.filename, rev)
+
+if __name__ == '__main__':
+	main()
\ No newline at end of file