fixup! fixup! cmake: enhance support of cmake config file syntax

mesonbuild/mesonlib.py

@@ -908,15 +908,21 @@ def do_replacement(regex: T.Pattern[str], line: str, variable_format: str,
             return var
     return re.sub(regex, variable_replace, line), missing_variables
 
+def do_define(regex: T.Pattern[str], line: str, confdata: 'ConfigurationData', variable_format: str) -> str:
+    def get_cmake_define(line: str, confdata: 'ConfigurationData') -> str:
+        arr = line.split()
+        define_value=[]
+        for token in arr[2:]:
+            try:
+                (v, desc) = confdata.get(token)
+                define_value += [v]
+            except KeyError:
+                define_value += [token]
+        return ' '.join(define_value)
 
-def do_define(line: str, confdata: 'ConfigurationData', mesondefine: bool) -> str:
     arr = line.split()
-    if mesondefine:
-      if len(arr) != 2:
-        raise MesonException('#mesondefine does not contain exactly two tokens: %s' % line.strip())
-    else:
-      if len(arr) not in (2, 3):
-        raise MesonException('#cmakedefine does not contain two or tree tokens: %s' % line.strip())
+    if variable_format == 'meson' and len(arr) != 2:
+      raise MesonException('#mesondefine does not contain exactly two tokens: %s' % line.strip())
 
     varname = arr[1]
     try:
@@ -931,12 +937,27 @@ def do_define(line: str, confdata: 'ConfigurationData', mesondefine: bool) -> st
     elif isinstance(v, int):
         return '#define %s %d\n' % (varname, v)
     elif isinstance(v, str):
-        return '#define %s %s\n' % (varname, v)
+        if variable_format == 'meson':
+            result = v
+        else:
+            result = get_cmake_define(line, confdata)
+        result = '#define %s %s\n' % (varname, result)
+        (result, missing_variable) = do_replacement(regex, result, variable_format, confdata)
+        return result
     else:
         raise MesonException('#mesondefine argument "%s" is of unknown type.' % varname)
 
 def do_conf_str (data: list, confdata: 'ConfigurationData', variable_format: str,
                  encoding: str = 'utf-8') -> T.Tuple[T.List[str],T.Set[str], bool]:
+    def line_is_valid(line : str, variable_format: str):
+      if variable_format == 'meson':
+          if '#cmakedefine' in line:
+              return False
+      else: #cmake format
+         if '#mesondefine' in line:
+            return False
+      return True
+
     # Only allow (a-z, A-Z, 0-9, _, -) as valid characters for a define
     # Also allow escaping '@' with '\@'
     if variable_format in ['meson', 'cmake@']:
@@ -958,8 +979,10 @@ def do_conf_str (data: list, confdata: 'ConfigurationData', variable_format: str
     for line in data:
         if line.startswith(search_token):
             confdata_useless = False
-            line = do_define(line, confdata, (variable_format == 'meson'))
+            line = do_define(regex, line, confdata, variable_format)
         else:
+            if not line_is_valid(line,variable_format):
+                raise MesonException('Format "{}" mismatched'.format(variable_format))
             line, missing = do_replacement(regex, line, variable_format, confdata)
             missing_variables.update(missing)
             if missing:

run_unittests.py

@@ -1871,34 +1871,53 @@ class AllPlatformTests(BasePlatformTests):
         self.assertEqual(conf_file('@VAR@\r\n@VAR@\r\n', confdata), 'foo\r\nfoo\r\n')
 
     def test_do_conf_file_by_format(self):
-
-        def conf_file(in_data, confdata, vformat):
+        def conf_str(in_data, confdata, vformat):
             (result, missing_variables, confdata_useless) = mesonbuild.mesonlib.do_conf_str(in_data, confdata, variable_format = vformat)
             return '\n'.join(result)
 
         def check_formats (confdata, result):
-          self.assertEqual(conf_file(['#mesondefine VAR'], confdata, 'meson'),result)
-          self.assertEqual(conf_file(['#cmakedefine VAR'], confdata, 'cmake'),result)
-          self.assertEqual(conf_file(['#cmakedefine VAR @VAR@'], confdata, 'cmake@'),result)
+          self.assertEqual(conf_str(['#mesondefine VAR'], confdata, 'meson'),result)
+          self.assertEqual(conf_str(['#cmakedefine VAR ${VAR}'], confdata, 'cmake'),result)
+          self.assertEqual(conf_str(['#cmakedefine VAR @VAR@'], confdata, 'cmake@'),result)
 
-         #Key error as they do not exists
         confdata = ConfigurationData()
+        # Key error as they do not exists
         check_formats(confdata, '/* #undef VAR */\n')
 
-        # check boolean
+        # Check boolean
         confdata.values = {'VAR': (False,'description')}
         check_formats(confdata, '#undef VAR\n')
         confdata.values = {'VAR': (True,'description')}
         check_formats(confdata, '#define VAR\n')
 
-        # check string
+        # Check string
         confdata.values = {'VAR': ('value','description')}
         check_formats(confdata, '#define VAR value\n')
 
-        # check integer
+        # Check integer
         confdata.values = {'VAR': (10,'description')}
         check_formats(confdata, '#define VAR 10\n')
 
+        # Check multiple string with cmake formats
+        confdata.values = {'VAR': ('value','description')}
+        self.assertEqual(conf_str(['#cmakedefine VAR xxx @VAR@ yyy @VAR@'], confdata, 'cmake@'),'#define VAR xxx value yyy value\n')
+        self.assertEqual(conf_str(['#define VAR xxx @VAR@ yyy @VAR@'], confdata, 'cmake@'),'#define VAR xxx value yyy value')
+        self.assertEqual(conf_str(['#cmakedefine VAR xxx ${VAR} yyy ${VAR}'], confdata, 'cmake'),'#define VAR xxx value yyy value\n')
+        self.assertEqual(conf_str(['#define VAR xxx ${VAR} yyy ${VAR}'], confdata, 'cmake'),'#define VAR xxx value yyy value')
+
+        # Handles meson format exceptions
+        #   Unknown format
+        self.assertRaises(mesonbuild.mesonlib.MesonException, conf_str,['#mesondefine VAR xxx'], confdata, 'unknown_format')
+        #   More than 2 params in mesondefine
+        self.assertRaises(mesonbuild.mesonlib.MesonException, conf_str,['#mesondefine VAR xxx'], confdata, 'meson')
+        #   Mismatched line with format
+        self.assertRaises(mesonbuild.mesonlib.MesonException, conf_str,['#cmakedefine VAR'], confdata, 'meson')
+        self.assertRaises(mesonbuild.mesonlib.MesonException, conf_str,['#mesondefine VAR'], confdata, 'cmake')
+        self.assertRaises(mesonbuild.mesonlib.MesonException, conf_str,['#mesondefine VAR'], confdata, 'cmake@')
+        #   Dict value in confdata
+        confdata.values = {'VAR': (['value'],'description')}
+        self.assertRaises(mesonbuild.mesonlib.MesonException, conf_str,['#mesondefine VAR'], confdata, 'meson')
+
     def test_absolute_prefix_libdir(self):
         '''
         Tests that setting absolute paths for --prefix and --libdir work. Can't