GNOME.org
 

[gimp] Installer: more fixes for split GIMP/deps directories

commit e7c50755f9707a510272b19192c5a0610a84ac6f
Author: Jernej Simončič <jernej|s-cccp eternallybored org>
Date:   Wed May 2 02:16:02 2018 +0200

    Installer: more fixes for split GIMP/deps directories

 build/windows/installer/32on64.isi   |    2 +-
 build/windows/installer/32on64.list  |    2 +
 build/windows/installer/files.isi    |    6 ++--
 build/windows/installer/gimp3264.iss |   51 ++++++++++++++++++---------------
 build/windows/installer/version.isi  |    3 ++
 5 files changed, 37 insertions(+), 27 deletions(-)
---
diff --git a/build/windows/installer/32on64.isi b/build/windows/installer/32on64.isi
index 5443e6c..1c39ef0 100644
--- a/build/windows/installer/32on64.isi
+++ b/build/windows/installer/32on64.isi
@@ -39,7 +39,7 @@ Source: "{#SRC_DIR}\{#FileLine}"; DestDir: "{app}\32\{#OutputDir}"; Components:
                        #if Copy(FileLine,2)=="GIMP"
                                #expr SRC_DIR=GIMP_DIR32
                        #elif Copy(FileLine,2)=="GTK"
-                               #expr SRC_DIR=GIMP_DIR32
+                               #expr SRC_DIR=DEPS_DIR32
                        #elif Copy(FileLine,2)=="end"
                                #define public Finished 1
                                //finished
diff --git a/build/windows/installer/32on64.list b/build/windows/installer/32on64.list
index d9acb6b..d83bd4b 100644
--- a/build/windows/installer/32on64.list
+++ b/build/windows/installer/32on64.list
@@ -6,4 +6,6 @@ lib\gtk-2.0\modules\
 share\themes\
 bin\gspawn*.exe
 bin\*.dll
+!GIMP
+bin\*.dll
 !end
