[gimp] Installer: split GIMP and dependencies again (makes it easier to digitally sign binaries I built mys

[Jernej Simončič <jernejs src gnome org>]

commit b6813cfe3cc32c6dc9dde5ace236ff9b76b094e2
Author: Jernej Simončič <jernej|s-cccp eternallybored org>
Date:   Wed May 2 01:22:50 2018 +0200

    Installer: split GIMP and dependencies again (makes it easier to digitally sign
    binaries I built myself)

 build/windows/installer/configoverride.isi |    1 +
 build/windows/installer/directories.isi    |   16 ++++++++++------
 build/windows/installer/files.isi          |   20 +++++++++++++-------
 3 files changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/build/windows/installer/configoverride.isi b/build/windows/installer/configoverride.isi
index 799cfbb..f6bac07 100644
--- a/build/windows/installer/configoverride.isi
+++ b/build/windows/installer/configoverride.isi
@@ -28,6 +28,7 @@ Source: "{code:GetExternalConfDir}\{#FileName}"; DestDir: "{app}\32\{#ConfigDir}
 #define public ConfigDir "etc\gimp\2.0"
 #expr ProcessConfigDir
 
+#define public BaseDir DEPS_DIR32
 #define public ConfigDir "etc\gtk-2.0"
 #expr ProcessConfigDir
 
diff --git a/build/windows/installer/directories.isi b/build/windows/installer/directories.isi
index 79bfe76..39b5f1c 100644
--- a/build/windows/installer/directories.isi
+++ b/build/windows/installer/directories.isi
@@ -14,14 +14,14 @@
 #endif
 
 #ifndef DIR32
-#define DIR32 "i686"
+#define DIR32 "i686-w64-mingw32"
 #endif
 #ifndef DIR64
-#define DIR64 "amd64"
+#define DIR64 "x86_64-w64-mingw32"
 #endif
 
 #ifndef GIMP_DIR
-       #define GIMP_DIR "N:\_newdev\output\gimp\" + VER_DIR
+       #define GIMP_DIR "N:\gimp\output\" + VER_DIR
 #endif
 
 //32-bit GIMP base directory (result of make install)
@@ -33,13 +33,17 @@
        #define GIMP_DIR64 GIMP_DIR + "\" + DIR64
 #endif
 
-#define DDIR32 DIR32 + "-w64-mingw32\sys-root\mingw"
-#define DDIR64 DIR64 + "-w64-mingw32\sys-root\mingw"
+#ifndef DDIR32
+       #define DDIR32 DIR32 + "-w64-mingw32\sys-root\mingw"
+#endif
+#ifndef DDIR64
+       #define DDIR64 DIR64 + "-w64-mingw32\sys-root\mingw"
+#endif
 
 #ifdef PYTHON
 
        //python source directory
        #ifndef PY_DIR
-               #define PY_DIR "N:\_newdev\deps\gimp\python"
+               #define PY_DIR "N:\common\python2.7"
        #endif
 #endif
diff --git a/build/windows/installer/files.isi b/build/windows/installer/files.isi
old mode 100644
new mode 100755
index 2e11860..b133d00
--- a/build/windows/installer/files.isi
+++ b/build/windows/installer/files.isi
@@ -4,20 +4,26 @@
 
 #if PLATFORM==32
        #define DIR DIR32
+       #define DDIR DDIR32
 #elif PLATFORM==64
        #define DIR DIR64
+       #define DDIR DDIR64
 #else
        #error "Unknown PLATFORM:" + PLATFORM
 #endif
 
 Source: "{#GIMP_DIR}\{#DIR}\*.dll"; DestDir: "{app}"; Components: gimp{#PLATFORM}; Flags: recursesubdirs 
restartreplace comparetimestamp uninsrestartdelete
-Source: "{#GIMP_DIR}\{#DIR}\*.exe"; DestDir: "{app}"; Excludes: 
"\lib\gimp\2.0\plug-ins\twain.exe,\lib\gimp\2.0\plug-ins\file-ps.exe,\bin\gimp.exe,\bin\gimp-console.exe"; 
Components: gimp{#PLATFORM}; Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
+Source: "{#GIMP_DIR}\{#DIR}\*.exe"; DestDir: "{app}"; Excludes: 
"\lib\gimp\2.0\plug-ins\twain.exe,\lib\gimp\2.0\plug-ins\file-ps.exe,\lib\gimp\2.0\plug-ins\file-mng.exe,\bin\gimp.exe,\bin\gimp-console.exe";
 Components: gimp{#PLATFORM}; Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
 
-Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\2.0\plug-ins\file-ps.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins"; 
Components: gimp{#PLATFORM}; Flags: restartreplace comparetimestamp uninsrestartdelete
+Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\2.0\plug-ins\file-ps.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins"; 
Components: gimp{#PLATFORM} and gs; Flags: restartreplace comparetimestamp uninsrestartdelete
 
-Source: "{#GIMP_DIR}\{#DIR}\*.dll"; DestDir: "{app}"; Excludes: "\bin\libgs-8.dll"; Components: 
gimp{#PLATFORM}; Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
-Source: "{#GIMP_DIR}\{#DIR}\bin\libgs-8.dll"; DestDir: "{app}\bin"; Components: gimp{#PLATFORM}; Flags: 
recursesubdirs restartreplace comparetimestamp uninsrestartdelete
+Source: "{#DEPS_DIR}\{#DDIR}\*.dll"; DestDir: "{app}"; Excludes: "\bin\gsdll??.dll"; Components: 
deps{#PLATFORM}; Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
+Source: "{#DEPS_DIR}\{#DDIR}\bin\gsdll??.dll"; DestDir: "{app}\bin"; Components: gs and deps{#PLATFORM}; 
Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
 
-Source: "{#GIMP_DIR}\{#DIR}\bin\gspawn-win*.exe"; DestDir: "{app}\bin"; Components: gimp{#PLATFORM}; Flags: 
recursesubdirs restartreplace comparetimestamp uninsrestartdelete
-;Source: "{#GIMP_DIR}\{#DIR}\bin\bzip2.exe"; DestDir: "{app}\bin"; Components: gimp{#PLATFORM}; Flags: 
recursesubdirs restartreplace uninsrestartdelete
-Source: "{#GIMP_DIR}\{#DIR}\lib\*.dll"; DestDir: "{app}\lib"; Components: gimp{#PLATFORM}; Flags: 
recursesubdirs restartreplace comparetimestamp uninsrestartdelete
+Source: "{#DEPS_DIR}\{#DDIR}\bin\gspawn-win*.exe"; DestDir: "{app}\bin"; Components: deps{#PLATFORM}; Flags: 
recursesubdirs restartreplace comparetimestamp uninsrestartdelete
+Source: "{#DEPS_DIR}\{#DDIR}\bin\bzip2.exe"; DestDir: "{app}\bin"; Components: deps{#PLATFORM}; Flags: 
recursesubdirs restartreplace uninsrestartdelete
+Source: "{#DEPS_DIR}\{#DDIR}\lib\*.dll"; DestDir: "{app}\lib"; Components: deps{#PLATFORM}; Flags: 
recursesubdirs restartreplace comparetimestamp uninsrestartdelete
+
+#if PLATFORM==64
+Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\2.0\plug-ins\file-mng.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins"; 
Components: gimp{#PLATFORM}; Flags: restartreplace comparetimestamp uninsrestartdelete
+#endif