Mercurial > hg-stable
changeset 32505:a38ed42cd23c
osx: include chg by default
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 20 Mar 2017 17:50:31 -0400 |
| parents | 014fa1ad5076 |
| children | 7a7c3369ee26 |
| files | Makefile tests/test-mac-packages.t |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Fri May 26 20:03:05 2017 -0400 +++ b/Makefile Mon Mar 20 17:50:31 2017 -0400 @@ -176,6 +176,14 @@ # location of our own. install -d build/mercurial/usr/local/hg/contrib/ install -m 0644 contrib/bash_completion build/mercurial/usr/local/hg/contrib/hg-completion.bash + make -C contrib/chg \ + HGPATH=/usr/local/bin/hg \ + PYTHON=/usr/bin/python2.7 \ + HG=/usr/local/bin/hg \ + HGEXTDIR=/Library/Python/2.7/site-packages/hgext \ + DESTDIR=../../build/mercurial \ + PREFIX=/usr/local \ + clean install mkdir -p $${OUTPUTDIR:-dist} HGVER=$$((cat build/mercurial/Library/Python/2.7/site-packages/mercurial/__version__.py; echo 'print(version)') | python) && \ OSXVER=$$(sw_vers -productVersion | cut -d. -f1,2) && \
--- a/tests/test-mac-packages.t Fri May 26 20:03:05 2017 -0400 +++ b/tests/test-mac-packages.t Mon Mar 20 17:50:31 2017 -0400 @@ -35,6 +35,7 @@ ./usr/local/hg/contrib/hg-completion.bash 100644 0/0 $ egrep 'man[15]' boms.txt | cut -d ' ' -f 1,2,3 ./usr/local/share/man/man1 40755 0/0 + ./usr/local/share/man/man1/chg.1 100644 0/0 ./usr/local/share/man/man1/hg.1 100644 0/0 ./usr/local/share/man/man5 40755 0/0 ./usr/local/share/man/man5/hgignore.5 100644 0/0 @@ -48,7 +49,8 @@ ./Library/Python/2.7/site-packages/mercurial/localrepo.py 100644 0/0 ./Library/Python/2.7/site-packages/mercurial/localrepo.pyc 100644 0/0 ./Library/Python/2.7/site-packages/mercurial/localrepo.pyo 100644 0/0 - $ grep 'bin/hg ' boms.txt | cut -d ' ' -f 1,2,3 + $ egrep 'bin/' boms.txt | cut -d ' ' -f 1,2,3 + ./usr/local/bin/chg 100755 0/0 ./usr/local/bin/hg 100755 0/0 Make sure the built binary uses the system Python interpreter