Skip to content

Commit e1282ec

Browse files
jcfrjcfr
authored
Merge pull request #17 from kjerstadius/update-ninja
Update ninja to 1.9.0.g5b44b.kitware.dyndep-1.jobserver-1
2 parents 49f5a68 + 005feb1 commit e1282ec

File tree

4 files changed

+26
-32
lines changed

4 files changed

+26
-32
lines changed

‎NinjaUrls.cmake‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
11

22
#-----------------------------------------------------------------------------
33
# Ninja sources
4-
set(unix_source_url "https://github.com/kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz")
5-
set(unix_source_sha256 "121c432cec32c8aea730a71a256a81442ac8446c6f0e7652ea3121da9e0d482d")
4+
set(unix_source_url "https://github.com/kitware/ninja/archive/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1.tar.gz")
5+
set(unix_source_sha256 "449359a402c3adccd37f6fece19ce7d7cda586e837fdf50eb7d53597b7f1ce90")
66

7-
set(windows_source_url "https://github.com/kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.zip")
8-
set(windows_source_sha256 "01a2bb09bb2f6e6c0e4c9634e0491ad137fde80c3e99de581ee311401d07976a")
9-
10-
if(MSVC AND (MSVC_VERSION EQUAL 1600 OR MSVC_VERSION LESS 1600))
11-
# Fix compilation using "Microsoft Visual C++ Compiler for Python 2.7" or "Visual Studio 2010"
12-
set(windows_source_url "https://github.com/jcfr/ninja/archive/kitware-staged-features-support-vs2008-vs2010.zip")
13-
set(windows_source_sha256 "d64d6ae2eaeed28832e9a9c28901b01f9d070d3f440346e585f68d490447f262")
14-
endif()
7+
set(windows_source_url "https://github.com/kitware/ninja/archive/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1.zip")
8+
set(windows_source_sha256 "ff573af7342780afea85ffab9563cc68988c58d7b72f1b2b72754fcc7e771bbf")
159

1610
#-----------------------------------------------------------------------------
1711
# Ninja binaries
1812
set(linux32_binary_url "NA") # Linux 32-bit binaries not available
1913
set(linux32_binary_sha256 "NA")
2014

21-
set(linux64_binary_url "https://github.com/Kitware/ninja/releases/download/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1/ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1_x86_64-linux-gnu.tar.gz")
22-
set(linux64_binary_sha256 "d0c1c112edbbee421509540764086a2aeaba72d9f552f31423390f8cd254d332")
15+
set(linux64_binary_url "https://github.com/Kitware/ninja/releases/download/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1/ninja-1.9.0.g5b44b.kitware.dyndep-1.jobserver-1_x86_64-linux-gnu.tar.gz")
16+
set(linux64_binary_sha256 "f7e5e4f45b99d85465017caa5e289d8bc7636ee43b9863139e8fd5eb7d9079ee")
2317

24-
set(macosx_binary_url "https://github.com/Kitware/ninja/releases/download/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1/ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1_x86_64-apple-darwin.tar.gz")
25-
set(macosx_binary_sha256 "d71dfa6ec1c15fca4c559ef5d8e7170639e791d499a742eb814e104e82352338")
18+
set(macosx_binary_url "https://github.com/Kitware/ninja/releases/download/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1/ninja-1.9.0.g5b44b.kitware.dyndep-1.jobserver-1_x86_64-apple-darwin.tar.gz")
19+
set(macosx_binary_sha256 "b757ce95aa9b9682dec76b18c26ec64536ba38ac107780080636014524f32e37")
2620

2721
set(win32_binary_url "NA") # Windows 32-bit binaries not available
2822
set(win32_binary_sha256 "NA")
2923

30-
set(win64_binary_url "https://github.com/Kitware/ninja/releases/download/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1/ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1_i686-pc-windows-msvc.zip")
31-
set(win64_binary_sha256 "665581a875ffa16bcb410972fd8cb419035ce66cf4760b55ba8a57774b2afa61")
24+
set(win64_binary_url "https://github.com/Kitware/ninja/releases/download/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1/ninja-1.9.0.g5b44b.kitware.dyndep-1.jobserver-1_i686-pc-windows-msvc.zip")
25+
set(win64_binary_sha256 "4cde85857e18c4a0e3b0a67718a88a1206cfc8323fcd850364c29ea1949959c1")

