Patchwork D224: build: Allow Makefile to be recursively invoked on MacOS X

login
register
mail settings
Submitter phabricator
Date Aug. 4, 2017, 3:13 a.m.
Message ID <differential-rev-PHID-DREV-ioyv7xpseiobcjw53fyo-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/22663/
State Superseded
Headers show

Comments

phabricator - Aug. 4, 2017, 3:13 a.m.
rdamazio created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The way HGVER is evaluated now, it'll be evaluated at the beginning of the
  make execution - with this change, it's evaluated when it gets to that command,
  which will ensure it's always run at the right directory.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D224

AFFECTED FILES
  Makefile

CHANGE DETAILS




To: rdamazio, #hg-reviewers
Cc: mercurial-devel
phabricator - Aug. 4, 2017, 3:56 a.m.
martinvonz added a comment.


  I'd guess it's because it was evaluated before the __version__.py file existed before this change, not dependent on directories. So the fix looks good, but I suspect the commit message should be updated.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D224

To: rdamazio, #hg-reviewers
Cc: martinvonz, mercurial-devel
phabricator - Aug. 4, 2017, 4:05 a.m.
rdamazio added a comment.


  Updated description

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D224

To: rdamazio, #hg-reviewers
Cc: martinvonz, mercurial-devel

Patch

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -186,7 +186,7 @@ 
 	  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=$$(shell 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 \