Mercurial > hg
changeset 21560:a9e1ab2da30d
packaging: move output directory from build/ to packages/
setuptools owns build/ and dist/ and we want to have our own scheme
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 27 May 2014 11:52:39 -0700 |
| parents | 9a9de26ad99a |
| children | f1bcc33a5c52 |
| files | .hgignore Makefile |
| diffstat | 2 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Tue May 27 11:39:22 2014 -0700 +++ b/.hgignore Tue May 27 11:52:39 2014 -0700 @@ -26,6 +26,7 @@ build contrib/hgsh/hgsh dist +packages doc/common.txt doc/*.[0-9] doc/*.[0-9].txt
--- a/Makefile Tue May 27 11:39:22 2014 -0700 +++ b/Makefile Tue May 27 11:52:39 2014 -0700 @@ -138,29 +138,29 @@ @which -s bdist_mpkg || \ (echo "Missing bdist_mpkg (easy_install bdist_mpkg)"; false) bdist_mpkg setup.py - mkdir -p build/osx + mkdir -p packages/osx rm -rf dist/mercurial-*.mpkg - mv dist/mercurial*macosx*.zip build/osx + mv dist/mercurial*macosx*.zip packages/osx fedora: - mkdir -p build/fedora + mkdir -p packages/fedora echo y | contrib/buildrpm - cp rpmbuild/RPMS/*/* build/fedora - cp rpmbuild/SRPMS/* build/fedora + cp rpmbuild/RPMS/*/* packages/fedora + cp rpmbuild/SRPMS/* packages/fedora rm -rf rpmbuild docker-fedora: - mkdir -p build/fedora + mkdir -p packages/fedora contrib/dockerrpm fedora centos6: - mkdir -p build/centos6 + mkdir -p packages/centos6 echo y | contrib/buildrpm - cp rpmbuild/RPMS/*/* build/centos6 - cp rpmbuild/SRPMS/* build/centos6 + cp rpmbuild/RPMS/*/* packages/centos6 + cp rpmbuild/SRPMS/* packages/centos6 docker-centos6: - mkdir -p build/centos6 + mkdir -p packages/centos6 contrib/dockerrpm centos6 .PHONY: help all local build doc clean install install-bin install-doc \