‎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.8.2.g3bbbe.kitware.dyndep-1.jobserver-1 <https://ninja-build.org/manual.html>`_ executable
7+
The latest Ninja python wheels provide `ninja 1.9.0.g5b44b.kitware.dyndep-1.jobserver-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: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ Available Ninja archives can be found `here <https://github.com/kitware/ninja/re
1616
2. Execute `scripts/update_ninja_version.py` command line tool with the desired
1717
``X.Y.Z`` Ninja version available for download. For example::
1818

19-
$ release=1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1
19+
$ release=1.9.0.g5b44b.kitware.dyndep-1.jobserver-1
2020
$ python scripts/update_ninja_version.py ${release}
2121

2222
Collecting URLs and SHA256s from 'https://github.com/kitware/ninja/releases'
23-
Downloading https://github.com/kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz
24-
Downloading https://github.com/kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz - done
25-
Downloading https://github.com/kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.zip
26-
Downloading https://github.com/kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.zip - done
27-
Downloading https://github.com/Kitware/ninja/releases/download/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1/ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1_i686-pc-windows-msvc.zip
28-
Downloading https://github.com/Kitware/ninja/releases/download/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1/ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1_i686-pc-windows-msvc.zip - done
29-
Downloading https://github.com/Kitware/ninja/releases/download/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1/ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1_x86_64-apple-darwin.tar.gz
30-
Downloading https://github.com/Kitware/ninja/releases/download/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1/ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1_x86_64-apple-darwin.tar.gz - done
31-
Downloading https://github.com/Kitware/ninja/releases/download/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1/ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1_x86_64-linux-gnu.tar.gz
32-
Downloading https://github.com/Kitware/ninja/releases/download/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1/ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1_x86_64-linux-gnu.tar.gz - done
23+
Downloading https://github.com/kitware/ninja/archive/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1.tar.gz
24+
Downloading https://github.com/kitware/ninja/archive/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1.tar.gz - done
25+
Downloading https://github.com/kitware/ninja/archive/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1.zip
26+
Downloading https://github.com/kitware/ninja/archive/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1.zip - done
27+
Downloading https://github.com/kitware/ninja/releases/download/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1/ninja-1.9.0.g5b44b.kitware.dyndep-1.jobserver-1
28+
Downloading https://github.com/kitware/ninja/releases/download/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1/ninja-1.9.0.g5b44b.kitware.dyndep-1.jobserver-1 - done
29+
Downloading https://github.com/kitware/ninja/releases/download/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1/ninja-1.9.0.g5b44b.kitware.dyndep-1.jobserver-1
30+
Downloading https://github.com/kitware/ninja/releases/download/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1/ninja-1.9.0.g5b44b.kitware.dyndep-1.jobserver-1 - done
31+
Downloading https://github.com/kitware/ninja/releases/download/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1/ninja-1.9.0.g5b44b.kitware.dyndep-1.jobserver-1
32+
Downloading https://github.com/kitware/ninja/releases/download/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1/ninja-1.9.0.g5b44b.kitware.dyndep-1.jobserver-1 - done
3333
Collecting URLs and SHA256s from 'https://github.com/kitware/ninja/releases' - done
34-
Updating 'NinjaUrls.cmake' with CMake version 1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1
35-
Updating 'NinjaUrls.cmake' with CMake version 1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1 - done
34+
Updating 'NinjaUrls.cmake' with CMake version 1.9.0.g5b44b.kitware.dyndep-1.jobserver-1
35+
Updating 'NinjaUrls.cmake' with CMake version 1.9.0.g5b44b.kitware.dyndep-1.jobserver-1 - done
3636
Updating README.rst
3737
Updating README.rst - done
3838
Updating docs/update_ninja_version.rst
@@ -44,7 +44,7 @@ Available Ninja archives can be found `here <https://github.com/kitware/ninja/re
4444
3. Create a topic named `update-to-ninja-X.Y.Z` and commit the changes.
4545
For example::
4646

47-
release=1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1
47+
release=1.9.0.g5b44b.kitware.dyndep-1.jobserver-1
4848
git checkout -b update-to-ninja-${release}
4949
git add NinjaUrls.cmake README.rst docs/update_ninja_version.rst tests/test_distribution.py
5050
git commit -m "Update to Ninja ${release}"

‎tests/test_distribution.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
def _check_ninja_install(virtualenv):
11-
expected_version = "1.8.2.git.kitware.dyndep-1.jobserver-1"
11+
expected_version = "1.9.0.git.kitware.dyndep-1.jobserver-1"
1212

1313
for executable_name in ["ninja"]:
1414
output = virtualenv.run(

0 commit comments

Comments
 (0)