diff --git a/build/windows/installer/files.isi b/build/windows/installer/files.isi
index b133d00..6ca3d36 100644
--- a/build/windows/installer/files.isi
+++ b/build/windows/installer/files.isi
@@ -15,10 +15,10 @@
 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,\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} and gs; 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: gs and gimp{#PLATFORM}; Flags: 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}\*.dll"; DestDir: "{app}"; Excludes: "\bin\libgs*.dll"; Components: 
deps{#PLATFORM}; Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
+Source: "{#DEPS_DIR}\{#DDIR}\bin\libgs*.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 799038e..7b9e47a 100644
--- a/build/windows/installer/gimp3264.iss
+++ b/build/windows/installer/gimp3264.iss
@@ -168,11 +168,11 @@ Name: "de"; MessagesFile: "compiler:Languages\German.isl,lang\de.setup.isl"
 Name: "el"; MessagesFile: "compiler:Languages\Greek.isl,lang\el.setup.isl"
 ;Name: "eo"; MessagesFile: "compiler:Languages\Unofficial\Esperanto.isl,lang\eo.setup.isl"
 Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl,lang\es.setup.isl"
-Name: "eu"; MessagesFile: "compiler:Languages\Unofficial\Basque.isl,lang\eu.setup.isl"
+;;Name: "eu"; MessagesFile: "compiler:Languages\Unofficial\Basque.isl,lang\eu.setup.isl"
 Name: "fr"; MessagesFile: "compiler:Languages\French.isl,lang\fr.setup.isl"
 Name: "hu"; MessagesFile: "compiler:Languages\Hungarian.isl,lang\hu.setup.isl"
-Name: "id"; MessagesFile: "compiler:Languages\Unofficial\Indonesian.isl,lang\id.setup.isl"
-Name: "is"; MessagesFile: "compiler:Languages\Unofficial\Icelandic.isl,lang\is.setup.isl"
+;;Name: "id"; MessagesFile: "compiler:Languages\Unofficial\Indonesian.isl,lang\id.setup.isl"
+;;Name: "is"; MessagesFile: "compiler:Languages\Unofficial\Icelandic.isl,lang\is.setup.isl"
 Name: "it"; MessagesFile: "compiler:Languages\Italian.isl,lang\it.setup.isl"
 ;Name: "lv"; MessagesFile: "compiler:Languages\Unofficial\Latvian.isl,lang\lv.setup.isl"
 Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl,lang\nl.setup.isl"
@@ -180,10 +180,10 @@ Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl,lang\pl.setup.isl"
 Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl,lang\pt_BR.setup.isl"
 Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl,lang\ru.setup.isl"
 Name: "sl"; MessagesFile: "compiler:Languages\Slovenian.isl,lang\sl.setup.isl"
-Name: "sv"; MessagesFile: "compiler:Languages\Unofficial\Swedish.isl,lang\sv.setup.isl"
+;;Name: "sv"; MessagesFile: "compiler:Languages\Unofficial\Swedish.isl,lang\sv.setup.isl"
 Name: "tr"; MessagesFile: "compiler:Languages\Turkish.isl,lang\tr.setup.isl"
-Name: "zh_CN"; MessagesFile: "compiler:Languages\Unofficial\ChineseSimplified.isl,lang\zh_CN.setup.isl"
-Name: "zh_TW"; MessagesFile: "compiler:Languages\Unofficial\ChineseTraditional.isl,lang\zh_TW.setup.isl"
+;;Name: "zh_CN"; MessagesFile: "compiler:Languages\Unofficial\ChineseSimplified.isl,lang\zh_CN.setup.isl"
+;;Name: "zh_TW"; MessagesFile: "compiler:Languages\Unofficial\ChineseTraditional.isl,lang\zh_TW.setup.isl"
 ;Name: "ro"; MessagesFile: "Romanian.islu,ro.setup.islu"
 
 [Types]
@@ -196,7 +196,13 @@ Name: custom; Description: "{cm:TypeCustom}"; Flags: iscustom
 Name: gimp32; Description: "{cm:ComponentsGimp,{#VERSION}}"; Types: full compact custom; Flags: fixed; 
Check: Check3264('32')
 Name: gimp64; Description: "{cm:ComponentsGimp,{#VERSION}}"; Types: full compact custom; Flags: fixed; 
Check: Check3264('64')
 
-Name: wimp; Description: "{cm:ComponentsGtkWimp}"; Types: full custom; Flags: dontinheritcheck 
disablenouninstallwarning
+Name: deps32; Description: "{cm:ComponentsDeps,{#GTK_VERSION}}"; Types: full compact custom; Flags: 
checkablealone fixed; Check: Check3264('32')
+Name: deps32\wimp; Description: "{cm:ComponentsGtkWimp}"; Types: full custom; Flags: dontinheritcheck 
disablenouninstallwarning; Check: Check3264('32')
+Name: deps32\compat; Description: "{cm:ComponentsCompat}"; Types: full custom; Flags: dontinheritcheck; 
Check: Check3264('32')
+Name: deps64; Description: "{cm:ComponentsDeps,{#GTK_VERSION}}"; Types: full compact custom; Flags: 
checkablealone fixed; Check: Check3264('64')
+Name: deps64\wimp; Description: "{cm:ComponentsGtkWimp}"; Types: full custom; Flags: dontinheritcheck 
disablenouninstallwarning; Check: Check3264('64')
+
+Name: gs; Description: "{cm:ComponentsGhostscript}"; Types: full custom
 
 Name: loc; Description: "{cm:ComponentsTranslations}"; Types: full custom
 
@@ -238,27 +244,26 @@ Source: "{#GIMP_DIR32}\etc\*"; DestDir: "{app}\etc"; Components: gimp32 or gimp6
 Source: "{#GIMP_DIR32}\lib\gimp\2.0\environ\*"; DestDir: "{app}\lib\gimp\2.0\environ"; Components: gimp32 or 
gimp64; Flags: recursesubdirs restartreplace uninsrestartdelete
 Source: "{#GIMP_DIR32}\lib\gimp\2.0\interpreters\*"; DestDir: "{app}\lib\gimp\2.0\interpreters"; Components: 
gimp32 or gimp64; Flags: recursesubdirs restartreplace uninsrestartdelete
 Source: "{#GIMP_DIR32}\share\gimp\*"; DestDir: "{app}\share\gimp"; Components: gimp32 or gimp64; Flags: 
recursesubdirs restartreplace uninsrestartdelete
-;Source: "{#GIMP_DIR32}\share\enchant\*"; DestDir: "{app}\share\enchant"; Components: gimp32 or gimp64; 
Flags: recursesubdirs restartreplace uninsrestartdelete
-;Source: "{#GIMP_DIR32}\share\libwmf\*"; DestDir: "{app}\share\libwmf"; Components: gimp32 or gimp64; Flags: 
recursesubdirs restartreplace uninsrestartdelete
-Source: "{#GIMP_DIR32}\share\themes\*"; DestDir: "{app}\share\themes"; Components: gimp32 or gimp64; Flags: 
recursesubdirs restartreplace uninsrestartdelete
-Source: "{#GIMP_DIR32}\share\xml\*"; DestDir: "{app}\share\xml"; Components: gimp32 or gimp64; Flags: 
recursesubdirs restartreplace uninsrestartdelete
+Source: "{#DEPS_DIR32}\share\enchant\*"; DestDir: "{app}\share\enchant"; Components: deps32 or deps64; 
Flags: recursesubdirs restartreplace uninsrestartdelete
+Source: "{#DEPS_DIR32}\share\libwmf\*"; DestDir: "{app}\share\libwmf"; Components: deps32 or deps64; Flags: 
recursesubdirs restartreplace uninsrestartdelete
+Source: "{#DEPS_DIR32}\share\themes\*"; DestDir: "{app}\share\themes"; Components: deps32 or deps64; Flags: 
recursesubdirs restartreplace uninsrestartdelete
+Source: "{#DEPS_DIR32}\share\xml\*"; DestDir: "{app}\share\xml"; Components: deps32 or deps64; Flags: 
recursesubdirs restartreplace uninsrestartdelete
 
-Source: "{#GIMP_DIR32}\share\poppler\*.*"; DestDir: "{app}\share\poppler"; Components: gimp32 or gimp64; 
Flags: recursesubdirs restartreplace uninsrestartdelete
+Source: "{#DEPS_DIR32}\share\poppler\*.*"; DestDir: "{app}\share\poppler"; Components: deps32 or deps64; 
Flags: recursesubdirs restartreplace uninsrestartdelete
 
-Source: "{#GIMP_DIR32}\share\locale\*"; DestDir: "{app}\share\locale"; Components: loc; Flags: 
recursesubdirs restartreplace uninsrestartdelete
+Source: "{#DEPS_DIR32}\share\locale\*"; DestDir: "{app}\share\locale"; Components: loc; Flags: 
recursesubdirs restartreplace uninsrestartdelete
 Source: "{#GIMP_DIR32}\share\locale\*"; DestDir: "{app}\share\locale"; Components: loc; Flags: 
recursesubdirs restartreplace uninsrestartdelete
 
 ;configure gimp with --enable-bundled-mypaint-brushes for the correct path to
 ;be picked by gimp
-Source: "{#GIMP_DIR32}\share\mypaint-data\*"; DestDir: "{app}\share\mypaint-data"; Components: mypaint; 
Flags: recursesubdirs restartreplace uninsrestartdelete
+Source: "{#DEPS_DIR32}\share\mypaint-data\*"; DestDir: "{app}\share\mypaint-data"; Components: mypaint; 
Flags: recursesubdirs restartreplace uninsrestartdelete
 
-Source: "{#GIMP_DIR32}\etc\fonts\*"; DestDir: "{app}\etc\fonts"; Components: gimp32 or gimp64; Flags: 
recursesubdirs restartreplace uninsrestartdelete
-Source: "{#GIMP_DIR32}\etc\gtk-2.0\*"; DestDir: "{app}\etc\gtk-2.0"; Excludes: gtkrc; Components: gimp32 or 
gimp64; Flags: recursesubdirs restartreplace uninsrestartdelete
-Source: "{#GIMP_DIR32}\etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Components: wimp; Flags: 
recursesubdirs restartreplace uninsrestartdelete
+Source: "{#DEPS_DIR32}\etc\fonts\*"; DestDir: "{app}\etc\fonts"; Components: deps32 or deps64; Flags: 
recursesubdirs restartreplace uninsrestartdelete
+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: "{#GIMP_DIR32}\share\ghostscript\8.71\lib\*.*"; DestDir: "{app}\share\ghostscript\8.71\lib"; 
Components: gimp32 or gimp64; Flags: recursesubdirs restartreplace uninsrestartdelete
-Source: "{#GIMP_DIR32}\share\ghostscript\8.71\Resource\*.*"; DestDir: 
"{app}\share\ghostscript\8.71\Resource"; Components: gimp32 or gimp64; Flags: recursesubdirs restartreplace 
uninsrestartdelete
+Source: "{#DEPS_DIR32}\share\ghostscript\9.21\lib\*.*"; DestDir: "{app}\share\ghostscript\9.21\lib"; 
Components: gimp32 or gimp64; Flags: recursesubdirs restartreplace uninsrestartdelete
 
 ;32-on-64bit
 #include "32on64.isi"
@@ -266,8 +271,8 @@ Source: "{#GIMP_DIR32}\share\ghostscript\8.71\Resource\*.*"; DestDir: "{app}\sha
 Source: "{#GIMP_DIR32}\lib\gimp\2.0\plug-ins\twain.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins"; Components: 
gimp32on64; Flags: recursesubdirs restartreplace uninsrestartdelete
 Source: "{#GIMP_DIR64}\lib\gimp\2.0\plug-ins\twain.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins"; Components: 
(not gimp32on64) and gimp64; Flags: recursesubdirs restartreplace uninsrestartdelete
 ;special case due to MS-Windows engine
-Source: "{#GIMP_DIR32}\etc\gtk-2.0\*"; DestDir: "{app}\32\etc\gtk-2.0"; Excludes: gtkrc; Components: 
gimp32on64; Flags: recursesubdirs restartreplace uninsrestartdelete
-Source: "{#GIMP_DIR32}\etc\gtk-2.0\gtkrc"; DestDir: "{app}\32\etc\gtk-2.0"; Components: gimp32on64 and wimp; 
Flags: recursesubdirs restartreplace uninsrestartdelete
+Source: "{#DEPS_DIR32}\etc\gtk-2.0\*"; DestDir: "{app}\32\etc\gtk-2.0"; Excludes: gtkrc; Components: 
gimp32on64; Flags: recursesubdirs restartreplace uninsrestartdelete
+Source: "{#DEPS_DIR32}\etc\gtk-2.0\gtkrc"; DestDir: "{app}\32\etc\gtk-2.0"; Components: gimp32on64 and 
deps64\wimp; Flags: recursesubdirs restartreplace uninsrestartdelete
 ;python scripts
 #ifdef PYTHON
 Source: "{#GIMP_DIR32}\lib\gimp\2.0\plug-ins\*.py"; DestDir: "{app}\lib\gimp\2.0\plug-ins"; Components: 
gimp32on64\py; Flags: recursesubdirs restartreplace uninsrestartdelete
@@ -291,8 +296,8 @@ Source: "{#GIMP_DIR32}\lib\gimp\2.0\python\*.p*"; DestDir: "{app}\lib\gimp\2.0\p
 
 ;upgrade zlib1.dll in System32 if it's present there to avoid breaking plugins
 ;sharedfile flag will ensure that the upgraded file is left behind on uninstall to avoid breaking other 
programs that use the file
-Source: "{#GIMP_DIR32}\bin\zlib1.dll"; DestDir: "{sys}"; Components: gimp32 or gimp64; Flags: restartreplace 
sharedfile 32bit uninsrestartdelete; Check: BadSysDLL('zlib1.dll',32)
-Source: "{#GIMP_DIR64}\bin\zlib1.dll"; DestDir: "{sys}"; Components: gimp64; Flags: restartreplace 
sharedfile uninsrestartdelete; Check: BadSysDLL('zlib1.dll',64)
+Source: "{#DEPS_DIR32}\bin\zlib1.dll"; DestDir: "{sys}"; Components: gimp32 or gimp64; Flags: restartreplace 
sharedfile 32bit uninsrestartdelete; Check: BadSysDLL('zlib1.dll',32)
+Source: "{#DEPS_DIR64}\bin\zlib1.dll"; DestDir: "{sys}"; Components: gimp64; Flags: restartreplace 
sharedfile uninsrestartdelete; Check: BadSysDLL('zlib1.dll',64)
 
 ;overridden configuration files
 #include "configoverride.isi"
diff --git a/build/windows/installer/version.isi b/build/windows/installer/version.isi
index 28f5f8e..5333b6a 100644
--- a/build/windows/installer/version.isi
+++ b/build/windows/installer/version.isi
@@ -6,8 +6,11 @@
   #error "VERSION must be defined"
 #endif
 
+#define GTK_VER=GetFileVersion(AddBackslash(DEPS_DIR64) + "bin\libgtk-win32-2.0-0.dll")
+
 #define public
 //used in the component list
+#define GTK_VERSION=Copy(GTK_VER,1,RPos(".",GTK_VER)-1)
 
 #define MAJOR=Copy(VERSION,1,Pos(".",VERSION)-1)
 #define MINOR=Copy(VERSION,Pos(".",VERSION)+1)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]