[Python-checkins] Add option to pass vcs info into Mac installer build (#2832)
Ned Deily
webhook-mailer at python.org
Sun Jul 23 18:09:17 EDT 2017
https://github.com/python/cpython/commit/8b99e2da1ffa8112ee0ba7600a8823da61e132bb
commit: 8b99e2da1ffa8112ee0ba7600a8823da61e132bb
branch: 3.5
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2017-07-23T18:09:14-04:00
summary:
Add option to pass vcs info into Mac installer build (#2832)
(cherry picked from commit 4da52247d6ae53b8384f9753430e8cd2672ff97d)
files:
M Mac/BuildScript/build-installer.py
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index fb112741e05..d7d40110a66 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -1168,8 +1168,25 @@ def buildPython():
shellQuote(WORKDIR)[1:-1],
shellQuote(WORKDIR)[1:-1]))
- print("Running make")
- runCommand("make")
+ # Look for environment value BUILDINSTALLER_BUILDPYTHON_MAKE_EXTRAS
+ # and, if defined, append its value to the make command. This allows
+ # us to pass in version control tags, like GITTAG, to a build from a
+ # tarball rather than from a vcs checkout, thus eliminating the need
+ # to have a working copy of the vcs program on the build machine.
+ #
+ # A typical use might be:
+ # export BUILDINSTALLER_BUILDPYTHON_MAKE_EXTRAS=" \
+ # GITVERSION='echo 123456789a' \
+ # GITTAG='echo v3.6.0' \
+ # GITBRANCH='echo 3.6'"
+
+ make_extras = os.getenv("BUILDINSTALLER_BUILDPYTHON_MAKE_EXTRAS")
+ if make_extras:
+ make_cmd = "make " + make_extras
+ else:
+ make_cmd = "make"
+ print("Running " + make_cmd)
+ runCommand(make_cmd)
print("Running make install")
runCommand("make install DESTDIR=%s"%(
More information about the Python-checkins
mailing list