From 9c62dfd4d4158d20dbbb854d72a83ed57b089fee Mon Sep 17 00:00:00 2001 From: Jehan Date: Tue, 18 May 2021 22:03:48 +0200 Subject: [PATCH] build: extensions are gimp32/64 specific. Otherwise the extension files from the 32-bit build override the ones from the 64-build. This is wrong first because we get 32-bit executables uselessly (even though Windows 64-bit can run them, we should install the right ones) and also because we don't build Vala plug-ins on 32-bit (doesn't work for some reason) and as we override the extension manifest, the Vala goat exercise is not made available even though it's installed. --- build/windows/installer/files.isi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/windows/installer/files.isi b/build/windows/installer/files.isi index 7ae8c5e5ed..07fa01f2f0 100644 --- a/build/windows/installer/files.isi +++ b/build/windows/installer/files.isi @@ -17,9 +17,9 @@ Source: "{#GIMP_DIR}\{#DIR}\*.exe"; DestDir: "{app}"; Excludes: "\lib\gimp\{#DIR #ifdef DEBUG_SYMBOLS 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 +Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\{#DIR_VER}\extensions\*.*"; Excludes: "*.debug"; DestDir: "{app}\lib\gimp\{#DIR_VER}\extensions"; Components: gimp{#PLATFORM}; 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 +Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\{#DIR_VER}\extensions\*.debug"; DestDir: "{app}\lib\gimp\{#DIR_VER}\extensions"; Components: gimp{#PLATFORM} and 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