# 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 \
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel