Part of
bug 679513 - actually build test pilot and distribute it. r=bienvenu,gozer a=Standard8
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -116,16 +116,17 @@ ENABLE_TESTS = @ENABLE_TESTS@
IBMBIDI = @IBMBIDI@
MOZ_UNIVERSALCHARDET = @MOZ_UNIVERSALCHARDET@
ACCESSIBILITY = @ACCESSIBILITY@
MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@
MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@
MOZ_INSTALLER = @MOZ_INSTALLER@
MOZ_UPDATER = @MOZ_UPDATER@
+MOZ_UPDATE_CHANNEL = @MOZ_UPDATE_CHANNEL@
MOZ_UPDATE_PACKAGING = @MOZ_UPDATE_PACKAGING@
MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
MOZ_DISABLE_VISTA_SDK_REQUIREMENTS = @MOZ_DISABLE_VISTA_SDK_REQUIREMENTS@
MOZ_SPELLCHECK = @MOZ_SPELLCHECK@
MOZ_PROFILELOCKING = @MOZ_PROFILELOCKING@
MOZ_FEEDS = @MOZ_FEEDS@
MOZ_PLACES = @MOZ_PLACES@
MOZ_PLACES_BOOKMARKS = @MOZ_PLACES_BOOKMARKS@
--- a/configure.in
+++ b/configure.in
@@ -5505,16 +5505,17 @@ MOZ_ARG_ENABLE_STRING([update-channel],
[ --enable-update-channel=CHANNEL
Select application update channel (default=default)],
MOZ_UPDATE_CHANNEL=`echo $enableval | tr A-Z a-z`)
if test -z "$MOZ_UPDATE_CHANNEL"; then
MOZ_UPDATE_CHANNEL=default
fi
AC_DEFINE_UNQUOTED(MOZ_UPDATE_CHANNEL, $MOZ_UPDATE_CHANNEL)
+AC_SUBST(MOZ_UPDATE_CHANNEL)
# tools/update-packaging is not checked out by default.
MOZ_ARG_ENABLE_BOOL(update-packaging,
[ --enable-update-packaging
Enable tools/update-packaging],
MOZ_UPDATE_PACKAGING=1,
MOZ_UPDATE_PACKAGING= )
AC_SUBST(MOZ_UPDATE_PACKAGING)
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -84,16 +84,20 @@ 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
@@ -186,16 +186,19 @@
@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
@@ -150,16 +150,26 @@ 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/
#ifdef MOZ_WIDGET_GTK2
icons/mozicon128.png
icons/mozicon16.xpm
icons/mozicon50.xpm