Bug 743560 - Include xpcshell and run-mozilla.sh in the SDK package but not the binary package, r=Mossop
authorBenjamin Smedberg <benjamin@smedbergs.us>
Fri, 13 Apr 2012 13:27:24 -0400
changeset 91610 3f872c75a08c3a9fe4b78c7fc29e771acc0aeb7c
parent 91609 a3f9ee8bb74519377646e8b3b174d75161beca11
child 91611 a45e6af2cc324324d3bd6f0aac63f85da027e90c
push id8298
push userbsmedberg@mozilla.com
push dateFri, 13 Apr 2012 17:31:24 +0000
treeherdermozilla-inbound@3f872c75a08c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMossop
bugs743560
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 743560 - Include xpcshell and run-mozilla.sh in the SDK package but not the binary package, r=Mossop
xulrunner/installer/Makefile.in
--- a/xulrunner/installer/Makefile.in
+++ b/xulrunner/installer/Makefile.in
@@ -43,19 +43,25 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 NO_PKG_FILES = \
 	xulrunner-config \
 	regchrome* \
 	regxpcom* \
+	$(NULL)
+
+# We want xpcshell and run-mozilla in the SDK but not in the binary package.
+ifndef STAGE_SDK
+NO_PKG_FILES += \
 	xpcshell* \
 	run-mozilla* \
 	$(NULL)
+endif
 
 # If we're on mac, we don't want an end-user-facing DMG, we want a .tar.bz2
 # which developers then use to package their application.
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOZ_PKG_FORMAT = BZ2
 _APPNAME = XUL.framework
 _BINPATH = /$(_APPNAME)/Versions/Current