build, docs, etc: drop hardcoding of GIMP version

In preparation for GIMP 3.0 and future releases.
This commit is contained in:
Bruno Lopes 2024-01-13 16:58:01 -03:00
parent 056e545215
commit 874b199e61
6 changed files with 13 additions and 8 deletions

View File

@ -68,6 +68,7 @@ fi
## XXX Functional fix to the problem of non-configured interpreters
## XXX Also, functional generator of the pixbuf 'loaders.cache' for GUI image support
gimp_app_version=`grep -rI '\<version *:' ../meson.build | head -1 | sed "s/^.*version *: *'\([0-9]\+\.[0-9]\+\).[0-9]*' *,.*$/\1/"`
echo "@echo off
echo This is a CI crossbuild of GIMP.
:: Don't run this under PowerShell since it produces UTF-16 files.
@ -78,5 +79,5 @@ echo "@echo off
echo .vala (Vala) plug-ins ^|^ NOT supported!
bin\gdk-pixbuf-query-loaders.exe lib\gdk-pixbuf-2.0\2.10.0\loaders\*.dll > lib\gdk-pixbuf-2.0\2.10.0\loaders.cache
echo.
bin\gimp-2.99.exe" > ${CROSSROAD_PREFIX}/gimp.cmd
bin\gimp-$gimp_app_version.exe" > ${CROSSROAD_PREFIX}/gimp.cmd
echo "Please run the gimp.cmd file to know the actual plug-in support." > ${CROSSROAD_PREFIX}/README.txt

View File

@ -89,6 +89,7 @@ fi
# XXX Functional fix to the problem of non-configured interpreters
make_cmd() {
gimp_app_version=`grep -rI '\<version *:' ../meson.build | head -1 | sed "s/^.*version *: *'\([0-9]\+\.[0-9]\+\).[0-9]*' *,.*$/\1/"`
echo "@echo off
echo This is a $1 native build of GIMP.
:: Don't run this under PowerShell since it produces UTF-16 files.
@ -99,7 +100,7 @@ make_cmd() {
echo /usr/bin/lua=$2\bin\luajit.exe
echo /usr/bin/luajit=$2\bin\luajit.exe
echo :Lua:E::lua::luajit:
) >%cd%\lib\gimp\2.99\interpreters\lua.interp
) >%cd%\lib\gimp\GIMP_APP_VERSION\interpreters\lua.interp
echo .lua (Lua) plug-ins ^|^ supported.
(
echo python=$2\bin\python.exe
@ -107,14 +108,14 @@ make_cmd() {
echo /usr/bin/python=$2\bin\python.exe
echo /usr/bin/python3=$2\bin\python.exe
echo :Python:E::py::python:
) >%cd%\lib\gimp\2.99\interpreters\pygimp.interp
) >%cd%\lib\gimp\GIMP_APP_VERSION\interpreters\pygimp.interp
echo .py (Python) plug-ins ^|^ supported.
(
echo gimp-script-fu-interpreter=%cd%\bin\gimp-script-fu-interpreter-3.0.exe
echo gimp-script-fu-interpreter-3.0=%cd%\bin\gimp-script-fu-interpreter-3.0.exe
echo /usr/bin/gimp-script-fu-interpreter=%cd%\bin\gimp-script-fu-interpreter-3.0.exe
echo :ScriptFu:E::scm::gimp-script-fu-interpreter-3.0.exe:
) >%cd%\lib\gimp\2.99\interpreters\gimp-script-fu-interpreter.interp
) >%cd%\lib\gimp\GIMP_APP_VERSION\interpreters\gimp-script-fu-interpreter.interp
echo .scm (ScriptFu) plug-ins ^|^ supported.
echo .vala (Vala) plug-ins ^|^ supported.
echo.
@ -122,7 +123,8 @@ make_cmd() {
@if not exist $2\lib\girepository-1.0\gegl*.typelib (copy lib\girepository-1.0\gegl*.typelib $2\lib\girepository-1.0) > nul
@if not exist $2\lib\girepository-1.0\gimp*.typelib (copy lib\girepository-1.0\gimp*.typelib $2\lib\girepository-1.0) > nul
set PATH=%PATH%;$2\bin
bin\gimp-2.99.exe" > ${GIMP_PREFIX}/gimp.cmd
bin\gimp-$gimp_app_version.exe" > ${GIMP_PREFIX}/gimp.cmd
sed -i "s/GIMP_APP_VERSION/${gimp_app_version}/g" ${GIMP_PREFIX}/gimp.cmd
sed -i 's|c:/|c:\\|g;s|msys64/|msys64\\|g' ${GIMP_PREFIX}/gimp.cmd
echo "Please run the gimp.cmd file to get proper plug-in support."> ${GIMP_PREFIX}/README.txt
}

View File

@ -1,6 +1,6 @@
.\" This man-page is auto-generated by gimp --dump-gimprc-manpage.
.TH GIMPRC 5 "Version 2.99.9" "GIMP Manual Pages"
.TH GIMPRC 5 "Version @GIMP_VERSION@" "GIMP Manual Pages"
.SH NAME
gimprc \- gimp configuration file
.SH DESCRIPTION
@ -1057,7 +1057,7 @@ When enabled, the online user manual will be used by the help system.
Otherwise the locally installed copy is used. Possible values are yes and no.
.TP
(user-manual-online-uri "https://docs.gimp.org/2.99")
(user-manual-online-uri "https://docs.gimp.org/@GIMP_APP_VERSION@")
The location of the online user manual. This is used if 'user-manual-online'
is enabled. This is a string value.

View File

@ -2,6 +2,7 @@
# Configure_file is just here to rename the files
manconf = configuration_data()
manconf.set('GIMP_VERSION', gimp_version)
manconf.set('GIMP_APP_VERSION', gimp_app_version)
manconf.set('gimpdatadir', prefix / gimpdatadir)
manconf.set('gimplocaledir', prefix / localedir)
manconf.set('gimpplugindir', prefix / gimpplugindir)

View File

@ -842,7 +842,7 @@
# The location of the online user manual. This is used if
# 'user-manual-online' is enabled. This is a string value.
#
# (user-manual-online-uri "https://docs.gimp.org/2.99")
# (user-manual-online-uri "https://docs.gimp.org/@GIMP_APP_VERSION@")
# The window type hint that is set on dock windows and the toolbox window.
# This may affect the way your window manager decorates and handles these

View File

@ -1,4 +1,5 @@
etcconf = configuration_data()
etcconf.set('GIMP_APP_VERSION', gimp_app_version)
etcconf.set('mypaint_brushes_dir', mypaint_brushes_dir)