Bug 748610. (Av2) Package SeaMonkey debugQA extension on Alpha (or Nightly) builds only. r=Callek.
authorSerge Gautherie <sgautherie.bz@free.fr>
Tue, 01 May 2012 19:11:47 +0200
changeset 10043 4df6a3ad8bc6a210b3dfff8894f682b2d98a44dd
parent 10042 d3a9bb8b85f9a638cea391482e16a1f8483f5cde
child 10044 cd7bbb603424503863fa97ef49e3ec5baef6dbbc
push idunknown
push userunknown
push dateunknown
reviewersCallek
bugs748610
Bug 748610. (Av2) Package SeaMonkey debugQA extension on Alpha (or Nightly) builds only. r=Callek.
suite/Makefile.in
suite/installer/Makefile.in
suite/installer/package-manifest.in
--- a/suite/Makefile.in
+++ b/suite/Makefile.in
@@ -38,18 +38,19 @@
 
 DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-# check if this is an alpha or nightly
-# replace "pre" with "a" in the version and then look if "a" matches
+# Check whether this build is an alpha or nightly:
+# replace "pre" with "a" in the version then look if "a" matches.
+# This should match /suite/installer/Makefile.in.
 ifneq (,$(findstring a,$(MOZ_APP_VERSION:pre=a)))
 PARALLEL_DIRS = debugQA
 endif
 
 PARALLEL_DIRS	+= \
 		browser \
 		common \
 		feeds/public \
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -84,16 +84,23 @@ endif
 ifdef MOZ_ENABLE_GNOME_COMPONENT
 DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
 endif
 
 ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DMOZ_GTK2=1
 endif
 
+# Check whether this build is an alpha or nightly:
+# replace "pre" with "a" in the version then look if "a" matches.
+# This should match /suite/Makefile.in.
+ifneq (,$(findstring a,$(MOZ_APP_VERSION:pre=a)))
+DEFINES += -DMOZ_PACKAGE_DEBUGQA=1
+endif
+
 ifdef NSS_DISABLE_DBM
 DEFINES += -DNSS_DISABLE_DBM=1
 endif
 
 ifdef _MSC_VER
 DEFINES += -D_MSC_VER=$(_MSC_VER)
 endif
 
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -821,15 +821,17 @@ bin/libfreebl_32int64_3.so
 @BINPATH@/extensions/inspector@mozilla.org/platform/OS2/chrome/icons/default/winInspectorMain.ico
 #endif
 @BINPATH@/extensions/inspector@mozilla.org/components/components.list
 @BINPATH@/extensions/inspector@mozilla.org/components/inspector-cmdline.js
 @BINPATH@/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
 #endif
 
 [debugqa]
+#ifdef MOZ_PACKAGE_DEBUGQA
 #ifdef MOZ_OMNIJAR
 @BINPATH@/distribution/extensions/debugQA@mozilla.org.xpi
 #else
 @BINPATH@/extensions/debugQA@mozilla.org/install.rdf
 @BINPATH@/extensions/debugQA@mozilla.org/chrome.manifest
 @BINPATH@/extensions/debugQA@mozilla.org/chrome/debugqa@JAREXT@
 #endif
+#endif