From e4f7bc1e5fe72235b5c148e7b5e478816c200f0e Mon Sep 17 00:00:00 2001 From: Richard Kjerstadius Date: Sat, 23 Feb 2019 00:32:57 +0100 Subject: [PATCH 1/2] Update ninja to 1.9.0.g5b44b.kitware.dyndep-1.jobserver-1 --- NinjaUrls.cmake | 26 ++++++++++---------------- README.rst | 2 +- docs/update_ninja_version.rst | 28 ++++++++++++++-------------- tests/test_distribution.py | 2 +- 4 files changed, 26 insertions(+), 32 deletions(-) diff --git a/NinjaUrls.cmake b/NinjaUrls.cmake index 98ac3fc..d963929 100644 --- a/NinjaUrls.cmake +++ b/NinjaUrls.cmake @@ -1,31 +1,25 @@ #----------------------------------------------------------------------------- # Ninja sources -set(unix_source_url "https://github.com/kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz") -set(unix_source_sha256 "121c432cec32c8aea730a71a256a81442ac8446c6f0e7652ea3121da9e0d482d") +set(unix_source_url "https://github.com/kitware/ninja/archive/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1.tar.gz") +set(unix_source_sha256 "449359a402c3adccd37f6fece19ce7d7cda586e837fdf50eb7d53597b7f1ce90") -set(windows_source_url "https://github.com/kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.zip") -set(windows_source_sha256 "01a2bb09bb2f6e6c0e4c9634e0491ad137fde80c3e99de581ee311401d07976a") - -if(MSVC AND (MSVC_VERSION EQUAL 1600 OR MSVC_VERSION LESS 1600)) - # Fix compilation using "Microsoft Visual C++ Compiler for Python 2.7" or "Visual Studio 2010" - set(windows_source_url "https://github.com/jcfr/ninja/archive/kitware-staged-features-support-vs2008-vs2010.zip") - set(windows_source_sha256 "d64d6ae2eaeed28832e9a9c28901b01f9d070d3f440346e585f68d490447f262") -endif() +set(windows_source_url "https://github.com/kitware/ninja/archive/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1.zip") +set(windows_source_sha256 "ff573af7342780afea85ffab9563cc68988c58d7b72f1b2b72754fcc7e771bbf") #----------------------------------------------------------------------------- # Ninja binaries set(linux32_binary_url "NA") # Linux 32-bit binaries not available set(linux32_binary_sha256 "NA") -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") -set(linux64_binary_sha256 "d0c1c112edbbee421509540764086a2aeaba72d9f552f31423390f8cd254d332") +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") +set(linux64_binary_sha256 "f7e5e4f45b99d85465017caa5e289d8bc7636ee43b9863139e8fd5eb7d9079ee") -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") -set(macosx_binary_sha256 "d71dfa6ec1c15fca4c559ef5d8e7170639e791d499a742eb814e104e82352338") +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") +set(macosx_binary_sha256 "b757ce95aa9b9682dec76b18c26ec64536ba38ac107780080636014524f32e37") set(win32_binary_url "NA") # Windows 32-bit binaries not available set(win32_binary_sha256 "NA") -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") -set(win64_binary_sha256 "665581a875ffa16bcb410972fd8cb419035ce66cf4760b55ba8a57774b2afa61") +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") +set(win64_binary_sha256 "4cde85857e18c4a0e3b0a67718a88a1206cfc8323fcd850364c29ea1949959c1") diff --git a/README.rst b/README.rst index 376fc2d..00ebf6b 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,7 @@ Ninja Python Distributions `Ninja `_ is a small build system with a focus on speed. -The latest Ninja python wheels provide `ninja 1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1 `_ executable +The latest Ninja python wheels provide `ninja 1.9.0.g5b44b.kitware.dyndep-1.jobserver-1 `_ executable and `ninja_syntax.py` for generating `.ninja` files. .. image:: https://raw.githubusercontent.com/scikit-build/ninja-python-distributions/master/ninja-python-distributions-logo.png diff --git a/docs/update_ninja_version.rst b/docs/update_ninja_version.rst index a747bb7..9166f0e 100644 --- a/docs/update_ninja_version.rst +++ b/docs/update_ninja_version.rst @@ -16,23 +16,23 @@ Available Ninja archives can be found `here Date: Mon, 25 Feb 2019 19:41:07 -0500 Subject: [PATCH 2/2] test: Fix expected_version in test_distribution --- tests/test_distribution.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_distribution.py b/tests/test_distribution.py index 425d862..b2db3e5 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -8,7 +8,7 @@ def _check_ninja_install(virtualenv): - expected_version = "1.9.0.g5b44b.kitware.dyndep-1.jobserver-1" + expected_version = "1.9.0.git.kitware.dyndep-1.jobserver-1" for executable_name in ["ninja"]: output = virtualenv.run(