Look up Python ABI version, instead of hardcoding

- Hardcoded 'python3.7', 'exe.mingw-3.7', etc. strings have been
  replaced with one constructed using the value of the sysconfig.py
  config variable 'py_version_short'
- Only exceptions: macOS-only code in fix_qt5_rpath.py/build_mac_dmg.sh
  (XXX comments placed, warning of their lack of future-proofing)

Author: ferdnyc

.gitlab-ci.yml

@@ -136,7 +136,7 @@ windows-builder-x86:
     - $PREV_GIT_LABEL=(git describe --tags --abbrev=0 '@^')
     - git log "$PREV_GIT_LABEL..@" --oneline --pretty=format:"- %C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "build/install-x86/share/$CI_PROJECT_NAME.log"
     - python3 -u freeze.py build --git-branch=$CI_COMMIT_REF_NAME
-    - editbin /LARGEADDRESSAWARE "$CI_PROJECT_DIR\build\exe.mingw-3.7\openshot-qt.exe"
+    - editbin /LARGEADDRESSAWARE "$CI_PROJECT_DIR\build\exe.mingw-$PyABI\openshot-qt.exe"
     - python3 -u installer/build_server.py "$SLACK_TOKEN" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "True" "$CI_COMMIT_REF_NAME"
   when: always
   except:

installer/build-mac-dmg.sh

@@ -1,4 +1,7 @@
 #!/bin/sh
+
+# XXX: These paths should be set using `brew prefix` commands,
+#      for future-proofing against upgrades
 PATH=/usr/local/Cellar/[email protected]/3.7.9_2/Frameworks/Python.framework/Versions/3.7/bin:/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/qt5/5.5/clang_64/bin:/opt/X11/bin
 
 # Get Version

installer/build_server.py

@@ -34,13 +34,15 @@
 import re
 import stat
 import subprocess
+import sysconfig
 import traceback
 from github3 import login
 from requests.auth import HTTPBasicAuth
 from requests import post
 from version_parser import parse_version_info, parse_build_name
 
 PATH = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))  # Primary openshot folder
+PY_ABI = sysconfig.get_config_var('py_version_short')
 
 # Access info class (for version info)
 sys.path.append(os.path.join(PATH, 'src', 'classes'))
@@ -410,8 +412,8 @@ def main():
 
         if platform.system() == "Windows":
             # Move python folder structure, since Cx_Freeze doesn't put it in the correct place
-            exe_dir = os.path.join(PATH, 'build', 'exe.mingw-3.7')
-            python_dir = os.path.join(exe_dir, 'lib', 'python3.7')
+            exe_dir = os.path.join(PATH, 'build', 'exe.mingw-{}'.format(PY_ABI))
+            python_dir = os.path.join(exe_dir, 'lib', 'python{}'.format(PY_ABI))
 
             # Remove a redundant openshot_qt module folder (duplicates lots of files)
             duplicate_openshot_qt_path = os.path.join(python_dir, 'openshot_qt')
@@ -521,6 +523,7 @@ def main():
                 '/Q',
                 '/DVERSION=%s' % version,
                 '/DONLY_64_BIT=%s' % only_64_bit,
+                '/DPY_EXE_DIR=%s' % "exe.mingw-{}".format(PY_ABI),
                 '"%s"' % os.path.join(PATH, 'installer', 'windows-installer.iss'),
                 ])
             inno_output = ""

installer/fix_qt5_rpath.py

@@ -112,7 +112,9 @@ def print_min_versions(PATH):
 
 
 if __name__ == "__main__":
-    """Run these methods manually for testing"""
+    # Run these methods manually for testing
+
+    # XXX: This path should be set programmatically, somehow
     PATH = "/Users/jonathanthomas/apps/openshot-qt/build/exe.macosx-10.15-x86_64-3.7"
     fix_rpath(PATH)
     print_min_versions(PATH)

installer/windows-installer.iss

@@ -7,6 +7,9 @@
 #ifndef ONLY_64_BIT
   #define ONLY_64_BIT "x64"
 #endif
+#ifndef PY_EXE_DIR
+  #define PY_EXE_DIR "exe.mingw-3.8"
+#endif
 
 
 #define MyAppName "OpenShot Video Editor"
@@ -138,7 +141,7 @@ Root: HKLM; Subkey: "Software\Classes\OpenShotProject\shell\open\command"; Value
 
 [Files]
 ; Add all frozen files from cx_Freeze build
-Source: "..\build\exe.mingw-3.7\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
+Source: "..\build\{#PY_EXE_DIR}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
 
 [Icons]
 Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"