mirror of https://github.com/GNOME/gimp.git
build: Make scripts numbering and storing consistent
The numbering is now inline with actual the order of jobs on CI to make easier to understand what the numbers represent. To understand why bundling is number 2 see:d09a2a6fand2dc6f411The storing of Windows scripts was changed to make easier to call them, to better convey that they work outside CI and to be consistent with other build/ subdirectories.
This commit is contained in:
Bruno
parent
0dae61772a
commit
9d86492b14
|
|
@ -318,7 +318,7 @@ gimp-debian-x64:
|
|||
- ninja install
|
||||
- ccache --show-stats
|
||||
- cd ..
|
||||
- bash build/linux/appimage/bundle-gimp-appimage.sh
|
||||
- bash build/linux/appimage/2_bundle-gimp-appimage.sh
|
||||
artifacts:
|
||||
expose_as: 'Linux appimage'
|
||||
paths:
|
||||
|
|
@ -414,7 +414,7 @@ deps-win-x64-cross:
|
|||
- .cache/
|
||||
- !reference [.default, cache]
|
||||
script:
|
||||
- bash build/windows/gitlab-ci/1_build-deps-crossroad.sh
|
||||
- bash build/windows/1_build-deps-crossroad.sh
|
||||
artifacts:
|
||||
paths:
|
||||
- .local/
|
||||
|
|
@ -429,8 +429,8 @@ gimp-win-x64-cross:
|
|||
needs: ["deps-win-x64-cross", "gimp-debian-x64"]
|
||||
stage: gimp
|
||||
script:
|
||||
- bash build/windows/gitlab-ci/2_build-gimp-crossroad.sh
|
||||
- bash build/windows/gitlab-ci/3_bundle-gimp-uni_base.sh
|
||||
- bash build/windows/2_build-gimp-crossroad.sh
|
||||
- bash build/windows/2_bundle-gimp-uni_base.sh
|
||||
artifacts:
|
||||
expose_as: 'Windows zip'
|
||||
paths:
|
||||
|
|
@ -481,7 +481,7 @@ deps-win-a64:
|
|||
needs: []
|
||||
stage: dependencies
|
||||
script:
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/gitlab-ci/1_build-deps-msys2.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/1_build-deps-msys2.sh"
|
||||
artifacts:
|
||||
paths:
|
||||
- _install-a64/
|
||||
|
|
@ -496,8 +496,8 @@ gimp-win-a64:
|
|||
needs: ["deps-win-a64"]
|
||||
stage: gimp
|
||||
script:
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/gitlab-ci/2_build-gimp-msys2.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/gitlab-ci/3_bundle-gimp-uni_base.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/2_build-gimp-msys2.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/2_bundle-gimp-uni_base.sh"
|
||||
artifacts:
|
||||
paths:
|
||||
- gimp-a64/
|
||||
|
|
@ -531,7 +531,7 @@ deps-win-x64:
|
|||
needs: []
|
||||
stage: dependencies
|
||||
script:
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/gitlab-ci/1_build-deps-msys2.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/1_build-deps-msys2.sh"
|
||||
artifacts:
|
||||
paths:
|
||||
- _install-x64/
|
||||
|
|
@ -544,8 +544,8 @@ gimp-win-x64:
|
|||
needs: ["deps-win-x64"]
|
||||
stage: gimp
|
||||
script:
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/gitlab-ci/2_build-gimp-msys2.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/gitlab-ci/3_bundle-gimp-uni_base.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/2_build-gimp-msys2.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/2_bundle-gimp-uni_base.sh"
|
||||
artifacts:
|
||||
paths:
|
||||
- gimp-x64/
|
||||
|
|
@ -575,7 +575,7 @@ deps-win-x86:
|
|||
needs: []
|
||||
stage: dependencies
|
||||
script:
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/gitlab-ci/1_build-deps-msys2.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/1_build-deps-msys2.sh"
|
||||
artifacts:
|
||||
paths:
|
||||
- _install-x86/
|
||||
|
|
@ -588,9 +588,9 @@ gimp-win-x86:
|
|||
needs: ["deps-win-x86"]
|
||||
stage: gimp
|
||||
script:
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/gitlab-ci/2_build-gimp-msys2.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/gitlab-ci/3_bundle-gimp-uni_base.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/gitlab-ci/3_bundle-gimp-uni_sym.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/2_build-gimp-msys2.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/2_bundle-gimp-uni_base.sh"
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/2_bundle-gimp-uni_sym.sh"
|
||||
artifacts:
|
||||
paths:
|
||||
- gimp-x86/
|
||||
|
|
@ -775,7 +775,7 @@ dist-flatpak-weekly:
|
|||
stage: distribution
|
||||
cache: []
|
||||
script:
|
||||
- bash build/linux/flatpak/4_dist-gimp-flatpak.sh
|
||||
- bash build/linux/flatpak/3_dist-gimp-flatpak.sh
|
||||
artifacts:
|
||||
expose_as: 'Linux flatpak'
|
||||
paths:
|
||||
|
|
@ -794,8 +794,8 @@ dist-installer-weekly:
|
|||
MSYSTEM: "CLANGARM64"
|
||||
cache: []
|
||||
script:
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/gitlab-ci/3_bundle-gimp-uni_sym.sh"
|
||||
- build/windows/gitlab-ci/4_dist-gimp-inno.ps1 | Out-File -FilePath installer.log
|
||||
- C:\msys64\usr\bin\bash -lc "bash build/windows/2_bundle-gimp-uni_sym.sh"
|
||||
- build/windows/installer/3_dist-gimp-inno.ps1 | Out-File -FilePath installer.log
|
||||
artifacts:
|
||||
expose_as: 'Windows exe'
|
||||
paths:
|
||||
|
|
@ -816,7 +816,7 @@ dist-store-weekly:
|
|||
- win32-ps
|
||||
cache: []
|
||||
script:
|
||||
- build\windows\gitlab-ci\4_dist-gimp-winsdk.ps1 | Out-File -FilePath store.log
|
||||
- build\windows\store\3_dist-gimp-winsdk.ps1 | Out-File -FilePath store.log
|
||||
artifacts:
|
||||
expose_as: 'Windows msix'
|
||||
paths:
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ if [ -z "$CROSSROAD_PLATFORM" ]; then
|
|||
|
||||
if [ -z "$GITLAB_CI" ]; then
|
||||
# Make the script work locally
|
||||
if [ "$0" != "build/windows/gitlab-ci/1_build-deps-crossroad.sh" ]; then
|
||||
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"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -53,13 +53,13 @@ clone_or_pull gegl
|
|||
# CROSSROAD ENV
|
||||
export PATH="$PWD/.local/bin:$PATH"
|
||||
export XDG_DATA_HOME="$PWD/.local/share"
|
||||
crossroad w64 gimp --run="${GIMP_DIR}build/windows/gitlab-ci/1_build-deps-crossroad.sh"
|
||||
crossroad w64 gimp --run="${GIMP_DIR}build/windows/1_build-deps-crossroad.sh"
|
||||
else
|
||||
export ARTIFACTS_SUFFIX="-x64-cross"
|
||||
|
||||
## Install the required (pre-built) packages for babl, GEGL and GIMP
|
||||
crossroad source msys2
|
||||
crossroad install $(cat ${GIMP_DIR}build/windows/gitlab-ci/all-deps-uni.txt |
|
||||
crossroad install $(cat ${GIMP_DIR}build/windows/all-deps-uni.txt |
|
||||
sed "s/\${MINGW_PACKAGE_PREFIX}-//g" | sed 's/\\//g')
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Installation of pre-built dependencies failed.";
|
||||
|
|
@ -14,7 +14,7 @@ fi
|
|||
|
||||
if [ -z "$GITLAB_CI" ]; then
|
||||
# Make the script work locally
|
||||
if [ "$0" != "build/windows/gitlab-ci/1_build-deps-msys2.sh" ]; then
|
||||
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"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -26,7 +26,7 @@ fi
|
|||
|
||||
|
||||
# Install the required (pre-built) packages for babl and GEGL
|
||||
DEPS_LIST=$(cat ${GIMP_DIR}build/windows/gitlab-ci/all-deps-uni.txt |
|
||||
DEPS_LIST=$(cat ${GIMP_DIR}build/windows/all-deps-uni.txt |
|
||||
sed "s/\${MINGW_PACKAGE_PREFIX}-/${MINGW_PACKAGE_PREFIX}-/g" |
|
||||
sed 's/\\//g')
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ if [ -z "$CROSSROAD_PLATFORM" ]; then
|
|||
|
||||
if [ -z "$GITLAB_CI" ]; then
|
||||
# Make the script work locally
|
||||
if [ "$0" != "build/windows/gitlab-ci/2_build-gimp-crossroad.sh" ]; then
|
||||
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"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -43,7 +43,7 @@ chmod u+x $GIMP_CONSOLE_PATH
|
|||
# CROSSROAD ENV
|
||||
export PATH="$PWD/${PARENT_DIR}.local/bin:$PWD/bin:$PATH"
|
||||
export XDG_DATA_HOME="$PWD/${PARENT_DIR}.local/share"
|
||||
crossroad w64 gimp --run="build/windows/gitlab-ci/2_build-gimp-crossroad.sh"
|
||||
crossroad w64 gimp --run="build/windows/2_build-gimp-crossroad.sh"
|
||||
else
|
||||
export ARTIFACTS_SUFFIX="-x64-cross"
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ fi
|
|||
|
||||
if [ -z "$GITLAB_CI" ]; then
|
||||
# Make the script work locally
|
||||
if [ "$0" != "build/windows/gitlab-ci/2_build-gimp-msys2.sh" ]; then
|
||||
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"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -26,7 +26,7 @@ fi
|
|||
|
||||
# Install the required (pre-built) packages for GIMP
|
||||
# We take code from deps script to better maintenance
|
||||
echo "$(cat build/windows/gitlab-ci/1_build-deps-msys2.sh |
|
||||
echo "$(cat build/windows/1_build-deps-msys2.sh |
|
||||
sed -n '/# Install the/,/# End of install/p')" | bash
|
||||
|
||||
|
||||
|
|
@ -142,7 +142,7 @@ bundle "$MSYS_PREFIX" share/xml/iso-codes/iso_639.xml
|
|||
|
||||
## Executables and DLLs.
|
||||
|
||||
### We save the list of already copied DLLs to keep a state between 3_bundle-gimp-uni_dep runs.
|
||||
### We save the list of already copied DLLs to keep a state between 2_bundle-gimp-uni_dep runs.
|
||||
rm -f done-dll.list
|
||||
|
||||
### Minimal (and some additional) executables for the 'bin' folder
|
||||
|
|
@ -179,12 +179,12 @@ fi
|
|||
echo "(INFO): searching for dependencies of $GIMP_DISTRIB/lib in $GIMP_PREFIX and $MSYS_PREFIX"
|
||||
libArray=($(find "$GIMP_DISTRIB/lib" \( -iname '*.dll' -or -iname '*.exe' \)))
|
||||
for dep in "${libArray[@]}"; do
|
||||
python3 build/windows/gitlab-ci/3_bundle-gimp-uni_dep.py $dep $GIMP_PREFIX/ $MSYS_PREFIX/ $GIMP_DISTRIB --output-dll-list done-dll.list;
|
||||
python3 build/windows/2_bundle-gimp-uni_dep.py $dep $GIMP_PREFIX/ $MSYS_PREFIX/ $GIMP_DISTRIB --output-dll-list done-dll.list;
|
||||
done
|
||||
echo "(INFO): searching for dependencies of $GIMP_DISTRIB/bin in $GIMP_PREFIX and $MSYS_PREFIX"
|
||||
binArray=($(find "$GIMP_DISTRIB/bin" \( -iname '*.dll' -or -iname '*.exe' \)))
|
||||
for dep in "${binArray[@]}"; do
|
||||
python3 build/windows/gitlab-ci/3_bundle-gimp-uni_dep.py $dep $GIMP_PREFIX/ $MSYS_PREFIX/ $GIMP_DISTRIB --output-dll-list done-dll.list;
|
||||
python3 build/windows/2_bundle-gimp-uni_dep.py $dep $GIMP_PREFIX/ $MSYS_PREFIX/ $GIMP_DISTRIB --output-dll-list done-dll.list;
|
||||
done
|
||||
|
||||
### .pdb (CodeView) debug symbols
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
################################################################################
|
||||
# Usage example
|
||||
#
|
||||
# python3 3_package-gimp-uni_dep.py /path/to/run.exe /winenv/ /path/install
|
||||
# python3 2_bundle-gimp-uni_dep.py /path/to/run.exe /winenv/ /path/install
|
||||
#
|
||||
# In this case, the DLL dependencies for executable run.exe will be extracted
|
||||
# and copied into /path/install/bin folder. To copy the DLL, the root path to
|
||||
Loading…
Reference in New Issue