Refactor Alire.Shared into Alire.Toolchains #1423
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fabien-Chouteau
approved these changes
Aug 8, 2023
mosteo
added a commit
to mosteo/alire
that referenced
this pull request
Aug 21, 2023
* Debug when folder deletion fails * Trivial safeguard in `Force_Delete` (alire-project#1422) * Refactor Alire.Shared into Alire.Toolchains (alire-project#1423) * Use build profile in build hash (alire-project#1425) * Compute hash using build profile * Fix problem with multiple hashes in one run Rooted in that default build profiles were used first and later the actual profiles caused different folders to be used, in turn causing errors with the conflicting CRATE_ALIRE_PREFIX variables. * Write hash inputs to build dirs * Testsuite additions and fixes * Self-review * Update pins and dependencies * MacOS; export PATH variables for includes and libraries. (alire-project#1420) * MacOS; export PATH variables for includes and libraries. Homebrew and MacPorts install include files and libraries in places where GCC won't look by default. GCC will use these environment variables if set: C_INCLUDE_PATH for C includes CPLUS_INCLUDE_PATH for C++ includes LIBRARY_PATH for libraries Both of the distribution managers place (symbolic links to) include files in ${top_level}/include and libraries in ${top_level}/lib. For Homebrew on Intel silicon, top_level is normally /usr/local. For Homebrew on Apple silicon, top_level is normally /opt/homebrew. For MacPorts, top_level is normally /opt/local * src/alire/alire-platforms-current.ads (Load_Environment): add note on macOS use. * src/alire/os_macos/alire-platforms-current__macos.adb (context): added Alire.Environment (was limited), Ada.Directories. (Brew_Access): new. (Homebrew_Present): if Brew_Access is not null. (Detected_Distribution): made into an expression function. (Containing_Containing_Dir): new, used in Distribution_Root. (Distribution_Root): reworked. (Load_Environment): if either distribution is present, arrange to export the environment variables to suit. * Update testsuite to match new macOS distribution detection. * testsuite/drivers/helpers.py (distribution): if on macOS, check whether the distribution management tool is on the PATH. We used to check for the environment variable HOMEBREW_PREFIX, but users don't have to arrange for this to be set in order to run Homebrew. First, if 'brew' is found, the distribution is Homebrew. If not and 'port' is found, the distribution is MacPorts. Otherwise, the distribution is unknown. * In the macOS CI workflow, run the test script once only. * .github/workflows/ci-macos.yml (Run test script): remove the second call, which set up HOMEBREW_PREFIX (now no longer used by alr), and remove the note '(without Homebrew)' in the first. * Add Windows alternatives * More comprehensive Windows switches * Don't raise on deletion failure --------- Co-authored-by: Simon Wright <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now that the usefulness of
Alire.Sharedis limited to toolchains, its separate existence can only cause confusion.I plan to also remove at a later time any mentions to shared releases in the solver as that functionality is no longer necessary.