Mercurial > hg
comparison Makefile @ 33668:8de8f8a91f2d stable
osx: delay version computation on macOS builds
Before this patch, HGVER would be evaluated at the beginning of the make
execution, and would be unset because build/mercurial/ doesn't exist yet
at that point. Now we compute the version after the `make install` run
has completed.
This is backported to stable from 8626b44516c1, but that revision had an
error in the shell invocation syntax.
author | Kevin Bullock <kbullock+mercurial@ringworld.org> |
---|---|
date | Thu, 10 Aug 2017 21:25:02 -0400 |
parents | 92f7dcf9a40b |
children | af20468eb0a4 |
comparison
equal
deleted
inserted
replaced
33663:1814ca418b30 | 33668:8de8f8a91f2d |
---|---|
184 HGEXTDIR=/Library/Python/2.7/site-packages/hgext \ | 184 HGEXTDIR=/Library/Python/2.7/site-packages/hgext \ |
185 DESTDIR=../../build/mercurial \ | 185 DESTDIR=../../build/mercurial \ |
186 PREFIX=/usr/local \ | 186 PREFIX=/usr/local \ |
187 clean install | 187 clean install |
188 mkdir -p $${OUTPUTDIR:-dist} | 188 mkdir -p $${OUTPUTDIR:-dist} |
189 HGVER=$(shell python contrib/genosxversion.py $(OSXVERSIONFLAGS) build/mercurial/Library/Python/2.7/site-packages/mercurial/__version__.py ) && \ | 189 HGVER=$$(python contrib/genosxversion.py $(OSXVERSIONFLAGS) build/mercurial/Library/Python/2.7/site-packages/mercurial/__version__.py) && \ |
190 OSXVER=$$(sw_vers -productVersion | cut -d. -f1,2) && \ | 190 OSXVER=$$(sw_vers -productVersion | cut -d. -f1,2) && \ |
191 pkgbuild --filter \\.DS_Store --root build/mercurial/ \ | 191 pkgbuild --filter \\.DS_Store --root build/mercurial/ \ |
192 --identifier org.mercurial-scm.mercurial \ | 192 --identifier org.mercurial-scm.mercurial \ |
193 --version "$${HGVER}" \ | 193 --version "$${HGVER}" \ |
194 build/mercurial.pkg && \ | 194 build/mercurial.pkg && \ |