diff --git a/build/windows/gitlab-ci/package-gimp-msys2.sh b/build/windows/gitlab-ci/package-gimp-msys2.sh index ea7f827e2c..e462f4c9f9 100644 --- a/build/windows/gitlab-ci/package-gimp-msys2.sh +++ b/build/windows/gitlab-ci/package-gimp-msys2.sh @@ -116,13 +116,8 @@ cp -fr ${MSYS_PREFIX}/share/libwmf ${GIMP_DISTRIB}/share/ cp -fr ${MSYS_PREFIX}/share/mypaint-data ${GIMP_DISTRIB}/share/ cp -fr ${MSYS_PREFIX}/share/poppler ${GIMP_DISTRIB}/share/ -# Move these 2 folders into bin/ so that Lua plug-ins find the lua -# dependencies. The alternative was to modify LUA_PATH_DEFAULT and -# LUA_CPATH_DEFAULT macros in lua (which ender used to do, hence -# rebuilding lua). But it's much simpler to just move these 2 folders as -# bin/lua/ and bin/lgi/ -cp -fr ${MSYS_PREFIX}/share/lua/5.1/ ${GIMP_DISTRIB}/bin/lua -cp -fr ${MSYS_PREFIX}/lib/lua/5.1/lgi/ ${GIMP_DISTRIB}/bin/ +cp -fr ${MSYS_PREFIX}/share/lua/ ${GIMP_DISTRIB}/share/ +cp -fr ${MSYS_PREFIX}/lib/lua/ ${GIMP_DISTRIB}/lib/ # XXX Are these themes really needed? cp -fr ${MSYS_PREFIX}/share/themes ${GIMP_DISTRIB}/share/ diff --git a/build/windows/installer/files.isi b/build/windows/installer/files.isi index 003a219259..d0b9d12b0c 100644 --- a/build/windows/installer/files.isi +++ b/build/windows/installer/files.isi @@ -55,6 +55,6 @@ Source: "{#DEPS_DIR}\{#DDIR}\lib\python3.10\*"; DestDir: "{app}\lib\python3.10"; #ifdef LUA Source: "{#DEPS_DIR}\{#DDIR}\bin\luajit.exe"; DestDir: "{app}\bin"; Components: lua and gimp{#PLATFORM}; Flags: restartreplace uninsrestartdelete ignoreversion Source: "{#DEPS_DIR}\{#DDIR}\bin\lua51.dll"; DestDir: "{app}\bin"; Components: lua and gimp{#PLATFORM}; Flags: restartreplace uninsrestartdelete ignoreversion -Source: "{#DEPS_DIR}\{#DDIR}\bin\lua\*"; DestDir: "{app}\bin\lua"; Components: lua and gimp{#PLATFORM}; Flags: recursesubdirs restartreplace ignoreversion uninsrestartdelete -Source: "{#DEPS_DIR}\{#DDIR}\bin\lgi\*"; DestDir: "{app}\bin\lgi"; Components: lua and gimp{#PLATFORM}; Flags: recursesubdirs restartreplace ignoreversion uninsrestartdelete +Source: "{#DEPS_DIR}\{#DDIR}\share\lua\*"; DestDir: "{app}\share\lua"; Components: lua and gimp{#PLATFORM}; Flags: recursesubdirs restartreplace ignoreversion uninsrestartdelete +Source: "{#DEPS_DIR}\{#DDIR}\lib\lua\*"; DestDir: "{app}\lib\lua"; Components: lua and gimp{#PLATFORM}; Flags: recursesubdirs restartreplace ignoreversion uninsrestartdelete #endif