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

activate now always rebuilds alr dependencies. #57

Merged
merged 1 commit into from
Jul 3, 2024
Merged
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
14 changes: 4 additions & 10 deletions env/activate
Original file line number Diff line number Diff line change
Expand Up @@ -121,22 +121,17 @@ fi
echo ""
echo "Configuring build roots: ${paths[@]}"
for path in "${paths[@]}"; do
echo -n " Setting up $path... "
echo "Setting up $path... "
cd $path

# Mark path as safe git directory if it is not already marked.
if ! git config --global --get-regexp '^safe\.directory' | grep -q "^safe\.directory $path$"; then
git config --global --add safe.directory "$path"
fi

# Set up alire configuration if it is not yet set up. We already did this for
# Adamant (the alire/ directory exists), so only do this for project directories.
if ! test -d "$path/alire"
then
echo "Building alire dependencies..."
alr -n build --release
echo "Done."
fi
# Set up alire configuration if it is not yet set up.
echo "Building alire dependencies..."
alr -n build --release

# This runs "export GPR_PROJECT_PATH=etc" which sets the GPR_PROJECT_PATH
# to whatever alr thinks it should be for the Adamant project crate.
Expand All @@ -162,7 +157,6 @@ for path in "${paths[@]}"; do
. $ADAMANT_DIR/env/set_python_path.sh $path

cd - &> /dev/null
echo "Done."
done

echo "Done."
Expand Down