Patchwork [2,of,3,stable] osx: don't launch installer after building it with bdist_mpkg

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 21, 2015, 4:05 a.m.
Message ID <4107a0722f9fbeb7374b.1421813100@localhost.localdomain>
Download mbox | patch
Permalink /patch/7522/
State Accepted
Commit f86060e2b5e18afb67f8c85f370e1206176ecd3e
Headers show

Comments

Mads Kiilerich - Jan. 21, 2015, 4:05 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1421813086 -3600
#      Wed Jan 21 05:04:46 2015 +0100
# Branch stable
# Node ID 4107a0722f9fbeb7374b4365dadc3b279fccb4a5
# Parent  471f0549d3baa9aa876cd283e6a3f1678a37baee
osx: don't launch installer after building it with bdist_mpkg

bdist_mpkg do for some reason default to use the parameter --show ("Open with
Installer.app after building") if no parameters are specified. We do not like
that.

All the important parameters to bdist_mpkg are already specified in setup.py
and we don't have any to specify in the Makefile.

Instead, specify the parameter '--' which do no harm but will disable the
default opening of the installer. This makes it possible to build packages
"silently".

Patch

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,7 @@  osx:
 	@which bdist_mpkg >/dev/null || \
 	   (echo "Missing bdist_mpkg (easy_install bdist_mpkg)"; false)
 	rm -rf dist/mercurial-*.mpkg
-	bdist_mpkg setup.py
+	bdist_mpkg setup.py --
 	mkdir -p packages/osx
 	N=`cd dist && echo mercurial-*.mpkg | sed 's,\.mpkg$$,,'` && hdiutil create -srcfolder dist/$$N.mpkg/ -scrub -volname "$$N" -ov packages/osx/$$N.dmg
 	rm -rf dist/mercurial-*.mpkg