facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-08 14:46:47 +03:00
Code Issues Projects Releases Wiki Activity

osx: explicitly build hg with /usr/bin/python2.7

Browse Source 
This should help avoid creating a package that depends on a custom
Python, as happened when I built a package for 3.8.
This commit is contained in:
Augie Fackler 2016-07-13 10:39:33 -04:00
parent ceba27d835
commit c36830f5df
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -156,7 +156,7 @@ i18n/hg.pot: $(PYFILES) $(DOCFILES) i18n/posplit i18n/hggettext
# Packaging targets
osx:
python setup.py install --optimize=1 \
/usr/bin/python2.7 setup.py install --optimize=1 \
--root=build/mercurial/ --prefix=/usr/local/ \
--install-lib=/Library/Python/2.7/site-packages/
make -C doc all install DESTDIR="$(PWD)/build/mercurial/"

6
tests/test-mac-packages.t
View File

@ -43,5 +43,11 @@ Spot-check some randomly selected files:
$ grep '/hg ' boms.txt | cut -d ' ' -f 1,2,3
./usr/local/bin/hg 100755 0/0
Make sure the built binary uses the system Python interpreter
$ bsdtar xf mercurial.pkg/Payload usr/local/bin
Use a glob to find this to avoid check-code whining about a fixed path.
$ head -n 1 usr/local/b?n/hg
#!/System/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python
Note that we're not currently installing any /etc/mercurial stuff,
including merge-tool configurations.