diff --git a/build/windows/gitlab-ci/2_build-gimp-msys2.sh b/build/windows/gitlab-ci/2_build-gimp-msys2.sh index b411147f72..4262a21ca4 100644 --- a/build/windows/gitlab-ci/2_build-gimp-msys2.sh +++ b/build/windows/gitlab-ci/2_build-gimp-msys2.sh @@ -69,6 +69,7 @@ make_cmd () { MSYS2_PREFIX="c:/msys64${MSYSTEM_PREFIX}" GIMP_APP_VERSION=$(grep GIMP_APP_VERSION config.h | head -1 | sed 's/^.*"\([^"]*\)"$/\1/') + GIMP_API_VERSION=$(grep GIMP_PKGCONFIG_VERSION config.h | head -1 | sed 's/^.*"\([^"]*\)"$/\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. @@ -79,7 +80,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\GIMP_APP_VERSION\interpreters\lua.interp + ) >%cd%\lib\gimp\GIMP_API_VERSION\interpreters\lua.interp echo .lua (Lua) plug-ins ^|^ supported. ( echo python=$2\bin\python.exe @@ -87,14 +88,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\GIMP_APP_VERSION\interpreters\pygimp.interp + ) >%cd%\lib\gimp\GIMP_API_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\GIMP_APP_VERSION\interpreters\gimp-script-fu-interpreter.interp + echo gimp-script-fu-interpreter=%cd%\bin\gimp-script-fu-interpreter-GIMP_API_VERSION.exe + echo gimp-script-fu-interpreter-GIMP_API_VERSION=%cd%\bin\gimp-script-fu-interpreter-GIMP_API_VERSION.exe + echo /usr/bin/gimp-script-fu-interpreter=%cd%\bin\gimp-script-fu-interpreter-GIMP_API_VERSION.exe + echo :ScriptFu:E::scm::gimp-script-fu-interpreter-GIMP_API_VERSION.exe: + ) >%cd%\lib\gimp\GIMP_API_VERSION\interpreters\gimp-script-fu-interpreter.interp echo .scm (ScriptFu) plug-ins ^|^ supported. echo .vala (Vala) plug-ins ^|^ supported. echo. @@ -103,7 +104,7 @@ make_cmd () @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-$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/GIMP_API_VERSION/${GIMP_API_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 }