Show More
@@ -156,7 +156,7 b' i18n/hg.pot: $(PYFILES) $(DOCFILES) i18n' | |||||
156 | # Packaging targets |
|
156 | # Packaging targets | |
157 |
|
157 | |||
158 | osx: |
|
158 | osx: | |
159 | python setup.py install --optimize=1 \ |
|
159 | /usr/bin/python2.7 setup.py install --optimize=1 \ | |
160 | --root=build/mercurial/ --prefix=/usr/local/ \ |
|
160 | --root=build/mercurial/ --prefix=/usr/local/ \ | |
161 | --install-lib=/Library/Python/2.7/site-packages/ |
|
161 | --install-lib=/Library/Python/2.7/site-packages/ | |
162 | make -C doc all install DESTDIR="$(PWD)/build/mercurial/" |
|
162 | make -C doc all install DESTDIR="$(PWD)/build/mercurial/" |
@@ -43,5 +43,11 b' Spot-check some randomly selected files:' | |||||
43 | $ grep '/hg ' boms.txt | cut -d ' ' -f 1,2,3 |
|
43 | $ grep '/hg ' boms.txt | cut -d ' ' -f 1,2,3 | |
44 | ./usr/local/bin/hg 100755 0/0 |
|
44 | ./usr/local/bin/hg 100755 0/0 | |
45 |
|
45 | |||
|
46 | Make sure the built binary uses the system Python interpreter | |||
|
47 | $ bsdtar xf mercurial.pkg/Payload usr/local/bin | |||
|
48 | Use a glob to find this to avoid check-code whining about a fixed path. | |||
|
49 | $ head -n 1 usr/local/b?n/hg | |||
|
50 | #!/System/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python | |||
|
51 | ||||
46 | Note that we're not currently installing any /etc/mercurial stuff, |
|
52 | Note that we're not currently installing any /etc/mercurial stuff, | |
47 | including merge-tool configurations. |
|
53 | including merge-tool configurations. |
General Comments 0
You need to be logged in to leave comments.
Login now