Mercurial > zfc9000 / changeset

--- a/CMakeLists.txt	Fri Feb 05 11:36:38 2021 +0200
+++ b/CMakeLists.txt	Mon Apr 10 10:42:45 2023 +0300
@@ -1,10 +1,11 @@
-cmake_minimum_required (VERSION 2.4)
+cmake_minimum_required (VERSION 3.2)
 cmake_policy (SET CMP0003 NEW)
 project (ZFC9000)
 string (TOLOWER ${CMAKE_PROJECT_NAME} TARGET_NAME)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
+add_definitions(-DCMAKE_PROJECT_NAME="${CMAKE_PROJECT_NAME}")
 
 add_library (huffman STATIC
 	huffman/bitreader.cpp
@@ -139,7 +140,7 @@
 endif()
 
 add_custom_target (make_hginfo_h
-	COMMAND python
+	COMMAND python3
 		"${CMAKE_SOURCE_DIR}/updaterevision/updaterevision.py"
 		"${CMAKE_CURRENT_BINARY_DIR}/hginfo.h")
 add_dependencies (${TARGET_NAME} make_hginfo_h)

--- a/sources/mystring.h	Fri Feb 05 11:36:38 2021 +0200
+++ b/sources/mystring.h	Mon Apr 10 10:42:45 2023 +0300
@@ -32,6 +32,7 @@
 #include <deque>
 #include <string>
 #include <stdarg.h>
+#include <optional>
 #include "basics.h"
 #include "list.h"
 

--- a/sources/version.cpp	Fri Feb 05 11:36:38 2021 +0200
+++ b/sources/version.cpp	Mon Apr 10 10:42:45 2023 +0300
@@ -79,10 +79,11 @@
 
 	if (buffer[0] == '\0')
 	{
-		if (strcmp (HG_BRANCH, "default") != 0)
-			sprintf (buffer, "%s-%s (%s)", version_string(), HG_NODE, HG_BRANCH);
-		else
-			sprintf (buffer, "%s-%s", version_string(), HG_NODE);
+#ifdef HG_BRANCH
+		sprintf (buffer, "%s-%s (%s)", version_string(), HG_NODE, HG_BRANCH);
+#else
+		sprintf (buffer, "%s-%s", version_string(), HG_NODE);
+#endif
 	}
 
 	return buffer;

--- a/updaterevision/updaterevision.py	Fri Feb 05 11:36:38 2021 +0200
+++ b/updaterevision/updaterevision.py	Mon Apr 10 10:42:45 2023 +0300
@@ -1,83 +1,81 @@
-#
-#	Copyright 2014 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 sys
-import subprocess
-from datetime import datetime
-
-if len (sys.argv) != 2:
-	print 'usage: %s <output>' % sys.argv[0]
-	quit (1)
-
-oldcompare = ''
-
-try:
-	with open (sys.argv[1]) as fp:
-		oldcompare = fp.readline().replace ('\n', '').replace ('// ', '')
-except IOError:
-    pass
-
-delim='@'*10
-rev, branch, timestampstr, tags = subprocess.check_output (['hg', 'log', '-r.', '--template',
-	delim.join (['{node|short}', '{branch}', '{date|hgdate}', '{tags}'])]).replace ('\n', '').split (delim)
-
-timestamp = int (timestampstr.split(' ')[0])
-date = datetime.utcfromtimestamp (timestamp)
-datestring = date.strftime ('%y%m%d-%H%M') if date.year >= 2000 else '000000-0000'
-
-if tags and tags != 'tip':
-	tag = tags.split(' ')[0]
-else:
-	tag = None
-
-if len(rev) > 7:
-	rev = rev[0:7]
-
-if subprocess.check_output (['hg', 'id', '-n']).replace ('\n', '')[-1] == '+':
-	rev += '+'
-
-compare = tag or rev
-
-if compare == oldcompare:
-	print "%s is up to date at %s" % (sys.argv[1], compare)
-	quit (0)
-
-with open (sys.argv[1], 'w') as fp:
-	fp.write ('// %s\n' % compare)
-	fp.write ('#define HG_NODE "%s"\n' % rev)
-	fp.write ('#define HG_BRANCH "%s"\n' % branch)
-	fp.write ('#define HG_DATE_VERSION "%s"\n' % datestring)
-	fp.write ('#define HG_DATE_STRING "%s"\n' % date.strftime ('%d %b %Y'))
-	fp.write ('#define HG_DATE_TIME %d\n' % int (timestamp))
-
-	if tag:
-		fp.write ('#define HG_TAG "%s"\n' % tags.split(' ')[0])
-
-	print '%s updated to %s' % (sys.argv[1], compare)
+#!/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 argparse
+import outputfile
+
+if __name__ == '__main__':
+	import subprocess
+	from datetime import datetime
+	parser = argparse.ArgumentParser(description='Writes a header file with Hg commit information')
+	parser.add_argument('--cwd', default = '.')
+	parser.add_argument('output')
+	args = parser.parse_args()
+	data = subprocess.check_output(['hg', 'log', '--cwd', args.cwd, '-r.', '--template',
+		'{node|short} {branch} {date|hgdate} {tags}']).decode().replace('\n', '').split()
+	rev = data[0]
+	branch = data[1]
+	timestamp = int(data[2])
+	all_tags = set(data[4:])
+	try:
+		version_tag = [tag for tag in all_tags if tag.startswith('v')][0]
+	except IndexError:
+		version_tag = None
+	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[:7]
+	modified = subprocess.check_output(['hg', 'id', '--cwd', args.cwd, '-n']).decode().strip().endswith('+')
+	if modified:
+		rev += '+'
+		# if the source tree is modified, it's not the released version
+		version_tag = None
+	if version_tag is not None:
+		# tags should be the same in released versions whether or not it's tip
+		# (though released versions shouldn't be tip because hgtags is modified
+		# to create the tag 🤔, but let's do this anyway)
+		all_tags -= {'tip'}
+	with outputfile.OutputFile(args.output, verbose = True) as f:
+		f.write(f'#define HG_NODE "{rev}"\n')
+		if branch != 'default':
+			f.write(f'#define HG_BRANCH "{branch}"\n')
+		f.write(f'#define HG_DATE_VERSION "{datestring}"\n')
+		f.write(f'#define HG_DATE_TIME {int(timestamp)}\n')
+		datestring = date.strftime('%d %b %Y')
+		f.write(f'#define HG_DATE_STRING "{datestring}"\n')
+		if all_tags:
+			f.write(f'#define HG_ALL_TAGS "{" ".join(sorted(all_tags))}"\n')
+		if version_tag:
+			f.write(f'#define HG_VERSION_TAG "{version_tag[1:]}"\n')
+		if 'tip' in all_tags:
+			f.write('#define HG_TIP\n')
+	print(f'Current Hg revision: {rev}')