dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build/windows: Don't try to install deps again when local

This commit is contained in:
Bruno 2024-07-19 18:31:50 -03:00
parent fa70b794e2
commit d5da1568f4
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/windows/1_build-deps-msys2.sh
View File

@ -19,14 +19,18 @@ if [ -z "$GITLAB_CI" ]; then
exit 1
fi
export GIT_DEPTH=1
pacman --noconfirm -Suy
GIMP_DIR=$(echo "${PWD##*/}/")
cd $(dirname $PWD) && echo "Using parent folder as work dir"
fi
# Install the required (pre-built) packages for babl and GEGL
DEPS_LIST=$(cat ${GIMP_DIR}build/windows/all-deps-uni.txt |
# Install the required (pre-built) packages for babl, GEGL and GIMP
if [ "$MSYSTEM_CARCH" != "aarch64" ]; then
# https://gitlab.gnome.org/GNOME/gimp/-/issues/10782
pacman --noconfirm -Suy
fi
# Beginning of install code block
DEPS_LIST=$(cat ${GIMP_DIR}build/windows/all-deps-uni.txt |
sed "s/\${MINGW_PACKAGE_PREFIX}-/${MINGW_PACKAGE_PREFIX}-/g" |
sed 's/\\//g')
@ -53,7 +57,7 @@ else
${MINGW_PACKAGE_PREFIX}-toolchain \
$DEPS_LIST
fi
# End of install
# End of install code block
# Clone babl and GEGL (follow master branch)

11
build/windows/2_build-gimp-msys2.sh
View File

@ -19,15 +19,16 @@ if [ -z "$GITLAB_CI" ]; then
exit 1
fi
git submodule update --init --force
pacman --noconfirm -Suy
export MESON_OPTIONS="-Drelocatable-bundle=no"
fi
# Install the required (pre-built) packages for GIMP
# We take code from deps script to better maintenance
echo "$(cat build/windows/1_build-deps-msys2.sh |
sed -n '/# Install the/,/# End of install/p')" | bash
if [ "$GITLAB_CI" ]; then
# Install the required (pre-built) packages for GIMP again
# We take code from deps script to better maintenance
echo "$(cat build/windows/1_build-deps-msys2.sh |
sed -n '/# Beginning of install/,/# End of install/p')" | bash
fi
# Build GIMP