Show More
@@ -164,6 +164,9 b' osx:' | |||||
164 | --root=build/mercurial/ --prefix=/usr/local/ \ |
|
164 | --root=build/mercurial/ --prefix=/usr/local/ \ | |
165 | --install-lib=/Library/Python/2.7/site-packages/ |
|
165 | --install-lib=/Library/Python/2.7/site-packages/ | |
166 | make -C doc all install DESTDIR="$(PWD)/build/mercurial/" |
|
166 | make -C doc all install DESTDIR="$(PWD)/build/mercurial/" | |
|
167 | # Place a bogon .DS_Store file in the target dir so we can be | |||
|
168 | # sure it doesn't get included in the final package. | |||
|
169 | touch build/mercurial/.DS_Store | |||
167 | # install zsh completions - this location appears to be |
|
170 | # install zsh completions - this location appears to be | |
168 | # searched by default as of macOS Sierra. |
|
171 | # searched by default as of macOS Sierra. | |
169 | install -d build/mercurial/usr/local/share/zsh/site-functions/ |
|
172 | install -d build/mercurial/usr/local/share/zsh/site-functions/ | |
@@ -177,7 +180,7 b' osx:' | |||||
177 | mkdir -p $${OUTPUTDIR:-dist} |
|
180 | mkdir -p $${OUTPUTDIR:-dist} | |
178 | HGVER=$$((cat build/mercurial/Library/Python/2.7/site-packages/mercurial/__version__.py; echo 'print(version)') | python) && \ |
|
181 | HGVER=$$((cat build/mercurial/Library/Python/2.7/site-packages/mercurial/__version__.py; echo 'print(version)') | python) && \ | |
179 | OSXVER=$$(sw_vers -productVersion | cut -d. -f1,2) && \ |
|
182 | OSXVER=$$(sw_vers -productVersion | cut -d. -f1,2) && \ | |
180 | pkgbuild --root build/mercurial/ \ |
|
183 | pkgbuild --filter \\.DS_Store --root build/mercurial/ \ | |
181 | --identifier org.mercurial-scm.mercurial \ |
|
184 | --identifier org.mercurial-scm.mercurial \ | |
182 | --version "$${HGVER}" \ |
|
185 | --version "$${HGVER}" \ | |
183 | build/mercurial.pkg && \ |
|
186 | build/mercurial.pkg && \ |
@@ -18,6 +18,11 b'' | |||||
18 | Gather list of all installed files: |
|
18 | Gather list of all installed files: | |
19 | $ lsbom mercurial.pkg/Bom > boms.txt |
|
19 | $ lsbom mercurial.pkg/Bom > boms.txt | |
20 |
|
20 | |||
|
21 | We've had problems with the filter logic in the past. Make sure no | |||
|
22 | .DS_Store files ended up in the final package: | |||
|
23 | $ grep DS_S boms.txt | |||
|
24 | [1] | |||
|
25 | ||||
21 | Spot-check some randomly selected files: |
|
26 | Spot-check some randomly selected files: | |
22 | $ grep bdiff boms.txt | cut -d ' ' -f 1,2,3 |
|
27 | $ grep bdiff boms.txt | cut -d ' ' -f 1,2,3 | |
23 | ./Library/Python/2.7/site-packages/mercurial/bdiff.so 100755 0/0 |
|
28 | ./Library/Python/2.7/site-packages/mercurial/bdiff.so 100755 0/0 |
General Comments 0
You need to be logged in to leave comments.
Login now