Skip to content
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

Update ninja to 1.9.0.g5b44b.kitware.dyndep-1.jobserver-1 #17

Merged
merged 2 commits into from
Feb 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions NinjaUrls.cmake
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Ninja Python Distributions

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

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

Collecting URLs and SHA256s from 'https://github.com/kitware/ninja/releases'
Downloading https://github.com/kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz
Downloading https://github.com/kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz - done
Downloading https://github.com/kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.zip
Downloading https://github.com/kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.zip - done
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
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
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
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
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
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
Downloading https://github.com/kitware/ninja/archive/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1.tar.gz
Downloading https://github.com/kitware/ninja/archive/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1.tar.gz - done
Downloading https://github.com/kitware/ninja/archive/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1.zip
Downloading https://github.com/kitware/ninja/archive/v1.9.0.g5b44b.kitware.dyndep-1.jobserver-1.zip - done
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
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
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
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
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
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
Collecting URLs and SHA256s from 'https://github.com/kitware/ninja/releases' - done
Updating 'NinjaUrls.cmake' with CMake version 1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1
Updating 'NinjaUrls.cmake' with CMake version 1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1 - done
Updating 'NinjaUrls.cmake' with CMake version 1.9.0.g5b44b.kitware.dyndep-1.jobserver-1
Updating 'NinjaUrls.cmake' with CMake version 1.9.0.g5b44b.kitware.dyndep-1.jobserver-1 - done
Updating README.rst
Updating README.rst - done
Updating docs/update_ninja_version.rst
Expand All @@ -44,7 +44,7 @@ Available Ninja archives can be found `here <https://github.com/kitware/ninja/re
3. Create a topic named `update-to-ninja-X.Y.Z` and commit the changes.
For example::

release=1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1
release=1.9.0.g5b44b.kitware.dyndep-1.jobserver-1
git checkout -b update-to-ninja-${release}
git add NinjaUrls.cmake README.rst docs/update_ninja_version.rst tests/test_distribution.py
git commit -m "Update to Ninja ${release}"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_distribution.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


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

for executable_name in ["ninja"]:
output = virtualenv.run(
Expand Down