This is an archive of the discontinued Mercurial Phabricator instance.

Differential D224

build: Delaying version computation on macOS builds.
ClosedPublic

Authored by rdamazio on Aug 3 2017, 11:13 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG8626b44516c1: build: delay version computation on macOS builds
rHGd602646ba5b6: build: delay version computation on macOS builds.
rHGf22513c3717d: build: Delaying version computation on macOS builds.
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,
at which point the version file it's looking for is sure to exist and be
up-to-date.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

rdamazio created this revision.Aug 3 2017, 11:13 PM
martinvonz added a subscriber: martinvonz.Aug 3 2017, 11:56 PM

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.

rdamazio edited the summary of this revision. (Show Details)Aug 4 2017, 12:04 AM
rdamazio retitled this revision from build: Allow Makefile to be recursively invoked on MacOS X to build: Delaying version computation on macOS builds..
rdamazio added a comment.Aug 4 2017, 12:05 AM

Updated description

martinvonz accepted this revision.Aug 4 2017, 1:07 PM
This revision is now accepted and ready to land.Aug 4 2017, 1:07 PM
Closed by commit rHGf22513c3717d: build: Delaying version computation on macOS builds. (authored by rdamazio). · Explain WhyAug 4 2017, 1:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
MMakefile (2 lines)

Diff 547

Makefile

HGPATH=/usr/local/bin/hg \ HGPATH=/usr/local/bin/hg \
PYTHON=/usr/bin/python2.7 \ PYTHON=/usr/bin/python2.7 \
HG=/usr/local/bin/hg \ HG=/usr/local/bin/hg \
HGEXTDIR=/Library/Python/2.7/site-packages/hgext \ HGEXTDIR=/Library/Python/2.7/site-packages/hgext \
DESTDIR=../../build/mercurial \ DESTDIR=../../build/mercurial \
PREFIX=/usr/local \ PREFIX=/usr/local \
clean install clean install
mkdir -p $${OUTPUTDIR:-dist} 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) && \ OSXVER=$$(sw_vers -productVersion | cut -d. -f1,2) && \
pkgbuild --filter \\.DS_Store --root build/mercurial/ \ pkgbuild --filter \\.DS_Store --root build/mercurial/ \
--identifier org.mercurial-scm.mercurial \ --identifier org.mercurial-scm.mercurial \
--version "$${HGVER}" \ --version "$${HGVER}" \
build/mercurial.pkg && \ build/mercurial.pkg && \
productbuild --distribution contrib/macosx/distribution.xml \ productbuild --distribution contrib/macosx/distribution.xml \
--package-path build/ \ --package-path build/ \
--version "$${HGVER}" \ --version "$${HGVER}" \