Make the use of system-wide Meson and Ninja easier#1951
Make the use of system-wide Meson and Ninja easier#1951pcarruscag merged 7 commits intosu2code:developfrom frx-wintermute:allow_system_meson
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| print ('Downloading ninja ... ') | ||
| try: | ||
| urllib.request.urlretrieve (ninja_exe_url,'ninja-win.zip') | ||
| except: |
Check notice
Code scanning / CodeQL
Except block handles 'BaseException'
pcarruscag
left a comment
pcarruscag
left a comment
There was a problem hiding this comment.
This is nice, thanks. Please add yourself to AUTHORS.md and then we can merge
|
We use "develop" as the staging branch, update your branch with develop when you push the changes. |
@pcarruscag, thanks for the suggestions. I will apply the two code changes (I will drop the superfluous import in meson.py and I will move the timestamp creation at the end of preconfigure.py). How should I update my branch with upstream/develop? |
You're welcome, @pcarruscag . I am glad that we are finding a solution that works for everyone. I assume I should add myself to the Individual Contributors section of AUTHORS.md, is that correct? |
Both ways are legit, feel free to use which one is easier for you here a comparison between them. It depends on the taste of the developer.
Yes |
See github issue [#1945] for more information on the rationale. [#1945]: <#1945> If a user wants to build SU2 from source and prefers to use system-wide Meson and Ninja (assuming they are installed on the OS), rather than SU2-specific copies, it is possible to avoid downloading SU2-specific versions: $ SU2_MESON='no' ./meson.py $ export CXXFLAGS=<preferred_compiler_options> $ meson setup <preferred_config_options> build $ ninja -C build install The default behavior is unchanged. If a user does not have system-wide Meson and Ninja installed on the OS and/or prefers to use SU2-specific copies, it is stll possible to download and use SU2-specific versions of Meson and Ninja: $ export CXXFLAGS=<preferred_compiler_options> $ ./meson.py setup <preferred_config_options> build $ ./ninja -C build install
If a user wants to build SU2 from source and prefers to use system-wide Meson and Ninja (assuming they are installed on the OS), rather than SU2-specific copies, it is possible to avoid downloading SU2-specific versions: $ ./preconfigure.py $ export CXXFLAGS=<preferred_compiler_options> $ meson setup <preferred_config_options> build $ ninja -C build install The default behavior is unchanged. If a user does not have system-wide Meson and Ninja installed on the OS and/or prefers to use SU2-specific copies, it is stll possible to download and use SU2-specific versions of Meson and Ninja: $ export CXXFLAGS=<preferred_compiler_options> $ ./meson.py setup <preferred_config_options> build $ ./ninja -C build install
It's now unused in meson.py (its use has been moved to preconfigure.py).
I have just force-pushed a rebased branch. |
|
Merge and push is simpler I think, and with that the reviewers have the option of only seeing the new commits. |
5 participants
Proposed Changes
This change makes it easier to use system-wide Meson and Ninja in order to build SU2 from source.
Related Work
See issue #1945 for more information.
PR Checklist
Put an X by all that apply. You can fill this out after submitting the PR. If you have any questions, don't hesitate to ask! We want to help. These are a guide for you to know what the reviewers will be looking for in your contribution.