Updated version number and packaging fixes for Win32/MSYS2 build

zrax · May 3, 2018 · dcf68dc · dcf68dc
1 parent 715e6c1
commit dcf68dc
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/appsettings.h b/appsettings.h
@@ -22,7 +22,7 @@
 #include <unordered_set>
 #include <glibmm/ustring.h>
 
-#define GSSHVNC_VERSION_STR "0.91"
+#define GSSHVNC_VERSION_STR "0.92"
 
 namespace Glib
 {

diff --git a/win32/gsshvnc-setup.iss b/win32/gsshvnc-setup.iss
@@ -1,5 +1,5 @@
 #define MyAppName "gsshvnc"
-#define MyAppVersion "0.91"
+#define MyAppVersion "0.92"
 #define MyAppPublisher "Michael Hansen"
 #define MyAppURL "http://www.github.com/zrax/gsshvnc"
 #define MyAppExeName "gsshvnc.exe"
@@ -18,7 +18,7 @@ DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
 LicenseFile=COPYING
 OutputDir=.
-OutputBaseFilename=gsshvnc-setup
+OutputBaseFilename={#MyAppName}-setup-{#MyAppVersion}
 Compression=lzma
 SolidCompression=yes
 ArchitecturesInstallIn64BitMode=x64
@@ -39,3 +39,8 @@ Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\bin\gsshvnc.exe"; Tasks:
 
 [Run]
 Filename: "{app}\bin\gsshvnc.exe"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
+[InstallDelete]
+; Files removed from the distribution which may have been installed in previous
+; releases (usually due to msys2 package upgrades)
+Type: files; Name: "{app}\share\icons\Adwaita\512x512\emblems\emblem-synchronizing.png"
diff --git a/win32/prepare_release.py b/win32/prepare_release.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
 
 ### IMPORTANT:  This script should be run with msys2's python3, not mingw
 ###     or another native Windows python3 interpreter.
@@ -13,7 +13,6 @@
 # The MSYS package and directory prefixes for deployed packages
 pkg_prefix = 'mingw-w64-x86_64'
 msys_prefix = '/mingw64'
-staging_dir = '/tmp/gsshvnc-staging'
 
 # Packages required to run gsshvnc
 deploy_packages=[
@@ -48,6 +47,7 @@
     'libgpg-error',
     'libiconv',
     'libidn2',
+    'libjpeg-turbo',
     'libpng',
     'librsvg',
     'libsigc++',
@@ -80,7 +80,9 @@
     'bin/broadwayd.exe',
     'bin/bunzip2.exe',
     'bin/bz*',
+    'bin/cjpeg.exe',
     'bin/csslint*.exe',
+    'bin/djpeg.exe',
     'bin/dumpsexp.exe',
     'bin/fc-*',
     'bin/gnutls-*.exe',
@@ -89,18 +91,22 @@
     'bin/hb-*.exe',
     'bin/hmac256.exe',
     'bin/idn2.exe',
+    'bin/jpegtran.exe',
     'bin/lzma*.exe',
     'bin/mini*zip.exe',
     'bin/mpicalc.exe',
     'bin/msg*.exe',
     'bin/ocsptool.exe',
     'bin/openssl.exe',
     'bin/pcre*.exe',
+    'bin/rdjpgcom.exe',
     'bin/recode*.exe',
     'bin/rsvg-*.exe',
     'bin/sexp-conv.exe',
     'bin/srptool.exe',
+    'bin/tjbench.exe',
     'bin/unxz.exe',
+    'bin/wrjpgcom.exe',
     'bin/xml*.exe',
     'bin/xz*',
     'include',
@@ -223,12 +229,27 @@ def remove_empty_dirs(path):
              os.path.join(basedir, 'COPYING'))
 
 status_msg("Compiling GLib schemas")
-proc = subprocess.Popen(['glib-compile-schemas.exe',
+proc = subprocess.Popen([os.path.join(basedir, 'bin', 'glib-compile-schemas.exe'),
                          os.path.join(basedir, 'share', 'glib-2.0', 'schemas')])
 proc.communicate()
 if proc.returncode != 0:
     sys.exit(proc.returncode)
 
+status_msg("Updating GTK icon cache")
+proc = subprocess.Popen([os.path.join(basedir, 'bin', 'gtk-update-icon-cache-3.0.exe'),
+                         '-q', '-t', '-f',
+                         os.path.join(basedir, 'share', 'icons', 'Adwaita')])
+proc.communicate()
+if proc.returncode != 0:
+    sys.exit(proc.returncode)
+
+status_msg("Updating GDK Pixbuf loader cache")
+proc = subprocess.Popen([os.path.join(basedir, 'bin', 'gdk-pixbuf-query-loaders.exe'),
+                         '--update-cache'])
+proc.communicate()
+if proc.returncode != 0:
+    sys.exit(proc.returncode)
+
 status_msg("Cleaning unnecessary files and directories")
 for pat in clean_patterns:
     print('  - ' + pat)