Skip to content

Commit edd7cde

Browse files
committed
feat: use 1.12.1 from Kitware fork
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
1 parent 39d391f commit edd7cde

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "ninja-upstream"]
22
path = ninja-upstream
3-
url = https://github.com/ninja-build/ninja.git
3+
url = https://github.com/Kitware/ninja.git

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Ninja Python Distributions
44

55
`Ninja <http://www.ninja-build.org>`_ is a small build system with a focus on speed.
66

7-
The latest Ninja python wheels provide `ninja 1.13.0 <https://ninja-build.org/manual.html>`_ executable
7+
The latest Ninja python wheels provide `ninja 1.12.1.ge64ce.kitware.jobserver-1.msvcdepfile-1 <https://ninja-build.org/manual.html>`_ executable
88
and `ninja_syntax.py` for generating `.ninja` files.
99

1010
.. image:: https://raw.githubusercontent.com/scikit-build/ninja-python-distributions/master/ninja-python-distributions-logo.png

docs/update_ninja_version.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Updating the Ninja version
77
A developer should use the following steps to update the version ``X.Y.Z``
88
of Ninja associated with the current Ninja python distributions.
99

10-
Available Ninja archives can be found `here <https://github.com/ninja-build/ninja/releases>`_.
10+
Available Ninja archives can be found `here <https://github.com/Kitware/ninja/releases>`_.
1111

1212
Nox prodedure
1313
-------------
@@ -29,17 +29,17 @@ Classic procedure:
2929
2. Execute `scripts/update_ninja_version.py` command line tool with the desired
3030
``X.Y.Z`` Ninja version available for download. For example::
3131

32-
$ release=1.13.0
32+
$ release=1.12.1.ge64ce.kitware.jobserver-1.msvcdepfile-1
3333
$ python scripts/update_ninja_version.py ${release}
3434

35-
Collecting URLs and SHA256s from 'https://github.com/ninja-build/ninja/archive/v1.10.0.gfb670.kitware.jobserver-1'
36-
Downloading https://github.com/ninja-build/ninja/archive/v1.13.0.tar.gz
37-
Downloading https://github.com/ninja-build/ninja/archive/v1.13.0.tar.gz - done
38-
Downloading https://github.com/ninja-build/ninja/archive/v1.13.0.zip
39-
Downloading https://github.com/ninja-build/ninja/archive/v1.13.0.zip - done
40-
Collecting URLs and SHA256s from 'https://github.com/ninja-build/ninja/archive/v1.10.0.gfb670.kitware.jobserver-1' - done
41-
Updating 'NinjaUrls.cmake' with CMake version 1.13.0
42-
Updating 'NinjaUrls.cmake' with CMake version 1.13.0 - done
35+
Collecting URLs and SHA256s from 'https://github.com/Kitware/ninja/archive/v1.10.0.gfb670.kitware.jobserver-1'
36+
Downloading https://github.com/Kitware/ninja/archive/v1.12.1.ge64ce.kitware.jobserver-1.msvcdepfile-1.tar.gz
37+
Downloading https://github.com/Kitware/ninja/archive/v1.12.1.ge64ce.kitware.jobserver-1.msvcdepfile-1.tar.gz - done
38+
Downloading https://github.com/Kitware/ninja/archive/v1.12.1.ge64ce.kitware.jobserver-1.msvcdepfile-1.zip
39+
Downloading https://github.com/Kitware/ninja/archive/v1.12.1.ge64ce.kitware.jobserver-1.msvcdepfile-1.zip - done
40+
Collecting URLs and SHA256s from 'https://github.com/Kitware/ninja/archive/v1.10.0.gfb670.kitware.jobserver-1' - done
41+
Updating 'NinjaUrls.cmake' with CMake version 1.12.1.ge64ce.kitware.jobserver-1.msvcdepfile-1
42+
Updating 'NinjaUrls.cmake' with CMake version 1.12.1.ge64ce.kitware.jobserver-1.msvcdepfile-1 - done
4343
Updating README.rst
4444
Updating README.rst - done
4545
Updating docs/update_ninja_version.rst
@@ -51,7 +51,7 @@ Classic procedure:
5151
3. Create a topic named `update-to-ninja-X.Y.Z` and commit the changes.
5252
For example::
5353

54-
release=1.13.0
54+
release=1.12.1.ge64ce.kitware.jobserver-1.msvcdepfile-1
5555
git checkout -b update-to-ninja-${release}
5656
git add NinjaUrls.cmake README.rst docs/update_ninja_version.rst tests/test_ninja.py
5757
git commit -m "Update to Ninja ${release}"

tests/test_ninja.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ def test_ninja_module():
3636

3737

3838
def test_ninja_package():
39-
expected_version = "1.13.0"
39+
expected_version = "1.12.1.git.kitware.jobserver-1.msvcdepfile-1"
4040
output = subprocess.check_output([sys.executable, "-m", "ninja", "--version"]).decode("ascii")
4141
assert output.splitlines()[0] == expected_version
4242

4343

4444
def test_ninja_script():
45-
expected_version = "1.13.0"
45+
expected_version = "1.12.1.git.kitware.jobserver-1.msvcdepfile-1"
4646
scripts = _get_scripts()
4747
assert len(scripts) == 1
4848
assert scripts[0].stem == "ninja"

0 commit comments

Comments
 (0)