From patchwork Fri Aug 11 01:25:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [STABLE] osx: delay version computation on macOS builds From: Kevin Bullock X-Patchwork-Id: 22839 Message-Id: <0d3a872cbb37b7845eac.1502414733@ingalls.local> To: mercurial-devel@mercurial-scm.org Cc: Rodrigo Damazio Date: Thu, 10 Aug 2017 21:25:33 -0400 # HG changeset patch # User Kevin Bullock # Date 1502414702 14400 # Thu Aug 10 21:25:02 2017 -0400 # Branch stable # Node ID 0d3a872cbb37b7845eacdcaa578c0048e3f4873f # Parent a3ce07e2dde5737644dd719806b1e52fb1cc1004 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. diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -186,7 +186,7 @@ osx: PREFIX=/usr/local \ clean install mkdir -p $${OUTPUTDIR:-dist} - HGVER=$(shell python contrib/genosxversion.py $(OSXVERSIONFLAGS) build/mercurial/Library/Python/2.7/site-packages/mercurial/__version__.py ) && \ + HGVER=$$(python contrib/genosxversion.py $(OSXVERSIONFLAGS) build/mercurial/Library/Python/2.7/site-packages/mercurial/__version__.py) && \ OSXVER=$$(sw_vers -productVersion | cut -d. -f1,2) && \ pkgbuild --filter \\.DS_Store --root build/mercurial/ \ --identifier org.mercurial-scm.mercurial \