From 5b6809227711e2f6feb056118b0384fd6940d4cb Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 5 Jan 2016 07:27:58 +0100 Subject: [PATCH] Download pdfjs in build_release.py. freeze.py now optionally includes pdfjs if it's present. This means we don't need to download it every time to run frozen tests, but we can include it in build_release.py when building a windows package. --- scripts/dev/build_release.py | 4 ++++ scripts/dev/freeze.py | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py index b4bc831b9..a90a285a6 100755 --- a/scripts/dev/build_release.py +++ b/scripts/dev/build_release.py @@ -35,6 +35,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir, import qutebrowser from scripts import utils +from scripts.dev import update_3rdparty def call_script(name, *args, python=sys.executable): @@ -89,6 +90,9 @@ def smoke_test(executable): def build_windows(): """Build windows executables/setups.""" + utils.print_title("Updating 3rdparty content") + update_3rdparty.main() + utils.print_title("Building Windows binaries") parts = str(sys.version_info.major), str(sys.version_info.minor) ver = ''.join(parts) diff --git a/scripts/dev/freeze.py b/scripts/dev/freeze.py index a893af789..00011afc7 100755 --- a/scripts/dev/freeze.py +++ b/scripts/dev/freeze.py @@ -65,9 +65,13 @@ def get_build_exe_options(skip_html=False): ('qutebrowser/git-commit-id', 'git-commit-id'), ('qutebrowser/utils/testfile', 'utils/testfile'), ('qutebrowser/html', 'html'), - ('qutebrowser/3rdparty/pdfjs', '3rdparty/pdfjs'), ] + if os.path.exists(os.path.join('qutebrowser', '3rdparty', 'pdfjs')): + include_files.append(('qutebrowser/3rdparty/pdfjs', '3rdparty/pdfjs')) + else: + print("Warning: excluding pdfjs as it's not present!") + if not skip_html: include_files += [ ('qutebrowser/html/doc', 'html/doc'),