[gimp/gimp-2-10] Installer: include full version number in icon name



commit 78fbf159a6f1bdd0b00210821208c0ba3153963f
Author: Jernej Simončič <jernej|s-gitstuff eternallybored org>
Date:   Thu Jul 5 13:55:24 2018 +0200

    Installer: include full version number in icon name

 build/windows/installer/gimp3264.iss | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/build/windows/installer/gimp3264.iss b/build/windows/installer/gimp3264.iss
index e419608830..37b5ee984b 100755
--- a/build/windows/installer/gimp3264.iss
+++ b/build/windows/installer/gimp3264.iss
@@ -225,11 +225,7 @@ Name: gimp32on64\compat; Description: "{cm:ComponentsCompat}"; Types: full custo
 Name: desktopicon; Description: "{cm:AdditionalIconsDesktop}"; GroupDescription: "{cm:AdditionalIcons}"; 
Flags: unchecked
 
 [Icons]
-#if Defined(DEVEL) && DEVEL != ""
-       #define ICON_VERSION=MAJOR + "." + MINOR
-#else
-       #define ICON_VERSION=MAJOR
-#endif
+#define ICON_VERSION=MAJOR + "." + MINOR + "." + MICRO
 Name: "{commonprograms}\GIMP {#ICON_VERSION}"; Filename: "{app}\bin\gimp-{#MAJOR}.{#MINOR}.exe"; WorkingDir: 
"%USERPROFILE%"; Comment: "GIMP {#VERSION}"
 Name: "{commondesktop}\GIMP {#ICON_VERSION}"; Filename: "{app}\bin\gimp-{#MAJOR}.{#MINOR}.exe"; WorkingDir: 
"%USERPROFILE%"; Comment: "GIMP {#VERSION}"; Tasks: desktopicon
 
@@ -325,6 +321,7 @@ Source: "{#DEPS_DIR32}\lib\python2.7\*"; DestDir: "{app}\32\lib\python2.7"; Comp
 Type: files; Name: "{app}\bin\gimp-?.?.exe"
 Type: files; Name: "{app}\bin\gimp-?.??.exe"
 Type: files; Name: "{app}\bin\gimp-console-?.?.exe"
+Type: files; Name: "{app}\bin\gimp-console-?.??.exe"
 Type: files; Name: "{app}\lib\gegl-0.1\*.dll"
 ;obsolete plugins from gimp 2.6
 Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\file-pdf.exe"
@@ -332,6 +329,7 @@ Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\gee.exe"
 Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\gee-zoom.exe"
 ;old Python
 Type: filesandordirs; Name: "{app}\Python\*"
+Type: dirifempty; Name: "{app}\Python"
 ;remove incompatible version shipped with 2.8
 Type: files; Name: "{app}\bin\zlib1.dll"
 Type: files; Name: "{app}\32\bin\zlib1.dll"
@@ -346,6 +344,12 @@ Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\pyconsole.py"
 Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\python-console.py"
 ;DLLs in plug-ins directory (see bug 796225)
 Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\*.dll"
+;old icons
+Type: files; Name: "{commonprograms}\GIMP 2.lnk"
+Type: files; Name: "{commondesktop}\GIMP 2.lnk"
+;get previous GIMP icon name from uninstall name in Registry
+Type: files; Name: 
"{commonprograms}\{reg:HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GIMP-2_is1,DisplayName|GIMP 
2}.lnk"; Check: 
CheckRegValueExists('SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GIMP-2_is1','DisplayName')
+Type: files; Name: 
"{commondesktop}\{reg:HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GIMP-2_is1,DisplayName|GIMP 
2}.lnk"; Check: 
CheckRegValueExists('SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GIMP-2_is1','DisplayName')
 
 [UninstallDelete]
 Type: files; Name: "{app}\uninst\uninst.inf"
@@ -497,6 +501,12 @@ begin
 end;
 
 
+function CheckRegValueExists(const SubKeyName, ValueName: String): Boolean;
+begin
+       Result := RegValueExists(HKEY_LOCAL_MACHINE, SubKeyName, ValueName);
+end;
+
+
 function DoConfigOverride: Boolean;
 var i: Integer;
 begin


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