Qwen3.8-Flash-Next on any consumer hardware: one-click install for Windows / Linux. Strata inference engine, OpenAI/Anthropic API on localhost, optional image input.
C++
setup: a build folder configured with another generator is configured again instead of stopping cmake (#4038)
Niko1221bf994ca4141c
diff --git a/setup.py b/setup.pyindex c1a06ab6b..f994d32e8 100644--- a/setup.py+++ b/setup.py@@ -5577,9 +5577,35 @@ def ensure_build_tools():return cmake, ninja+def configured_generator(bdir: Path) -> str | None:+ """The generator a build folder was configured with (CMakeCache.txt), None when it was never configured."""+ try:+ for line in (Path(bdir) / "CMakeCache.txt").read_text(encoding="utf-8", errors="replace").splitlines():+ if line.startswith("CMAKE_GENERATOR:"):+ return line.split("=", 1)[1].strip()+ except OSError:+ pass+ return None+++def fresh_if_other_generator(bdir: Path, generator: str = "Ninja") -> bool:+ """CMake refuses to configure a folder with another generator than the one it was made with ("Does not match the generator used+ previously"). The manual build in docs/INSTALL.md uses CMake's default, Unix Makefiles on Linux, in the same build/ folder (#4038).+ Such a folder is configured afresh: its cache is removed (the compiled objects of the other generator are not reused anyway), with one+ plain line. True when it did."""+ had = configured_generator(bdir)+ if had is None or had == generator:+ return False+ say(f" {Path(bdir).name}/ was configured with {had}; setup builds with {generator}, so it is configured again (the other build is not used)")+ (Path(bdir) / "CMakeCache.txt").unlink(missing_ok=True)+ shutil.rmtree(Path(bdir) / "CMakeFiles", ignore_errors=True)+ return True++def cmake_build(src, bdir, target, defs, vcvars, bat_name):acquisition.require("a compile (cmake)")cmake, ninja = ensure_build_tools()+ fresh_if_other_generator(bdir)conf = [cmake, "-G", "Ninja", f"-DCMAKE_MAKE_PROGRAM={ninja}", "-S", str(src), "-B", str(bdir),"-DCMAKE_BUILD_TYPE=Release", *defs]build = [cmake, "--build", str(bdir), "--target", target, "-j", str(max(2, (os.cpu_count() or 4) // 2))]diff --git a/tools/test_setup_build_dir.py b/tools/test_setup_build_dir.pynew file mode 100644index 000000000..b69add3d5--- /dev/null+++ b/tools/test_setup_build_dir.py@@ -0,0 +1,86 @@+"""A build folder made by the manual build in docs/INSTALL.md (CMake's default generator) does not stop setup --build (#4038).++CMake refuses a folder configured with another generator ("Does not match the generator used previously: Unix Makefiles"), and setup+always asks for Ninja. The folder is configured afresh, with one plain line; a folder made with Ninja, or never configured, is left alone.++ python -m unittest tools.test_setup_build_dir+"""+from __future__ import annotations++import contextlib+import io+import sys+import tempfile+import unittest+from pathlib import Path+from unittest import mock++ROOT = Path(__file__).resolve().parents[1]+sys.path.insert(0, str(ROOT))+import setup # noqa: E402+++def configured(folder: Path, generator: str) -> Path:+ folder.mkdir(parents=True, exist_ok=True)+ (folder / "CMakeCache.txt").write_text(+ f"# This is the CMakeCache file.\nCMAKE_BUILD_TYPE:STRING=Release\nCMAKE_GENERATOR:INTERNAL={generator}\nCMAKE_HOME_DIRECTORY:INTERNAL=/x\n", encoding="utf-8")+ (folder / "CMakeFiles").mkdir(exist_ok=True)+ (folder / "CMakeFiles" / "marker.txt").write_text("x", encoding="utf-8")+ (folder / "keep.o").write_text("object", encoding="utf-8")+ return folder+++class OtherGenerator(unittest.TestCase):+ def setUp(self):+ tmp = tempfile.TemporaryDirectory()+ self.addCleanup(tmp.cleanup)+ self.root = Path(tmp.name)++ def call(self, folder):+ out = io.StringIO()+ with contextlib.redirect_stdout(out):+ return setup.fresh_if_other_generator(folder), out.getvalue()++ def test_the_generator_is_read_from_the_cache(self):+ self.assertEqual(setup.configured_generator(configured(self.root / "a", "Unix Makefiles")), "Unix Makefiles")+ self.assertEqual(setup.configured_generator(configured(self.root / "b", "Ninja")), "Ninja")+ self.assertIsNone(setup.configured_generator(self.root / "never"))++ def test_a_folder_made_with_makefiles_is_configured_again(self):+ folder = configured(self.root / "build", "Unix Makefiles")+ again, said = self.call(folder)+ self.assertTrue(again)+ self.assertIn("Unix Makefiles", said)+ self.assertIn("Ninja", said)+ self.assertFalse((folder / "CMakeCache.txt").exists())+ self.assertFalse((folder / "CMakeFiles").exists())+ self.assertTrue((folder / "keep.o").exists(), "only the CMake cache goes, no other file of the folder")++ def test_a_ninja_folder_and_a_new_folder_are_left_alone(self):+ folder = configured(self.root / "ninja", "Ninja")+ again, said = self.call(folder)+ self.assertFalse(again)+ self.assertEqual(said, "")+ self.assertTrue((folder / "CMakeCache.txt").exists() and (folder / "CMakeFiles" / "marker.txt").exists())+ self.assertEqual(self.call(self.root / "new"), (False, ""))+ self.assertFalse((self.root / "new").exists(), "a folder that does not exist is not created by the check")++ def test_cmake_build_does_it_before_it_configures(self):+ folder = configured(self.root / "build", "Unix Makefiles")+ seen = []++ def fake_run(cmd, **kw):+ seen.append((list(map(str, cmd)), (folder / "CMakeCache.txt").exists()))+ return mock.Mock(returncode=0)++ with mock.patch.object(setup, "ensure_build_tools", return_value=("cmake", "ninja")), \+ mock.patch.object(setup.acquisition, "require"), mock.patch.object(setup, "WIN", False), \+ mock.patch.object(setup, "run", fake_run), contextlib.redirect_stdout(io.StringIO()):+ setup.cmake_build(self.root, folder, "strata", [], None, "")+ configure = seen[0]+ self.assertIn("Ninja", configure[0])+ self.assertFalse(configure[1], "the old cache was gone when cmake was asked to configure")+++if __name__ == "__main__":+ unittest.main()