Merge pull request #74 from timsutton/update-packaging

Updates for 0.2.5

CHANGELIST

@@ -1,3 +1,10 @@
+### 0.2.5 (November 7, 2022)
+- update 7-Zip to 22.01
+- add '-V/--version' option to output the tool version
+- update precompiled Windows exe to the last Python 2.7 distribution and
+  compatible PyInstaller (3.6) version, resolving issues with TLS version
+  support
+
 ### 0.2.4 (March 24, 2016)
 - remove dependency on dmg2iso, as current 7-Zip versions seem to reliably
   extract all the contents of WindowsSupport.dmg files

VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

brigadier

@@ -16,9 +16,10 @@ from pprint import pprint
 from urllib import urlretrieve
 from xml.dom import minidom
 
+VERSION = '0.2.5'
 SUCATALOG_URL = 'https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog'
 # 7-Zip MSI (15.14)
-SEVENZIP_URL = 'http://www.7-zip.org/a/7z1514-x64.msi'
+SEVENZIP_URL = 'https://www.7-zip.org/a/7z2201-x64.msi'
 
 def status(msg):
     print "%s\n" % msg
@@ -131,8 +132,14 @@ product, ie. 'BootCamp-041-1234'. Uses the current directory if this option is o
         help="Specify an exact product ID to download (ie. '031-0787'), currently useful only for cases \
 where a model has multiple BootCamp ESDs available and is not downloading the desired version \
 according to the post date.")
+    o.add_option('-V', '--version', action="store_true",
+        help="Output the version of brigadier.")
 
     opts, args = o.parse_args()
+    if opts.version:
+        print VERSION
+        sys.exit(0)
+
     if opts.install:
         if platform.system() == 'Darwin':
             sys.exit("Installing Boot Camp can only be done on Windows!")

build_windows_exe.py

@@ -6,6 +6,13 @@
 # Requires:
 # - Python 2.7 for Windows (http://www.python.org/getit)
 # - pywin32 (http://sourceforge.net/projects/pywin32)
+#
+# Note (2022-11-07): This script needs to be overhauled to instead
+# just use a virtualenv. PyInstaller 3.6 needs pywin32-ctypes, and
+# also to pass a .spec file into pyinstaller, so that the exe contains
+# more metadata and version info. As-is the script doesn't currently
+# work, and I've just bumped the PyInstaller version to 3.6 as a reminder
+# that this is the last version that is still compatible with Python 2.7.
 
 import urllib
 import os
@@ -14,7 +21,7 @@ import subprocess
 import shutil
 import hashlib
 
-PYINSTALLER_URL = 'https://pypi.python.org/packages/source/P/PyInstaller/PyInstaller-2.1.zip'
+PYINSTALLER_URL = 'https://github.com/pyinstaller/pyinstaller/archive/refs/tags/v3.6.zip'
 PYINST_ZIPFILE = os.path.join(os.getcwd(), 'pyinstaller.zip')
 NAME = 'brigadier'