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 d406101c..9611f1e4 100644 Binary files a/requirements.txt and b/requirements.txt differ 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():