Fix Makefile and make sure it's tested

Fixes #3492
This commit is contained in:
Florian Bruhin 2018-01-15 22:42:12 +01:00
parent fbbb9ae940
commit d06f07af80
3 changed files with 18 additions and 1 deletions

View File

@ -15,6 +15,14 @@ breaking changes (such as renamed commands) can happen in minor releases.
// `Fixed` for any bug fixes.
// `Security` to invite users to upgrade in case of vulnerabilities.
v1.1.1 (unreleased)
-------------------
Fixed
~~~~~
- The Makefile now actually works.
v1.1.0
------

View File

@ -21,5 +21,5 @@ install: doc/qutebrowser.1.html
$(wildcard misc/userscripts/*)
install -Dm755 -t "$(DESTDIR)/usr/share/qutebrowser/scripts/" \
$(filter-out scripts/__init__.py scripts/__pycache__ scripts/dev \
scripts/testbrowser_cpp scripts/asciidoc2html.py scripts/setupcommon.py \
scripts/testbrowser scripts/asciidoc2html.py scripts/setupcommon.py \
scripts/link_pyqt.py,$(wildcard scripts/*))

View File

@ -328,6 +328,14 @@ def build_sdist():
return artifacts
def test_makefile():
"""Make sure the Makefile works correctly."""
utils.print_title("Testing makefile")
with tempfile.TemporaryDirectory() as tmpdir:
subprocess.run(['make', '-f', 'misc/Makefile',
'DESTDIR={}'.format(tmpdir), 'install'], check=True)
def read_github_token():
"""Read the GitHub API token from disk."""
token_file = os.path.join(os.path.expanduser('~'), '.gh_token')
@ -403,6 +411,7 @@ def main():
elif sys.platform == 'darwin':
artifacts = build_mac()
else:
test_makefile()
artifacts = build_sdist()
upload_to_pypi = True