[gimp/wip/Jehan/gitlab-ci-win-32-bit: 14/23] More fixes:




commit c69238d1b01752f1391f2768d372d354ca1a9631
Author: Jehan <jehan girinstud io>
Date:   Tue May 11 12:16:39 2021 +0200

    More fixes:
    
    - Protect debug components betwen #ifdef DEBUG_SYMBOLS.
    - No more engines directory for GTK3.
    - Commenting modules too (not sure if this is needed, at least the
      default installation has none and it works ok so far).

 build/windows/installer/32on64.list | 3 +--
 build/windows/installer/files.isi   | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/build/windows/installer/32on64.list b/build/windows/installer/32on64.list
index 5b421447b2..115a476569 100644
--- a/build/windows/installer/32on64.list
+++ b/build/windows/installer/32on64.list
@@ -1,9 +1,8 @@
 #list of 32bit files to install on x64
 !GTK
 etc\fonts\
-lib\gtk-2.0\2.10.0\engines\*.dll
 #lib\gtk-2.0\2.10.0\loaders\*.dll
-lib\gtk-2.0\modules\*.dll
+#lib\gtk-2.0\modules\*.dll
 lib\gdk-pixbuf-2.0\2.10.0\loaders\*.dll
 lib\gdk-pixbuf-2.0\2.10.0\loaders.cache
 lib\babl-0.1\*.dll
diff --git a/build/windows/installer/files.isi b/build/windows/installer/files.isi
index 71706cda06..7ae8c5e5ed 100644
--- a/build/windows/installer/files.isi
+++ b/build/windows/installer/files.isi
@@ -18,7 +18,9 @@ Source: "{#GIMP_DIR}\{#DIR}\*.exe"; DestDir: "{app}"; Excludes: "\lib\gimp\{#DIR
 Source: "{#GIMP_DIR}\{#DIR}\*.debug"; DestDir: "{app}"; Components: gimp{#PLATFORM} and debug; Flags: 
recursesubdirs restartreplace uninsrestartdelete ignoreversion
 #endif
 Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\{#DIR_VER}\extensions\*.*"; Excludes: "*.debug"; DestDir: 
"{app}\lib\gimp\{#DIR_VER}\extensions"; Flags: recursesubdirs restartreplace ignoreversion uninsrestartdelete
+#ifdef DEBUG_SYMBOLS
 Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\{#DIR_VER}\extensions\*.debug"; DestDir: 
"{app}\lib\gimp\{#DIR_VER}\extensions"; Components: debug; Flags: recursesubdirs restartreplace ignoreversion 
uninsrestartdelete
+#endif
 
 Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\{#DIR_VER}\plug-ins\file-ps\file-ps.exe"; DestDir: 
"{app}\lib\gimp\{#DIR_VER}\plug-ins\file-ps"; Components: gs and gimp{#PLATFORM}; Flags: restartreplace 
ignoreversion uninsrestartdelete
 


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