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

gitlab-ci, build: Do not bundle nor dist any Lua related files

Browse source 
Following 78665ca372

Since our official builds tends to be vanilla (only using meson
standard options), there is no need to shipping these lua files.

This commit can be reverted in the future if Lua is stable again.
This commit is contained in:
Bruno 2024-09-22 06:44:18 -03:00
parent acebb4fa22
commit cf2893747d
9 changed files with 7 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -211,8 +211,6 @@ image-debian-x64:
libwmf-dev
libxmu-dev
libxpm-dev
luajit
lua-lgi
meson
mypaint-brushes
poppler-data

2
build/linux/appimage/2_bundle-gimp-appimage.sh
View file

@ -224,7 +224,7 @@ bund_usr "$UNIX_PREFIX" "lib/python*"
mv "$USR_DIR/${LIB_DIR}/${LIB_SUBDIR}python3.11" "$USR_DIR/${LIB_DIR}"
mv "$USR_DIR/${LIB_DIR}/${LIB_SUBDIR}python3" "$USR_DIR/${LIB_DIR}"
wipe_usr ${LIB_DIR}/*.pyc
#### FIXME: Lua plug-ins support (NOT WORKING)
#### Lua plug-ins support (NOT WORKING and buggy)
#bund_usr "$UNIX_PREFIX" "bin/luajit*"
#bund_usr "$UNIX_PREFIX" "lib/lua"
#bund_usr "$UNIX_PREFIX" "share/lua"

1
build/linux/appimage/AppRun
View file

@ -49,7 +49,6 @@ export PYTHONDONTWRITEBYTECODE=1
# RUN MAIN_BIN
echo "This is a CI build of GIMP compatible with Debian DEBIAN_VERSION. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/7661"
echo '.js (JavaScript) plug-ins | supported.'
echo '.lua (Lua) plug-ins | NOT supported!'
echo '.py (Python) plug-ins | supported.'
echo '.scm (ScriptFu) plug-ins | supported.'
echo '.vala (Vala) plug-ins | supported.'

39
build/linux/flatpak/org.gimp.GIMP-nightly.json
View file

@ -701,45 +701,6 @@
}
]
},
{
"name": "luajit",
"sources": [
{
"type": "git",
"url": "https://github.com/LuaJIT/LuaJIT.git",
"commit": "f725e44cda8f359869bf8f92ce71787ddca45618"
},
{
"type": "shell",
"commands": [
"sed -i 's|/usr/local|/app|' ./Makefile"
]
}
],
"no-autogen": true,
"make-args": [
"DEFAULT_CC=ccache clang"
],
"cleanup": [
"/include",
"/lib/pkgconfig",
"/share"
]
},
{
"name": "lua-lgi",
"sources": [
{
"type": "git",
"url": "https://github.com/lgi-devs/lgi.git",
"commit": "48ff62e5bc63d69c00085909a09cc5c75267e1c6"
}
],
"buildsystem": "meson",
"config-opts": [
"-Dtests=false"
]
},
{
"name": "xmu",
"sources": [

4
build/windows/2_build-gimp-crossroad.sh
View file

@ -67,8 +67,7 @@ export ARTIFACTS_SUFFIX="-cross"
if [ ! -f "_build$ARTIFACTS_SUFFIX/build.ninja" ]; then
mkdir -p _build$ARTIFACTS_SUFFIX && cd _build$ARTIFACTS_SUFFIX
crossroad meson setup .. -Dgi-docgen=disabled \
-Djavascript=disabled -Dlua=disabled \
-Dvala=disabled
-Djavascript=disabled -Dvala=disabled
else
cd _build$ARTIFACTS_SUFFIX
fi
@ -82,7 +81,6 @@ GIMP_APP_VERSION=$(grep GIMP_APP_VERSION _build$ARTIFACTS_SUFFIX/config.h | head
echo "@echo off
echo This is a CI crossbuild of GIMP.
echo .js (JavaScript) plug-ins ^|^ NOT supported!
echo .lua (Lua) plug-ins ^|^ NOT supported!
echo .py (Python) plug-ins ^|^ NOT supported!
echo .scm (ScriptFu) plug-ins ^|^ NOT supported!
echo .vala (Vala) plug-ins ^|^ NOT supported!

9
build/windows/2_build-gimp-msys2.sh
View file

@ -81,13 +81,6 @@ cd ..
make_cmd ()
{
if [ "$4" == "do_wizardry" ]; then
interp_lua="(
echo lua=$2\bin\luajit.exe
echo luajit=$2\bin\luajit.exe
echo /usr/bin/lua=$2\bin\luajit.exe
echo /usr/bin/luajit=$2\bin\luajit.exe
echo :Lua:E::lua::luajit:
) >%cd%\lib\gimp\GIMP_API_VERSION\interpreters\lua.interp"
interp_pyt="(
echo python=$2\bin\python.exe
echo python3=$2\bin\python.exe
@ -112,8 +105,6 @@ make_cmd ()
echo "@echo off
echo This is a $1 native build of GIMP$3.
echo .js (JavaScript) plug-ins ^|^ NOT supported!
$interp_lua
echo .lua (Lua) plug-ins ^|^ supported.
$interp_pyt
echo .py (Python) plug-ins ^|^ supported.
$interp_scm

7
build/windows/2_bundle-gimp-uni_base.sh
View file

@ -178,9 +178,10 @@ if [ "$CI_JOB_NAME" != 'gimp-win-x64-cross' ]; then
bundle "$GIMP_PREFIX" lib/girepository-*/
bundle "$MSYS_PREFIX" lib/girepository-*/
bundle "$MSYS_PREFIX" bin/luajit.exe
bundle "$MSYS_PREFIX" lib/lua/
bundle "$MSYS_PREFIX" share/lua/
# https://gitlab.gnome.org/GNOME/gimp/-/issues/11597
#bundle "$MSYS_PREFIX" bin/luajit.exe
#bundle "$MSYS_PREFIX" lib/lua/
#bundle "$MSYS_PREFIX" share/lua/
bundle "$MSYS_PREFIX" bin/python*.exe
bundle "$MSYS_PREFIX" lib/python*/

