diff --git a/build/windows/gitlab-ci/1_build-deps-crossroad.sh b/build/windows/gitlab-ci/1_build-deps-crossroad.sh index 9395679acd..f77f9a96a7 100644 --- a/build/windows/gitlab-ci/1_build-deps-crossroad.sh +++ b/build/windows/gitlab-ci/1_build-deps-crossroad.sh @@ -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 '\ 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 \ No newline at end of file diff --git a/build/windows/gitlab-ci/2_build-gimp-msys2.sh b/build/windows/gitlab-ci/2_build-gimp-msys2.sh index bd6d86f504..80b47076ef 100644 --- a/build/windows/gitlab-ci/2_build-gimp-msys2.sh +++ b/build/windows/gitlab-ci/2_build-gimp-msys2.sh @@ -89,6 +89,7 @@ fi # XXX Functional fix to the problem of non-configured interpreters make_cmd() { + gimp_app_version=`grep -rI '\%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 } diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in index 181b2ec811..d6ff146f71 100644 --- a/docs/gimprc.5.in +++ b/docs/gimprc.5.in @@ -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. diff --git a/docs/meson.build b/docs/meson.build index 68538446ec..d9d3fabfdc 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -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) diff --git a/etc/gimprc.in b/etc/gimprc.in index 9f8afa102a..3fbaa34f4c 100644 --- a/etc/gimprc.in +++ b/etc/gimprc.in @@ -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 diff --git a/etc/meson.build b/etc/meson.build index 222b9b6347..c4cae6f864 100644 --- a/etc/meson.build +++ b/etc/meson.build @@ -1,4 +1,5 @@ etcconf = configuration_data() +etcconf.set('GIMP_APP_VERSION', gimp_app_version) etcconf.set('mypaint_brushes_dir', mypaint_brushes_dir)