update windows installers for the next release

doug-101 · Aug 15, 2020 · c188f17 · c188f17
1 parent 9cd65ce
commit c188f17
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 34 deletions.
diff --git a/doc/documentation.trln b/doc/documentation.trln
@@ -636,6 +636,15 @@
 "uid": "5f12f768b32c11e7a41a3417ebd53aeb"
 },
 {
+"children": [],
+"data": {
+"Name": "Library updates",
+"Text": "Update the libraries used to build the Windows binaries to Python 3.8 and Qt/PyQt 5.14."
+},
+"format": "BULLETS",
+"uid": "603e11fadf2011eaa12e7054d2175f18"
+},
+{
 "children": [
 "2fa1be1fdc9511eaa00dac675dac20af"
 ],
@@ -997,7 +1006,8 @@
 {
 "children": [
 "27950877dc8a11ea8902ac675dac20af",
-"c1f8dca5dc9511ea8f76ac675dac20af"
+"c1f8dca5dc9511ea8f76ac675dac20af",
+"603e11fadf2011eaa12e7054d2175f18"
 ],
 "data": {
 "Name": "Updates"

diff --git a/source/treeline.py b/source/treeline.py
@@ -13,7 +13,7 @@
 #******************************************************************************
 
 __progname__ = 'TreeLine'
-__version__ = '3.1.2+'
+__version__ = '3.1.3'
 __author__ = 'Doug Bell'
 
 docPath = None         # modified by install script if required

diff --git a/source/treeline.spec b/source/treeline.spec
@@ -11,7 +11,7 @@
 # that contains the files needed to run the application
 #
 # TreeLine, an information storage program
-# Copyright (C) 2019, Douglas W. Bell
+# Copyright (C) 2020, Douglas W. Bell
 #
 # This is free software; you can redistribute it and/or modify it under the
 # terms of the GNU General Public License, either Version 2 or any later
@@ -56,12 +56,15 @@ exe = EXE(pyz,
           upx=True,
           console=False,
           icon='..\\win\\treeline.ico')
-a.binaries = a.binaries - TOC([('libcrypto-1_1.dll', None, None),
+a.binaries = a.binaries - TOC([('d3dcompiler_47.dll', None, None),
+                               ('libcrypto-1_1.dll', None, None),
                                ('libeay32.dll', None, None),
                                ('libglesv2.dll', None, None),
                                ('libssl-1_1.dll', None, None),
+                               ('opengl32sw.dll', None, None),
                                ('qt5dbus.dll', None, None),
                                ('qt5qml.dll', None, None),
+                               ('qt5qmlmodels.dll', None, None),
                                ('qt5quick.dll', None, None),
                                ('qt5websockets.dll', None, None)])
 coll = COLLECT(exe,

diff --git a/win/treeline-all.iss b/win/treeline-all.iss
@@ -5,7 +5,7 @@
 
 [Setup]
 AppName=TreeLine
-AppVersion=3.1.2
+AppVersion=3.1.3
 ChangesAssociations=yes
 DefaultDirName={pf}\TreeLine-3
 DefaultGroupName=TreeLine
@@ -27,22 +27,12 @@ Name: "source"; Description: "Include source code"
 
 [InstallDelete]
 Type: files; Name: "{app}\library.zip"
-Type: files; Name: "{app}\msvcp100.dll"
-Type: files; Name: "{app}\MSVCR100.dll"
-Type: files; Name: "{app}\PyQt4*.dll"
-Type: files; Name: "{app}\python3*.dll"
-Type: files; Name: "{app}\Qt*4.dll"
-Type: files; Name: "{app}\sip.pyd"
-Type: files; Name: "{app}\SSLEAY32.dll"
+Type: files; Name: "{app}\python*.zip"
+Type: files; Name: "{app}\*.pyd"
+Type: files; Name: "{app}\*.dll"
 Type: files; Name: "{app}\doc\documentation.trl"
+Type: filesandordirs; Name: "{app}\lib"
 Type: filesandordirs; Name: "{app}\imageformats"
-Type: files; Name: "{app}\lib\MSVCP140.dll"
-Type: files; Name: "{app}\lib\python*.dll"
-Type: files; Name: "{app}\lib\Qt5*.dll"
-Type: files; Name: "{app}\lib\VCRUNTIME140.dll"
-Type: files; Name: "{app}\lib\library.zip"
-Type: files; Name: "{app}\lib\*.pyd"
-Type: dirifempty; Name: "{app}\lib"
 Type: filesandordirs; Name: "{app}\platforms"
 Type: dirifempty; Name: "{app}\plugins"
 Type: files; Name: "{app}\samples\*.trl"

diff --git a/win/treeline-user.iss b/win/treeline-user.iss
@@ -5,7 +5,7 @@
 
 [Setup]
 AppName=TreeLine
-AppVersion=3.1.2
+AppVersion=3.1.3
 ChangesAssociations=yes
 DefaultDirName={userappdata}\TreeLine-3
 DefaultGroupName=TreeLine
@@ -27,22 +27,12 @@ Name: "source"; Description: "Include source code"
 
 [InstallDelete]
 Type: files; Name: "{app}\library.zip"
-Type: files; Name: "{app}\msvcp100.dll"
-Type: files; Name: "{app}\MSVCR100.dll"
-Type: files; Name: "{app}\PyQt4*.dll"
-Type: files; Name: "{app}\python3*.dll"
-Type: files; Name: "{app}\Qt*4.dll"
-Type: files; Name: "{app}\sip.pyd"
-Type: files; Name: "{app}\SSLEAY32.dll"
+Type: files; Name: "{app}\python*.zip"
+Type: files; Name: "{app}\*.pyd"
+Type: files; Name: "{app}\*.dll"
 Type: files; Name: "{app}\doc\documentation.trl"
+Type: filesandordirs; Name: "{app}\lib"
 Type: filesandordirs; Name: "{app}\imageformats"
-Type: files; Name: "{app}\lib\MSVCP140.dll"
-Type: files; Name: "{app}\lib\python*.dll"
-Type: files; Name: "{app}\lib\Qt5*.dll"
-Type: files; Name: "{app}\lib\VCRUNTIME140.dll"
-Type: files; Name: "{app}\lib\library.zip"
-Type: files; Name: "{app}\lib\*.pyd"
-Type: dirifempty; Name: "{app}\lib"
 Type: filesandordirs; Name: "{app}\platforms"
 Type: dirifempty; Name: "{app}\plugins"
 Type: files; Name: "{app}\samples\*.trl"