Merge #176: Make make-tag.py compatible with CMake

658a84a Make `make-tag.py` compatible with CMake (Hennadii Stepanov)
278f73a Fix "SyntaxWarning: invalid escape sequence" (Hennadii Stepanov)

Pull request description:

  Fixes #175.

ACKs for top commit:
  achow101:
    ACK 658a84a
  laanwj:
    Code review ACK 658a84a

Tree-SHA512: 1a39e9fbf19b6785091a3e16ad98e61c981b124a6b12234065756785fd6f946fef30d6ba61289a4bb0183a49f56296384d857d5d18d34f9be05e2925a991c4d9

Author: achow101

make-tag.py

@@ -38,7 +38,7 @@ def parse_tag(tag):
     - v1.2rc3
     - v1.2.3rc4
     '''
-    m = re.match("^v([0-9]+)\.([0-9]+)(?:\.([0-9]+))?(?:rc([0-9])+)?$", tag)
+    m = re.match(r"^v([0-9]+)\.([0-9]+)(?:\.([0-9]+))?(?:rc([0-9])+)?$", tag)
 
     if m is None:
         print(f"Invalid tag {tag}", file=sys.stderr)
@@ -62,16 +62,25 @@ def parse_tag(tag):
 
     return VersionSpec(int(major), int(minor), int(build), int(rc))
 
-def check_configure_ac(spec):
+def check_buildsystem(spec):
     '''
-    Parse configure.ac and return
+    Parse configure.ac or CMakeLists.txt and return
     (major, minor, build, rc)
     '''
     info = {}
     filename = 'configure.ac'
+    if os.path.exists(filename):
+        pattern = r"define\(_CLIENT_VERSION_([A-Z_]+), ([0-9a-z]+)\)"
+    else:
+        filename = 'CMakeLists.txt'
+        if not os.path.exists(filename):
+            print("No buildsystem (configure.ac or CMakeLists.txt) found", file=sys.stderr)
+            sys.exit(1)
+        pattern = r'set\(CLIENT_VERSION_([A-Z_]+)\s+"?([0-9a-z]+)"?\)'
+
     with open(filename) as f:
         for line in f:
-            m = re.match("define\(_CLIENT_VERSION_([A-Z_]+), ([0-9a-z]+)\)", line)
+            m = re.match(pattern, line)
             if m:
                 info[m.group(1)] = m.group(2)
     # check if IS_RELEASE is set
@@ -110,7 +119,7 @@ def main():
         sys.exit(1)
 
     # Check version components against configure.ac in git tree
-    check_configure_ac(spec)
+    check_buildsystem(spec)
 
     # Generate base message
     if not spec.build: