Bug 748610. (Av2) Package SeaMonkey debugQA extension on Alpha (or Nightly) builds only. r+a=Callek
authorSerge Gautherie <sgautherie.bz@free.fr>
Tue, 01 May 2012 19:11:47 +0200
changeset 12208 6c022d9e7c653ae9799bf293250f07f07fcf0101
parent 12207 ba9ff38469ba8600e44dce2afbad34d5ae06b0c8
child 12209 950c8af114316eea43856db884f4b14dd11aa8bf
push id37
push userbienvenu@nventure.com
push dateFri, 01 Jun 2012 00:31:42 +0000
treeherdertry-comm-central@e6fe2bb93d63 [default view] [failures only]
bugs748610
Bug 748610. (Av2) Package SeaMonkey debugQA extension on Alpha (or Nightly) builds only. r+a=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
@@ -807,15 +807,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