comparison Makefile @ 33595:c5607b65fcb8 stable

osx: wire up genosxversion script The only version strings that are changed are the ones baked into the .pkg - hg's self-reported version string doesn't change, so users will still see our mostly-pip-compatible version strings. For reference, the part of our versioning setup that's not PEP440 compatible is the RC releases - those should be .rc0 insted of -rc. It's too late to change that for the 4.3 cycle, so I'll worry about fixing that during the 4.4 cycle.
author Augie Fackler <augie@google.com>
date Mon, 24 Jul 2017 20:39:26 -0400
parents 91ae09010950
children af09413deb72
comparison
equal deleted inserted replaced
33594:283a7da602ae 33595:c5607b65fcb8
12 PYFILES:=$(shell find mercurial hgext doc -name '*.py') 12 PYFILES:=$(shell find mercurial hgext doc -name '*.py')
13 DOCFILES=mercurial/help/*.txt 13 DOCFILES=mercurial/help/*.txt
14 export LANGUAGE=C 14 export LANGUAGE=C
15 export LC_ALL=C 15 export LC_ALL=C
16 TESTFLAGS ?= $(shell echo $$HGTESTFLAGS) 16 TESTFLAGS ?= $(shell echo $$HGTESTFLAGS)
17 OSXVERSIONFLAGS ?= $(shell echo $$OSXVERSIONFLAGS)
17 18
18 # Set this to e.g. "mingw32" to use a non-default compiler. 19 # Set this to e.g. "mingw32" to use a non-default compiler.
19 COMPILER= 20 COMPILER=
20 21
21 COMPILERFLAG_tmp_ = 22 COMPILERFLAG_tmp_ =
183 HGEXTDIR=/Library/Python/2.7/site-packages/hgext \ 184 HGEXTDIR=/Library/Python/2.7/site-packages/hgext \
184 DESTDIR=../../build/mercurial \ 185 DESTDIR=../../build/mercurial \
185 PREFIX=/usr/local \ 186 PREFIX=/usr/local \
186 clean install 187 clean install
187 mkdir -p $${OUTPUTDIR:-dist} 188 mkdir -p $${OUTPUTDIR:-dist}
188 HGVER=$$((cat build/mercurial/Library/Python/2.7/site-packages/mercurial/__version__.py; echo 'print(version)') | python) && \ 189 HGVER=$(shell python contrib/genosxversion.py $(OSXVERSIONFLAGS) build/mercurial/Library/Python/2.7/site-packages/mercurial/__version__.py ) && \
189 OSXVER=$$(sw_vers -productVersion | cut -d. -f1,2) && \ 190 OSXVER=$$(sw_vers -productVersion | cut -d. -f1,2) && \
190 pkgbuild --filter \\.DS_Store --root build/mercurial/ \ 191 pkgbuild --filter \\.DS_Store --root build/mercurial/ \
191 --identifier org.mercurial-scm.mercurial \ 192 --identifier org.mercurial-scm.mercurial \
192 --version "$${HGVER}" \ 193 --version "$${HGVER}" \
193 build/mercurial.pkg && \ 194 build/mercurial.pkg && \