Skip to content

feat: use 1.13.0 from Kitware fork #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 2, 2025
Merged

feat: use 1.13.0 from Kitware fork #305

merged 10 commits into from
Aug 2, 2025

Conversation

henryiii
Copy link
Contributor

@henryiii henryiii commented Jun 20, 2025

Ran nox -s bump -- --upstream-repository Kitware/ninja.

The Kitware fork adds the following feature compared to upstream:

  • make-4.3-jobserver-1: Based on this release, which includes pipe-based jobserver support for Make 4.3 and was conveniently created by the same developer who upstreamed jobserver support

henryiii and others added 3 commits June 20, 2025 11:03
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
@jcfr
Copy link
Contributor

jcfr commented Jun 20, 2025

Interesting, this includes a new feature branch, msvc-depfile. We will loose this new addition upgrading to 1.13.0.

I just shared feedback with the CMake team explaining the situation.

In a nutshell, I mentioned it would be ideal to update the Kitware fork based of version 1.13 while also integrating the following features:

  • make-4.3-jobserver-1: Based on this release, which includes pipe-based jobserver support for Make 4.3 and was conveniently created by the same developer who upstreamed jobserver support
  • msvcdepfile-1: Adds Windows-specific support for parsing MSVC dependency files. See PR #2600

I will follow-up once we discussed it and settle on a path forward.

@mayeut
Copy link
Contributor

mayeut commented Jul 26, 2025

The PR for msvcdepfile-1 has been closed for now and is not in the new 1.13.0 tag in Kitware fork.
I guess we should go with 1.13.0 and make-4.3-jobserver-1 only from the Kitware fork ?

@jcfr
Copy link
Contributor

jcfr commented Jul 26, 2025

Ditto. Here is what we discussed with @bradking

I'm actually inclined to drop that from our fork [...] but the motivating use case was addressed another way, and the corresponding changes to cmake were never merged. After discussion in https://github.com/ninja-build/ninja/issues/1806#issuecomment-2971607874 on the upstream Ninja side [...] it is unlikely they will ever accept the feature.

Switching to the updated Kitware fork with the backported classic job server is then a sensible path forward.

@mayeut mayeut changed the title feat: use 1.12.1 from Kitware fork feat: use 1.13.0 from Kitware fork Aug 2, 2025
@mayeut
Copy link
Contributor

mayeut commented Aug 2, 2025

The test failing on Windows seems to be coming from the jobserver patch in Kitware fork which does not make the test expected result depend on the platform: Kitware/ninja@8879a03#diff-4a3129d062b73d6f6436e3d4e5e3f41bbb848ef49cce54309fe6a00b6f93d132

c.f. Kitware/ninja#3

@mayeut mayeut merged commit fe743d0 into master Aug 2, 2025
18 checks passed
@mayeut mayeut deleted the 1.12.1 branch August 2, 2025 14:29
This was referenced Aug 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants