mirror of https://github.com/GNOME/gimp.git
build: Respect contributor's own GIMP_PREFIX
This makes the scripts less pervasive locally.
This commit is contained in:
parent
990f9b7871
commit
744abbbd6b
|
@ -21,7 +21,9 @@ BUILD_ARTIF=$(echo _build*)
|
|||
## This script is "filesystem-agnostic". The packager can quickly choose either
|
||||
## putting everything in /usr or in AppDir(root) just specifying the 2nd parameter.
|
||||
GIMP_DISTRIB="$CI_PROJECT_DIR/build/linux/appimage/AppDir"
|
||||
GIMP_PREFIX="$GIMP_DISTRIB/usr"
|
||||
if [ "$GITLAB_CI" ] || [ -z "$GIMP_PREFIX" ]; then
|
||||
GIMP_PREFIX="$GIMP_DISTRIB/usr"
|
||||
fi
|
||||
if [ -z "$2" ] || [ "$2" = "usr" ]; then
|
||||
OPT_PREFIX="${GIMP_PREFIX}"
|
||||
elif [ "$2" = "AppDir" ]; then
|
||||
|
|
|
@ -11,7 +11,9 @@ if [ -z "$GITLAB_CI" ]; then
|
|||
exit 1
|
||||
fi
|
||||
flatpak update -y
|
||||
export GIMP_PREFIX="$PWD/../_install-$ARCH"
|
||||
if [ -z "$GIMP_PREFIX" ]; then
|
||||
export GIMP_PREFIX="$PWD/../_install-$ARCH"
|
||||
fi
|
||||
if [ ! -d "$GIMP_PREFIX" ]; then
|
||||
mkdir -p "$GIMP_PREFIX"
|
||||
fi
|
||||
|
|
|
@ -12,7 +12,9 @@ if [ -z "$GITLAB_CI" ] && [ "$1" != '--ci' ]; then
|
|||
fi
|
||||
git submodule update --init
|
||||
flatpak update -y
|
||||
export GIMP_PREFIX="$PWD/../_install-$ARCH"
|
||||
if [ -z "$GIMP_PREFIX" ]; then
|
||||
export GIMP_PREFIX="$PWD/../_install-$ARCH"
|
||||
fi
|
||||
|
||||
|
||||
# Build GIMP only
|
||||
|
|
|
@ -81,7 +81,12 @@ clone_or_pull gegl
|
|||
|
||||
|
||||
# Build babl and GEGL
|
||||
export GIMP_PREFIX="`realpath ./_install`${ARTIFACTS_SUFFIX}"
|
||||
# We need to create the condition this ugly way to not break CI
|
||||
if [ "$GITLAB_CI" ]; then
|
||||
export GIMP_PREFIX="$PWD/_install${ARTIFACTS_SUFFIX}"
|
||||
elif [ -z "$GITLAB_CI" ] && [ -z "$GIMP_PREFIX" ]; then
|
||||
export GIMP_PREFIX="$PWD/_install${ARTIFACTS_SUFFIX}"
|
||||
fi
|
||||
## Universal variables from .gitlab-ci.yml
|
||||
IFS=$'\n' VAR_ARRAY=($(cat ${GIMP_DIR}.gitlab-ci.yml | sed -n '/export PATH=/,/GI_TYPELIB_PATH}\"/p' | sed 's/ - //'))
|
||||
IFS=$' \t\n'
|
||||
|
|
|
@ -20,7 +20,6 @@ if [ -z "$GITLAB_CI" ]; then
|
|||
fi
|
||||
git submodule update --init --force
|
||||
pacman --noconfirm -Suy
|
||||
PARENT_DIR='../'
|
||||
export MESON_OPTIONS="-Drelocatable-bundle=no"
|
||||
fi
|
||||
|
||||
|
@ -32,7 +31,12 @@ echo "$(cat build/windows/gitlab-ci/1_build-deps-msys2.sh |
|
|||
|
||||
|
||||
# Build GIMP
|
||||
export GIMP_PREFIX="$PWD/${PARENT_DIR}_install${ARTIFACTS_SUFFIX}"
|
||||
# We need to create the condition this ugly way to not break CI
|
||||
if [ "$GITLAB_CI" ]; then
|
||||
export GIMP_PREFIX="$PWD/_install${ARTIFACTS_SUFFIX}"
|
||||
elif [ -z "$GITLAB_CI" ] && [ -z "$GIMP_PREFIX" ]; then
|
||||
export GIMP_PREFIX="$PWD/../_install${ARTIFACTS_SUFFIX}"
|
||||
fi
|
||||
## Universal variables from .gitlab-ci.yml
|
||||
IFS=$'\n' VAR_ARRAY=($(cat .gitlab-ci.yml | sed -n '/export PATH=/,/GI_TYPELIB_PATH}\"/p' | sed 's/ - //'))
|
||||
IFS=$' \t\n'
|
||||
|
|
|
@ -29,7 +29,11 @@ if [[ "$CI_JOB_NAME" =~ "cross" ]]; then
|
|||
export GIMP_PREFIX="`realpath ./_install`${ARTIFACTS_SUFFIX}-cross"
|
||||
export MSYS_PREFIX="$GIMP_PREFIX"
|
||||
else
|
||||
export GIMP_PREFIX="`realpath ./_install`${ARTIFACTS_SUFFIX}"
|
||||
if [ "$GITLAB_CI" ]; then
|
||||
export GIMP_PREFIX="$PWD/_install${ARTIFACTS_SUFFIX}"
|
||||
elif [ -z "$GITLAB_CI" ] && [ -z "$GIMP_PREFIX" ]; then
|
||||
export GIMP_PREFIX="$PWD/../_install${ARTIFACTS_SUFFIX}"
|
||||
fi
|
||||
export MSYS_PREFIX="$MSYSTEM_PREFIX"
|
||||
fi
|
||||
export GIMP_DISTRIB="`realpath ./gimp`${ARTIFACTS_SUFFIX}"
|
||||
|
|
Loading…
Reference in New Issue