From 257f20cdcc98f7be3cc48a644387eb98cd52fb3a Mon Sep 17 00:00:00 2001
From: Gonzalo Lopez <glopezvigliante@gmail.com>
Date: Fri, 25 Feb 2022 00:36:30 -0300
Subject: [PATCH] Fixed built binaries startup problems for new Python version

---
 BUILDING.md      |   4 +++-
 cddagl/VERSION   |   2 +-
 requirements.txt | Bin 92 -> 258 bytes
 setup.py         |  11 +++++++----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/BUILDING.md b/BUILDING.md
index 8850f45f..4613c165 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -8,8 +8,10 @@ CDDA Game Launcher is developed using Python. In order to run or build the launc
 
 The full list of requirements is available in [requirements.txt](requirements.txt). Most of these requirements are Python packages that can be installed using [pip](https://en.wikipedia.org/wiki/Pip_%28package_manager%29). Unfortunately, some of these requirements need build tools which are not easy to use nor easy to install on Windows. Here are those special requirements:
 
-* lxml
 * pylzma
+* Microsoft C++ Build Tools
+* Windows 10 SDK
+* Inno Setup
 
 Compiled binaries for lxml and pylzma can be found on [Christoph Gohlke's Unofficial Windows Binaries](http://www.lfd.uci.edu/~gohlke/pythonlibs/). If you are using Python >= 3.5, scandir should already be included. If you are using Python <= 3.4, you can also find compiled binaries for scandir on that website.
 
diff --git a/cddagl/VERSION b/cddagl/VERSION
index ce6a70b9..2eda823f 100644
--- a/cddagl/VERSION
+++ b/cddagl/VERSION
@@ -1 +1 @@
-1.6.0
\ No newline at end of file
+1.6.1
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index d406101caa7f32dcaaec97a8564da78d21382d6f..9611f1e418dd18670cb18bf322eac593df6c57f9 100644
GIT binary patch
literal 258
zcmZ9G%MQUn6o$XG#G}{{55U?&V_~gsm0nDyZHkA-e~zleYUaOvGq2}{gcS=4_GBC>
zxie<OPL8RRixP9zN)j68e`-RlPUu&W$d%4j6eV&}YAj<c<)pe7u7Zf2(u!7GYt`<T
qzRNi{sbcExR=Y^fLubo*AOtNxlv&^WalcL`expC$hE*Ysz4Hdd#w*1D

literal 92
zcmWm4F$#b%3;@7Akk1G{KxYSwgLBlVp=p(<l=k)NcyNR38l86z8G)3;Br`&v-Cch+
nI}(DCt)h(3(!`2z<|OgCMK6Rv=9eSI3SngPg`W-KFIob<X6zmQ

diff --git a/setup.py b/setup.py
index 83c54c85..13341bc6 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,9 @@ def run_other_command(self, command_name, **kwargs):
 def include_requirements(target_path):
     # Install packages from requirements.txt file into build dir
     requirements_path = Path('requirements.txt')
+    subprocess.run([
+        'python', '-m', 'pip', 'install', '--upgrade', "pip"
+    ])
     subprocess.run([
         'python', '-m', 'pip', 'install', '-r', requirements_path,
         '--target', target_path
@@ -116,8 +119,8 @@ def run(self):
         download_path.mkdir(parents=True, exist_ok=True)
 
         # Download Python embeddable package
-        python_embed_url = 'https://www.python.org/ftp/python/3.9.0/python-3.9.0-embed-amd64.zip'
-        python_embed_name = 'python-3.9.0-embed-amd64.zip'
+        python_embed_url = 'https://www.python.org/ftp/python/3.9.7/python-3.9.7-embed-amd64.zip'
+        python_embed_name = 'python-3.9.7-embed-amd64.zip'
 
         python_embed_archive = download_path.joinpath(python_embed_name)
         try:
@@ -171,7 +174,7 @@ def run(self):
 
         # Let's find and add unrar if available
         try:
-            unrar_path = r'.\external-deps\unrar-command-line-tool\UnRAR.exe'
+            unrar_path = r'.\third-party\unrar-command-line-tool\UnRAR.exe'
             shutil.copy(unrar_path, archive_dir_path)
         except CalledProcessError:
             log("'unrar.exe' couldn't be found.")
@@ -310,7 +313,7 @@ class CreateInnoSetupInstaller(ExtendedCommand):
     ]
 
     def initialize_options(self):
-        self.compiler = r'.\external-deps\inno-setup\6.2.0\Compil32.exe'
+        self.compiler = r'.\third-party\inno-setup\6.2.0\Compil32.exe'
 
     def finalize_options(self):
         if not pathlib.Path(self.compiler).exists():