build: Make infos, warnings and errors outputs consistent

This verbose style is inspired by 2_bundle-gimp-uni_dep.py
This commit is contained in:
Bruno 2024-07-20 08:40:01 -03:00
parent 617a49fa75
commit a90ee6f196
8 changed files with 12 additions and 12 deletions

View File

@ -3,7 +3,7 @@
if [ -z "$GITLAB_CI" ]; then
## Make the script work locally
if [ "$0" != 'build/linux/flatpak/1_build-deps-flatpak.sh' ]; then
echo 'To run this script locally, please do it from to the gimp git folder'
echo -e '\033[31m(ERROR)\033[0m: To run this script locally, please do it from gimp git folder.'
exit 1
fi
fi
@ -41,7 +41,7 @@ elif [ "$GITLAB_CI" ] || [ "$1" = '--ci' ]; then
## Clone and build deps
## (The deps building is too long and no complete output would be collected,
## even from GitLab runner messages. So, let's silent and save logs as a file.)
echo 'Building dependencies not present in GNOME runtime'
echo '(INFO): building dependencies not present in GNOME runtime'
flatpak-builder --force-clean --user --disable-rofiles-fuse --keep-build-dirs --build-only --stop-at=babl \
"$GIMP_PREFIX" build/linux/flatpak/org.gimp.GIMP-nightly.json &> flatpak-builder.log

View File

@ -3,7 +3,7 @@
if [ -z "$GITLAB_CI" ] && [ "$1" != '--ci' ]; then
## Make the script work locally
if [ "$0" != 'build/linux/flatpak/2_build-gimp-flatpak.sh' ]; then
echo 'To run this script locally, please do it from to the gimp git folder'
echo -e '\033[31m(ERROR)\033[0m: To run this script locally, please do it from gimp git folder.'
exit 1
fi
git submodule update --init
@ -30,7 +30,7 @@ if [ -z "$GITLAB_CI" ] && [ "$1" != '--ci' ]; then
elif [ "$GITLAB_CI" ] || [ "$1" = '--ci' ]; then
if [ "$1" != '--ci' ]; then
## Extract deps from previous job
echo 'Extracting previously built dependencies'
echo '(INFO): extracting previously built dependencies'
tar xf .flatpak-builder.tar
fi

View File

@ -9,7 +9,7 @@ fi
# Generate a Flatpak "bundle" to be tested with GNOME runtime installed
# (it is NOT a real/full bundle, deps from GNOME runtime are not bundled)
echo 'Packaging repo as .flatpak'
echo '(INFO): packaging repo as .flatpak'
flatpak build-bundle repo gimp-git.flatpak --runtime-repo=https://nightly.gnome.org/gnome-nightly.flatpakrepo org.gimp.GIMP ${BRANCH}

View File

@ -9,7 +9,7 @@ if [ -z "$CROSSROAD_PLATFORM" ]; then
if [ -z "$GITLAB_CI" ]; then
# Make the script work locally
if [ "$0" != "build/windows/1_build-deps-crossroad.sh" ]; then
echo "To run this script locally, please do it from to the gimp git folder"
echo -e '\033[31m(ERROR)\033[0m: To run this script locally, please do it from gimp git folder.'
exit 1
fi
export GIT_DEPTH=1

View File

@ -5,7 +5,7 @@ set -e
if [ -z "$GITLAB_CI" ]; then
# Make the script work locally
if [ "$0" != "build/windows/1_build-deps-msys2.sh" ]; then
echo "To run this script locally, please do it from to the gimp git folder"
echo -e '\033[31m(ERROR)\033[0m: To run this script locally, please do it from gimp git folder.'
exit 1
fi
export GIT_DEPTH=1

View File

@ -9,7 +9,7 @@ if [ -z "$CROSSROAD_PLATFORM" ]; then
if [ -z "$GITLAB_CI" ]; then
# Make the script work locally
if [ "$0" != "build/windows/2_build-gimp-crossroad.sh" ]; then
echo "To run this script locally, please do it from to the gimp git folder"
echo -e '\033[31m(ERROR)\033[0m: To run this script locally, please do it from gimp git folder.'
exit 1
fi
git submodule update --init
@ -25,7 +25,7 @@ if [ ! -d "${PARENT_DIR}_install" ]; then
echo -e "\033[31m(ERROR)\033[0m: Before running this script, first install GIMP natively in ${PARENT_DIR}_install"
fi
if [ ! -d '_build' ] || [ ! -d "${PARENT_DIR}_install" ]; then
echo 'Patches are very welcome: https://gitlab.gnome.org/GNOME/gimp/-/issues/11544'
echo 'Patches are very welcome: https://gitlab.gnome.org/GNOME/gimp/-/issues/6393'
exit 1
fi
GIMP_APP_VERSION=$(grep GIMP_APP_VERSION _build/config.h | head -1 | sed 's/^.*"\([^"]*\)"$/\1/')

View File

@ -5,7 +5,7 @@ set -e
if [ -z "$GITLAB_CI" ]; then
# Make the script work locally
if [ "$0" != "build/windows/2_build-gimp-msys2.sh" ]; then
echo "To run this script locally, please do it from to the gimp git folder"
echo -e '\033[31m(ERROR)\033[0m: To run this script locally, please do it from gimp git folder.'
exit 1
fi
git submodule update --init --force

View File

@ -63,7 +63,7 @@ bundle ()
echo "(INFO): copying $path_origin_full to $GIMP_DISTRIB/$path_dest_parent"
cp -r "$path_origin_full" "$GIMP_DISTRIB/$path_dest_parent"
else
echo "(WARNING): $path_origin_full does not exist!"
echo -e "\033[33m(WARNING)\033[0m: $path_origin_full does not exist!"
fi
fi
}
@ -76,8 +76,8 @@ clean ()
cleanedArray=($(find $1/ -iname ${2##*/}))
fi
for path_dest_full in "${cleanedArray[@]}"; do
rm $path_dest_full
echo "(INFO): cleaning $path_dest_full"
rm $path_dest_full
done
}