josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade ninja from 1.10.2 to 1.12.1 

The update brings better support for Windows :)

Changelogs:
* https://github.com/ninja-build/ninja/releases/tag/v1.12.1
* https://github.com/ninja-build/ninja/releases/tag/v1.12.0
* https://github.com/ninja-build/ninja/releases/tag/v1.11.1
* https://github.com/ninja-build/ninja/releases/tag/v1.11.0
This commit is contained in:
Guðni Már Gilbert 2024-07-27 21:41:27 +00:00 committed by gudnimg
parent a926675c35
commit 48f7cd5270
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/cmake-kits.json vendored
View File

@ -3,7 +3,7 @@
"name": "avr-gcc", "name": "avr-gcc",
"toolchainFile": "${workspaceFolder}/cmake/AvrGcc.cmake", "toolchainFile": "${workspaceFolder}/cmake/AvrGcc.cmake",
"cmakeSettings": { "cmakeSettings": {
"CMAKE_MAKE_PROGRAM": "${workspaceFolder}/.dependencies/ninja-1.10.2/ninja", "CMAKE_MAKE_PROGRAM": "${workspaceFolder}/.dependencies/ninja-1.12.1/ninja",
"CMAKE_BUILD_TYPE": "Release" "CMAKE_BUILD_TYPE": "Release"
} }
} }

2
README.md
View File

@ -35,7 +35,7 @@ The workflow should be pretty straightforward for anyone with development experi
Building with cmake requires: Building with cmake requires:
- cmake >= 3.22.5 - cmake >= 3.22.5
- ninja >= 1.10.2 (optional, but recommended) - ninja >= 1.12.1 (optional, but recommended)
Python >= 3.6 is also required with the following modules: Python >= 3.6 is also required with the following modules:

8
utils/bootstrap.py
View File

@ -30,11 +30,11 @@ dependencies_dir = project_root_dir / '.dependencies'
# yapf: disable # yapf: disable
dependencies = { dependencies = {
'ninja': { 'ninja': {
'version': '1.10.2', 'version': '1.12.1',
'url': { 'url': {
'Linux': 'https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip', 'Linux': 'https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux.zip',
'Windows': 'https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip', 'Windows': 'https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip',
'Darwin': 'https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-mac.zip', 'Darwin': 'https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-mac.zip',
}, },
}, },
'cmake': { 'cmake': {