2
build/windows/all-deps-uni.txt
View file

@ -35,8 +35,6 @@ ${MINGW_PACKAGE_PREFIX}-libspiro \
${MINGW_PACKAGE_PREFIX}-libwebp \
${MINGW_PACKAGE_PREFIX}-libwmf \
${MINGW_PACKAGE_PREFIX}-libxslt \
${MINGW_PACKAGE_PREFIX}-luajit \
${MINGW_PACKAGE_PREFIX}-lua51-lgi \
${MINGW_PACKAGE_PREFIX}-maxflow \
${MINGW_PACKAGE_PREFIX}-mypaint-brushes \
${MINGW_PACKAGE_PREFIX}-openexr \

2
build/windows/installer/3_dist-gimp-inno.ps1
View file

@ -193,7 +193,7 @@ $gimp_api_version = Get-Content "$CONFIG_PATH"
## Compile installer
Set-Location build\windows\installer
iscc -DGIMP_VERSION="$gimp_version" -DREVISION="$revision" -DGIMP_APP_VERSION="$gimp_app_version" -DGIMP_API_VERSION="$gimp_api_version" -DBUILD_DIR="$BUILD_DIR" -DGIMP_DIR="$GIMP_BASE" -DDIR32="$GIMP32" -DDIR64="$GIMP64" -DDIRA64="$GIMPA64" -DDEPS_DIR="$GIMP_BASE" -DDDIR32="$GIMP32" -DDDIR64="$GIMP64" -DDDIRA64="$GIMPA64" -DDEBUG_SYMBOLS -DLUA -DPYTHON base_gimp3264.iss | Out-Null
iscc -DGIMP_VERSION="$gimp_version" -DREVISION="$revision" -DGIMP_APP_VERSION="$gimp_app_version" -DGIMP_API_VERSION="$gimp_api_version" -DBUILD_DIR="$BUILD_DIR" -DGIMP_DIR="$GIMP_BASE" -DDIR32="$GIMP32" -DDIR64="$GIMP64" -DDIRA64="$GIMPA64" -DDEPS_DIR="$GIMP_BASE" -DDDIR32="$GIMP32" -DDDIR64="$GIMP64" -DDDIRA64="$GIMPA64" -DDEBUG_SYMBOLS -DPYTHON base_gimp3264.iss | Out-Null
## Test if the installer was created and return success/failure.
if (Test-Path "$GIMP_BASE\$INSTALLER" -PathType Leaf)