Bug 823989: Don't build testpilot on aurora update channel, a=akeybl DONTBUILD
authorL. David Baron <dbaron@dbaron.org>
Sat, 19 Jan 2013 16:59:25 -0800
changeset 119386 4919e8091542aa7ea4204d833ddd4b735c45ab03
parent 119385 01c964705be7d1481dde33d2c4dfbe913917241c
child 119389 91b9995f9ac7aaf019e0fb8e21fa45bec11d2d82
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersakeybl
bugs823989
milestone21.0a1
Bug 823989: Don't build testpilot on aurora update channel, a=akeybl DONTBUILD
browser/app/profile/extensions/Makefile.in
browser/installer/Makefile.in
--- a/browser/app/profile/extensions/Makefile.in
+++ b/browser/app/profile/extensions/Makefile.in
@@ -13,17 +13,17 @@ DISTROEXT = $(call core_abspath,$(FINAL_
 include $(DEPTH)/config/autoconf.mk
 
 DIRS = \
   {972ce4c6-7e08-4474-a285-3208198ce6fd} \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 
-ifneq (,$(filter aurora beta,$(MOZ_UPDATE_CHANNEL)))
+ifneq (,$(filter beta,$(MOZ_UPDATE_CHANNEL)))
 EXTENSIONS = \
   testpilot@labs.mozilla.com \
   $(NULL)
 
 all_xpis = $(foreach dir,$(EXTENSIONS),$(DISTROEXT)/$(dir).xpi)
 libs:: $(all_xpis)
 GARBAGE += $(all_xpis)
 
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -75,17 +75,17 @@ endif
 include $(topsrcdir)/ipc/app/defs.mk
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
 # Set MSVC dlls version to package, if any.
 ifdef WIN32_REDIST_DIR
 DEFINES += -DMOZ_MSVC_REDIST=$(_MSC_VER)
 endif
 
-ifneq (,$(filter aurora beta,$(MOZ_UPDATE_CHANNEL)))
+ifneq (,$(filter beta,$(MOZ_UPDATE_CHANNEL)))
 DEFINES += -DSHIP_FEEDBACK=1
 endif
 
 ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
 DEFINES += -DMOZ_SHARED_MOZGLUE=1
 endif
 
 ifdef MOZ_JSDEBUGGER