Bug 742013 - Test pilot isn't being shipped on all channels. r=bienvenu,a=Standard8
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 03 Apr 2012 21:18:25 +0100
changeset 10696 934cea1f8fcfd25061f2c0b881c25509afd9d846
parent 10695 c1bb6edc45e29958db812c4db37c5387a4635abe
child 10697 f23162a04301c327f7f30854350de2d88180e551
push idunknown
push userunknown
push dateunknown
reviewersbienvenu, Standard8
bugs742013
Bug 742013 - Test pilot isn't being shipped on all channels. r=bienvenu,a=Standard8
mail/installer/Makefile.in
mail/installer/package-manifest.in
mail/installer/removed-files.in
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -84,20 +84,16 @@ endif
 
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
 include $(MOZILLA_SRCDIR)/ipc/app/defs.mk
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
-ifneq (,$(filter nightly aurora beta,$(MOZ_UPDATE_CHANNEL)))
-DEFINES += -DSHIP_FEEDBACK=1
-endif
-
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = package-manifest
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
 	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -192,19 +192,17 @@
 @BINPATH@/chrome/icons/default/msgcomposeWindow.ico
 #elifdef UNIX_BUT_NOT_MAC
 @BINPATH@/chrome/icons/default/*.png
 #endif
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
-#ifdef SHIP_FEEDBACK
 @BINPATH@/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
-#endif
 
 ; Gloda
 @BINPATH@/chrome/gloda@JAREXT@
 @BINPATH@/chrome/gloda.manifest
 @BINPATH@/components/glautocomp.js
 @BINPATH@/components/gloda.manifest
 @BINPATH@/components/jsmimeemitter.js
 
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -154,26 +154,16 @@ defaults/profile/US/
 #endif
 defaults/wallet/VcardSchema.tbl
 defaults/wallet/FieldSchema.tbl
 defaults/wallet/SchemaConcat.tbl
 defaults/wallet/DistinguishedSchema.tbl
 defaults/wallet/SchemaStrings.tbl
 defaults/wallet/PositionalSchema.tbl
 defaults/wallet/StateSchema.tbl
-#ifndef SHIP_FEEDBACK
-# In the average case, this directory is only used by Test Pilot, and will get
-# removed by the updater. In some cases (eg, partner builds), distribution/
-# will have other files and/or directories in it. In these cases, the updater
-# will print a non-fatal error and continue on, because we're not appending
-# '*' to force a recursive removal.
-distribution/
-distribution/extensions/
-distribution/extensions/testpilot@labs.mozilla.com.xpi
-#endif
 greprefs/all.js
 greprefs/security-prefs.js
 greprefs/xpinstall.js
 greprefs/
 hyphenation/
 hyphenation/hyph_af.dic
 hyphenation/hyph_bg.dic
 hyphenation/hyph_ca.dic