options: process project options before machine options

Restore the behavior from before commit d37d649 ("Make all Meson level
options overridable per subproject.", 2025-02-13).  The old code was:

        options: T.MutableMapping[OptionKey, T.Any] = OrderedDict()

        # process project default options
        for k, v in default_options.items():
            if not subproject or k.subproject == subproject:
                options[k] = v

        # override them with machine default and command line options
        options.update(env.options)
        env.options = options

Fixes: #14608
Signed-off-by: Paolo Bonzini <[email protected]>
(cherry picked from commit 82fca50)

# Conflicts:
#       mesonbuild/options.py

Author: bonzini

mesonbuild/options.py

@@ -1310,28 +1310,6 @@ def initialize_from_top_level_project_call(self,
             project_default_options = self.optlist2optdict(project_default_options) # type: ignore [assignment]
         if project_default_options is None:
             project_default_options = {}
-        assert isinstance(machine_file_options, dict)
-        for keystr, valstr in machine_file_options.items():
-            if isinstance(keystr, str):
-                # FIXME, standardise on Key or string.
-                key = OptionKey.from_string(keystr)
-            else:
-                key = keystr
-            # Due to backwards compatibility we ignore all build-machine options
-            # when building natively.
-            if not self.is_cross and key.is_for_build():
-                continue
-            if key.subproject:
-                augstr = str(key)
-                self.augments[augstr] = valstr
-            elif key in self.options:
-                self.set_option(key, valstr, first_invocation)
-            else:
-                proj_key = key.as_root()
-                if proj_key in self.options:
-                    self.set_option(proj_key, valstr, first_invocation)
-                else:
-                    self.pending_options[key] = valstr
         assert isinstance(project_default_options, dict)
         for keystr, valstr in project_default_options.items():
             # Ths is complicated by the fact that a string can have two meanings:
@@ -1368,6 +1346,28 @@ def initialize_from_top_level_project_call(self,
                     self.set_option(proj_key, valstr)
                 else:
                     self.pending_options[key] = valstr
+        assert isinstance(machine_file_options, dict)
+        for keystr, valstr in machine_file_options.items():
+            if isinstance(keystr, str):
+                # FIXME, standardise on Key or string.
+                key = OptionKey.from_string(keystr)
+            else:
+                key = keystr
+            # Due to backwards compatibility we ignore all build-machine options
+            # when building natively.
+            if not self.is_cross and key.is_for_build():
+                continue
+            if key.subproject:
+                augstr = str(key)
+                self.augments[augstr] = valstr
+            elif key in self.options:
+                self.set_option(key, valstr, first_invocation)
+            else:
+                proj_key = key.as_root()
+                if proj_key in self.options:
+                    self.set_option(proj_key, valstr, first_invocation)
+                else:
+                    self.pending_options[key] = valstr
         assert isinstance(cmd_line_options, dict)
         for keystr, valstr in cmd_line_options.items():
             if isinstance(keystr, str):

unittests/optiontests.py

@@ -35,6 +35,22 @@ def test_toplevel_project(self):
         optstore.initialize_from_top_level_project_call({OptionKey('someoption'): new_value}, {}, {})
         self.assertEqual(optstore.get_value_for(k), new_value)
 
+    def test_machine_vs_project(self):
+        optstore = OptionStore(False)
+        name = 'backend'
+        default_value = 'ninja'
+        proj_value = 'xcode'
+        mfile_value = 'vs2010'
+        k = OptionKey(name)
+        prefix = UserStringOption('prefix', 'This is needed by OptionStore', '/usr')
+        optstore.add_system_option('prefix', prefix)
+        vo = UserStringOption(k.name, 'You know what this is', default_value)
+        optstore.add_system_option(k.name, vo)
+        self.assertEqual(optstore.get_value_for(k), default_value)
+        optstore.initialize_from_top_level_project_call({OptionKey(name): proj_value}, {},
+                                                        {OptionKey(name): mfile_value})
+        self.assertEqual(optstore.get_value_for(k), mfile_value)
+
     def test_subproject_system_option(self):
         """Test that subproject system options get their default value from the global
            option (e.g. "sub:b_lto" can be initialized from "b_lto")."""