[gimp/gimp-2-8] Installer: file-ps/ghostscript updates (only install on x64)

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

commit badc04882761b120a263a4d7ba1fb245a754a415
Author: Jernej Simončič <jernej|s-cccp eternallybored org>
Date:   Wed May 10 22:51:30 2017 +0200

    Installer: file-ps/ghostscript updates (only install on x64)

 build/windows/installer/files.isi    |    4 ++--
 build/windows/installer/gimp3264.iss |    7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/build/windows/installer/files.isi b/build/windows/installer/files.isi
index 6e9d688..b1f5f15 100644
--- a/build/windows/installer/files.isi
+++ b/build/windows/installer/files.isi
@@ -17,8 +17,8 @@ Source: "{#GIMP_DIR}\{#DIR}\*.exe"; DestDir: "{app}"; Excludes: "\lib\gimp\2.0\p
 
 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: "{#DEPS_DIR}\{#DDIR}\*.dll"; DestDir: "{app}"; Excludes: "\bin\libgs-8.dll"; Components: 
deps{#PLATFORM}; Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
-Source: "{#DEPS_DIR}\{#DDIR}\bin\libgs-8.dll"; DestDir: "{app}\bin"; Components: gs and deps{#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: "{#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
diff --git a/build/windows/installer/gimp3264.iss b/build/windows/installer/gimp3264.iss
index e09f7cb..322d8cf 100644
--- a/build/windows/installer/gimp3264.iss
+++ b/build/windows/installer/gimp3264.iss
@@ -197,7 +197,8 @@ Name: loc; Description: "{cm:ComponentsTranslations}"; Types: full custom
 
 Name: py; Description: "{cm:ComponentsPython}"; Types: full custom; Check: Check3264('32')
 
-Name: gs; Description: "{cm:ComponentsGhostscript}"; Types: full custom
+;file-ps only works on x64 currently
+Name: gs; Description: "{cm:ComponentsGhostscript}"; Types: full custom; Check: Check3264('64')
 
 Name: gimp32on64; Description: "{cm:ComponentsGimp32}"; Types: full custom; Flags: checkablealone; Check: 
Check3264('64')
 Name: gimp32on64\py; Description: "{cm:ComponentsPython}"; Types: full custom; Check: Check3264('64')
@@ -239,10 +240,6 @@ Source: "{#DEPS_DIR32}\etc\fonts\*"; DestDir: "{app}\etc\fonts"; Components: dep
 Source: "{#DEPS_DIR32}\etc\gtk-2.0\*"; DestDir: "{app}\etc\gtk-2.0"; Excludes: gtkrc; Components: deps32 or 
deps64; Flags: recursesubdirs restartreplace uninsrestartdelete
 Source: "{#DEPS_DIR32}\etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Components: deps32\wimp or 
deps64\wimp; Flags: recursesubdirs restartreplace uninsrestartdelete
 
-;ghostscript TODO: detect version automatically
-Source: "{#DEPS_DIR32}\share\ghostscript\8.71\lib\*.*"; DestDir: "{app}\share\ghostscript\8.71\lib"; 
Components: gs; Flags: recursesubdirs restartreplace uninsrestartdelete
-Source: "{#DEPS_DIR32}\share\ghostscript\8.71\Resource\*.*"; DestDir: 
"{app}\share\ghostscript\8.71\Resource"; Components: gs; Flags: recursesubdirs restartreplace 
uninsrestartdelete
-
 ;32-on-64bit
 #include "32on64.isi"
 ;prefer 32bit twain plugin over 64bit because 64bit twain drivers are rare