Michal
/
Prusa-Firmware-MMU
mirror of https://github.com/prusa3d/Prusa-Firmware-MMU
1
0
Fork 0
Code Issues 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
pull/324/head
Guðni Már Gilbert 2024-07-27 22:17:47 +00:00 committed by 3d-gussner
parent 32d5f3b4be
commit e7abc6a7d8
4 changed files with 8 additions and 8 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

@ -41,7 +41,7 @@ Run `./utils/bootstrap.py`
`bootstrap.py` will now download all the "missing" dependencies into the `.dependencies` folder: `bootstrap.py` will now download all the "missing" dependencies into the `.dependencies` folder:
- clang-format-9.0.0-noext - clang-format-9.0.0-noext
- cmake-3.22.5 - cmake-3.22.5
- ninja-1.10.2 - ninja-1.12.1
- avr-gcc-7.3.0 - avr-gcc-7.3.0
### How to build the preliminary project so far: ### How to build the preliminary project so far:

8
utils/bootstrap.py
View File

@ -29,11 +29,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': {

4
utils/holly/Jenkinsfile vendored
View File

@ -93,11 +93,11 @@ pipeline {
steps { steps {
sh """ sh """
python3 utils/bootstrap.py python3 utils/bootstrap.py
export PATH=\$PWD/.dependencies/cmake-3.22.5/bin:\$PWD/.dependencies/ninja-1.10.2:\$PATH export PATH=\$PWD/.dependencies/cmake-3.22.5/bin:\$PWD/.dependencies/ninja-1.12.1:\$PATH
export CTEST_OUTPUT_ON_FAILURE=1 export CTEST_OUTPUT_ON_FAILURE=1
mkdir -p build-test mkdir -p build-test
LD_LIBRARY_PATH=/usr/local/lib32 \$PWD/.dependencies/cmake-3.22.5/bin/ctest --build-and-test . build-test \ LD_LIBRARY_PATH=/usr/local/lib32 \$PWD/.dependencies/cmake-3.22.5/bin/ctest --build-and-test . build-test \
-DCMAKE_MAKE_PROGRAM=\$PWD/.dependencies/ninja-1.10.2/ninja \ -DCMAKE_MAKE_PROGRAM=\$PWD/.dependencies/ninja-1.12.1/ninja \
--build-generator Ninja \ --build-generator Ninja \
--build-target tests \ --build-target tests \
--test-command ctest --test-command ctest