procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 17:59:37 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

gitlab-ci, build: Use 'bundling' naming instead of 'packaging'

Browse source 
As hinted in d09a2a6f

We now use the word 'bundle' to signify "program files in the same prefix"
(e.g. .appimage, .zip, .app). This is in line with our source and dev-docs
(just take a search in the repo). So, appimage and windows scripts changed.

The word 'package' normally means "program files distributed for install in
the same prefix or not" (e.g. .deb, .msi, .dmg). This is in line with CMake
naming of some commands, but meson prefers to call 'dist', which we use more.

So, this partly reverts some things of GNOME/gimp!1171 and reinforce others
for even more "rationality" in the overall build structure of GIMP.
This commit is contained in:
Bruno Lopes 2024-04-20 20:07:08 -03:00
parent b1c25ca5dc
commit 2dc6f41114
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.gitlab-ci.yml
View file

@ -283,7 +283,7 @@ gimp-debian-x64:
- ninja install - ninja install
- ccache --show-stats - ccache --show-stats
- cd .. - cd ..
- bash -x build/linux/appimage/package-gimp-appimage.sh - bash -x build/linux/appimage/bundle-gimp-appimage.sh
artifacts: artifacts:
expose_as: 'Linux appimage' expose_as: 'Linux appimage'
paths: paths:
@ -427,9 +427,9 @@ gimp-win-x64-cross:
script: script:
- bash -x build/windows/gitlab-ci/2_build-gimp-crossroad.sh - bash -x build/windows/gitlab-ci/2_build-gimp-crossroad.sh
- crossroad w64 gimp --run="build/windows/gitlab-ci/2_build-gimp-crossroad.sh" - crossroad w64 gimp --run="build/windows/gitlab-ci/2_build-gimp-crossroad.sh"
- bash -x build/windows/gitlab-ci/3_package-gimp-uni_base.sh - bash -x build/windows/gitlab-ci/3_bundle-gimp-uni_base.sh
- cd gimp-x64 - cd gimp-x64
- bash -x ../build/windows/gitlab-ci/3_package-gimp-uni_sym.sh - bash -x ../build/windows/gitlab-ci/3_bundle-gimp-uni_sym.sh
artifacts: artifacts:
expose_as: 'Windows zip' expose_as: 'Windows zip'
paths: paths:
@ -495,9 +495,9 @@ gimp-win-a64:
stage: gimp stage: gimp
script: script:
- C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/2_build-gimp-msys2.sh" - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/2_build-gimp-msys2.sh"
- C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/3_package-gimp-uni_base.sh" - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/3_bundle-gimp-uni_base.sh"
- cd gimp-a64 - cd gimp-a64
- C:\msys64\usr\bin\bash -lc "bash -x ../build/windows/gitlab-ci/3_package-gimp-uni_sym.sh" - C:\msys64\usr\bin\bash -lc "bash -x ../build/windows/gitlab-ci/3_bundle-gimp-uni_sym.sh"
artifacts: artifacts:
paths: paths:
- gimp-a64/ - gimp-a64/
@ -541,9 +541,9 @@ gimp-win-x64:
stage: gimp stage: gimp
script: script:
- C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/2_build-gimp-msys2.sh" - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/2_build-gimp-msys2.sh"
- C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/3_package-gimp-uni_base.sh" - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/3_bundle-gimp-uni_base.sh"
- cd gimp-x64 - cd gimp-x64
- C:\msys64\usr\bin\bash -lc "bash -x ../build/windows/gitlab-ci/3_package-gimp-uni_sym.sh" - C:\msys64\usr\bin\bash -lc "bash -x ../build/windows/gitlab-ci/3_bundle-gimp-uni_sym.sh"
artifacts: artifacts:
paths: paths:
- gimp-x64/ - gimp-x64/
@ -586,9 +586,9 @@ gimp-win-x86:
stage: gimp stage: gimp
script: script:
- C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/2_build-gimp-msys2.sh" - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/2_build-gimp-msys2.sh"
- C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/3_package-gimp-uni_base.sh" - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/3_bundle-gimp-uni_base.sh"
- cd gimp-x86 - cd gimp-x86
- C:\msys64\usr\bin\bash -lc "bash -x ../build/windows/gitlab-ci/3_package-gimp-uni_sym.sh" - C:\msys64\usr\bin\bash -lc "bash -x ../build/windows/gitlab-ci/3_bundle-gimp-uni_sym.sh"
artifacts: artifacts:
paths: paths:
- gimp-x86/ - gimp-x86/

2
build/linux/appimage/package-gimp-appimage.sh → build/linux/appimage/bundle-gimp-appimage.sh
View file

@ -85,7 +85,7 @@ wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/$lega
chmod +x "$legacy_appimagetool" chmod +x "$legacy_appimagetool"
# PACKAGE FILES # BUNDLE FILES
## System base (needed to use GIMP or to avoid polluting the terminal output) ## System base (needed to use GIMP or to avoid polluting the terminal output)
### Glib needed files ### Glib needed files

10
build/windows/gitlab-ci/3_package-gimp-uni_base.sh → build/windows/gitlab-ci/3_bundle-gimp-uni_base.sh
View file

@ -30,7 +30,7 @@ if [[ "$BUILD_TYPE" == "CI_CROSS" ]]; then
fi fi
# Package deps and GIMP files # Bundle deps and GIMP files
export GIMP_PREFIX="`realpath ./_install`${ARTIFACTS_SUFFIX}" export GIMP_PREFIX="`realpath ./_install`${ARTIFACTS_SUFFIX}"
if [[ "$BUILD_TYPE" == "CI_CROSS" ]]; then if [[ "$BUILD_TYPE" == "CI_CROSS" ]]; then
export GIMP_PREFIX="`realpath ./_install`${ARTIFACTS_SUFFIX}-cross" export GIMP_PREFIX="`realpath ./_install`${ARTIFACTS_SUFFIX}-cross"
@ -123,7 +123,7 @@ cp -fr ${MSYS_PREFIX}/share/xml/iso-codes/iso_639.xml ${GIMP_DISTRIB}/share/xml/
## Executables and DLLs. ## Executables and DLLs.
### We save the list of already copied DLLs to keep a state between 3_package-gimp-uni_dep runs. ### We save the list of already copied DLLs to keep a state between 3_bundle-gimp-uni_dep runs.
rm -f done-dll.list rm -f done-dll.list
### Minimal (and some additional) executables for the 'bin' folder ### Minimal (and some additional) executables for the 'bin' folder
@ -142,7 +142,7 @@ done
## Optional executables, .DLLs and resources for GObject Introspection support ## Optional executables, .DLLs and resources for GObject Introspection support
if [[ "$BUILD_TYPE" != "CI_CROSS" ]]; then if [[ "$BUILD_TYPE" != "CI_CROSS" ]]; then
cp -fr ${MSYS_PREFIX}/bin/libgirepository-*.dll ${GIMP_DISTRIB}/bin/ cp -fr ${MSYS_PREFIX}/bin/libgirepository-*.dll ${GIMP_DISTRIB}/bin/
python3 build/windows/gitlab-ci/3_package-gimp-uni_dep.py ${GIMP_DISTRIB}/bin/libgirepository-*.dll ${GIMP_PREFIX}/ ${MSYS_PREFIX}/ ${GIMP_DISTRIB} --output-dll-list done-dll.list python3 build/windows/gitlab-ci/3_bundle-gimp-uni_dep.py ${GIMP_DISTRIB}/bin/libgirepository-*.dll ${GIMP_PREFIX}/ ${MSYS_PREFIX}/ ${GIMP_DISTRIB} --output-dll-list done-dll.list
cp -fr ${MSYS_PREFIX}/lib/girepository-*/ ${GIMP_DISTRIB}/lib/ cp -fr ${MSYS_PREFIX}/lib/girepository-*/ ${GIMP_DISTRIB}/lib/
cp -fr ${GIMP_PREFIX}/lib/girepository-*/* ${GIMP_DISTRIB}/lib/girepository-*/ cp -fr ${GIMP_PREFIX}/lib/girepository-*/* ${GIMP_DISTRIB}/lib/girepository-*/
cp -fr ${GIMP_PREFIX}/share/gir-*/ ${GIMP_DISTRIB}/share/ cp -fr ${GIMP_PREFIX}/share/gir-*/ ${GIMP_DISTRIB}/share/
@ -167,11 +167,11 @@ fi
### Needed DLLs for the executables in the 'bin' folder ### Needed DLLs for the executables in the 'bin' folder
binList=$(find ${GIMP_DISTRIB}/bin/ -iname '*.exe') && binArray=($binList) binList=$(find ${GIMP_DISTRIB}/bin/ -iname '*.exe') && binArray=($binList)
for bin in "${binArray[@]}"; do for bin in "${binArray[@]}"; do
python3 build/windows/gitlab-ci/3_package-gimp-uni_dep.py $bin ${GIMP_PREFIX}/ ${MSYS_PREFIX}/ ${GIMP_DISTRIB} --output-dll-list done-dll.list; python3 build/windows/gitlab-ci/3_bundle-gimp-uni_dep.py $bin ${GIMP_PREFIX}/ ${MSYS_PREFIX}/ ${GIMP_DISTRIB} --output-dll-list done-dll.list;
done done
### Needed DLLs for the executables and DLLs in the 'lib' sub-folders ### Needed DLLs for the executables and DLLs in the 'lib' sub-folders
libList=$(find ${GIMP_DISTRIB}/lib/ \( -iname '*.dll' -or -iname '*.exe' \)) && libArray=($libList) libList=$(find ${GIMP_DISTRIB}/lib/ \( -iname '*.dll' -or -iname '*.exe' \)) && libArray=($libList)
for lib in "${libArray[@]}"; do for lib in "${libArray[@]}"; do
python3 build/windows/gitlab-ci/3_package-gimp-uni_dep.py $lib ${GIMP_PREFIX}/ ${MSYS_PREFIX}/ ${GIMP_DISTRIB} --output-dll-list done-dll.list; python3 build/windows/gitlab-ci/3_bundle-gimp-uni_dep.py $lib ${GIMP_PREFIX}/ ${MSYS_PREFIX}/ ${GIMP_DISTRIB} --output-dll-list done-dll.list;
done done

0
build/windows/gitlab-ci/3_package-gimp-uni_dep.py → build/windows/gitlab-ci/3_bundle-gimp-uni_dep.py
View file

0
build/windows/gitlab-ci/3_package-gimp-uni_sym.sh → build/windows/gitlab-ci/3_bundle-gimp-uni_sym.sh
View file