diff options
| author | Florian Bruhin <git@the-compiler.org> | 2018-01-15 22:42:12 +0100 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2018-01-15 22:42:53 +0100 |
| commit | de147b5a9327cc1d856900d493bc9e093b9d42f1 (patch) | |
| tree | 3b7ff918497d3c6fc4a88826fa3ea4f3d58142ef | |
| parent | fbbb9ae9408d2e4bdabd0b90e3275af387c383d8 (diff) | |
| download | qutebrowser-de147b5a9327cc1d856900d493bc9e093b9d42f1.tar.gz qutebrowser-de147b5a9327cc1d856900d493bc9e093b9d42f1.zip | |
Fix Makefile and make sure it's tested
Fixes #3492
(cherry picked from commit d06f07af80f1858d960d4ea6edd71546da280d93)
| -rw-r--r-- | doc/changelog.asciidoc | 8 | ||||
| -rw-r--r-- | misc/Makefile | 2 | ||||
| -rwxr-xr-x | scripts/dev/build_release.py | 9 |
3 files changed, 18 insertions, 1 deletions
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index de5697679..adcf8fdaa 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -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 ------ diff --git a/misc/Makefile b/misc/Makefile index fe97eb6bf..714223d10 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -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/*)) diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py index ce0ea2b8e..aa4046adc 100755 --- a/scripts/dev/build_release.py +++ b/scripts/dev/build_release.py @@ -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 |