osx: don't launch installer after building it with bdist_mpkg stable
authorMads Kiilerich <madski@unity3d.com>
Wed, 21 Jan 2015 05:04:46 +0100
branchstable
changeset 23931 f86060e2b5e18afb67f8c85f370e1206176ecd3e
parent 23930 97393540d47451b40e4138b97d94edecab714170
child 23932 d7a90949fc184dc1068706f45bf88b351f15559d
push id1
push usergszorc@mozilla.com
push dateWed, 18 Mar 2015 16:34:57 +0000
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".
Makefile
--- a/Makefile
+++ b/Makefile
@@ -134,17 +134,17 @@ i18n/hg.pot: $(PYFILES) $(DOCFILES) i18n
 	mv -f $@.tmp $@
 
 # Packaging targets
 
 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
 
 fedora20:
 	mkdir -p packages/fedora20
 	contrib/buildrpm
 	cp rpmbuild/RPMS/*/* packages/fedora20