[gimp/wip/Jehan/incremental-win-installer-improvements: 12/12] Test: install lua51 and lua51-lgi.




commit cc95c219ad8019245f4f719b332aaf5123708a92
Author: Jehan <jehan girinstud io>
Date:   Tue May 18 22:13:18 2021 +0200

    Test: install lua51 and lua51-lgi.
    
    Not sure if that's the problem here. I think luajit is meant to have all
    files already.

 build/windows/gitlab-ci/package-gimp-msys2.sh | 5 +++++
 build/windows/installer/compile.bat           | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/build/windows/gitlab-ci/package-gimp-msys2.sh b/build/windows/gitlab-ci/package-gimp-msys2.sh
index 6b2fb267f0..cb87cd37ab 100644
--- a/build/windows/gitlab-ci/package-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/package-gimp-msys2.sh
@@ -65,6 +65,8 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-libspiro \
     mingw-w64-$MSYS2_ARCH-libwebp \
     mingw-w64-$MSYS2_ARCH-libwmf \
+    mingw-w64-$MSYS2_ARCH-lua51 \
+    mingw-w64-$MSYS2_ARCH-lua51-lgi \
     mingw-w64-$MSYS2_ARCH-luajit \
     mingw-w64-$MSYS2_ARCH-maxflow \
     mingw-w64-$MSYS2_ARCH-mypaint-brushes \
@@ -118,11 +120,14 @@ cp -fr ${MSYS_PREFIX}/lib/gdk-pixbuf-2.0 ${GIMP_DISTRIB}/lib/
 cp -fr ${MSYS_PREFIX}/lib/gtk-3.0 ${GIMP_DISTRIB}/lib/
 
 cp -fr ${MSYS_PREFIX}/lib/python3.8 ${GIMP_DISTRIB}/lib/
+cp -fr ${MSYS_PREFIX}/lib/lua ${GIMP_DISTRIB}/lib/
 
 cp -fr ${MSYS_PREFIX}/share/ghostscript ${GIMP_DISTRIB}/share/
 cp -fr ${MSYS_PREFIX}/share/glib-2.0 ${GIMP_DISTRIB}/share/
 cp -fr ${MSYS_PREFIX}/share/libthai ${GIMP_DISTRIB}/share/
 cp -fr ${MSYS_PREFIX}/share/libwmf ${GIMP_DISTRIB}/share/
+cp -fr ${MSYS_PREFIX}/share/lua ${GIMP_DISTRIB}/share/
+cp -fr ${MSYS_PREFIX}/share/luajit-2.1.0-beta3 ${GIMP_DISTRIB}/share/
 cp -fr ${MSYS_PREFIX}/share/mypaint-data ${GIMP_DISTRIB}/share/
 cp -fr ${MSYS_PREFIX}/share/poppler ${GIMP_DISTRIB}/share/
 
diff --git a/build/windows/installer/compile.bat b/build/windows/installer/compile.bat
index 84a15ae17b..bc115f7110 100755
--- a/build/windows/installer/compile.bat
+++ b/build/windows/installer/compile.bat
@@ -34,7 +34,7 @@ shift
 goto doparams
 :paramsdone
 
-"%INNOPATH%\iscc.exe" -DVERSION="%VER%" -DGIMP_DIR="%GIMP_BASE%" -DDIR32="%GIMP32%" -DDIR64="%GIMP64%" 
-DDEPS_DIR="%DEPS_BASE%" -DDDIR32="%DEPS32%" -DDDIR64="%DEPS64%" -DDEBUG_SYMBOLS -DPYTHON %PARAMS% 
gimp3264.iss
+"%INNOPATH%\iscc.exe" -DVERSION="%VER%" -DGIMP_DIR="%GIMP_BASE%" -DDIR32="%GIMP32%" -DDIR64="%GIMP64%" 
-DDEPS_DIR="%DEPS_BASE%" -DDDIR32="%DEPS32%" -DDDIR64="%DEPS64%" -DDEBUG_SYMBOLS -DPYTHON -DLUA %PARAMS% 
gimp3264.iss
 goto :eof
 
 :help


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]