Commit 0323fd23 authored by Dave Townsend's avatar Dave Townsend
Browse files

Bug 594858: Package Feedback as a distribution add-on. r=robstrong, a=blocks-betaN

parent 1d9d87db

browser/app/profile/extensions/Makefile.in

+7 −3
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ topsrcdir = @top_srcdir@ 
srcdir		= @srcdir@

VPATH		= @srcdir@



DISTROEXT = $(call core_abspath,$(DIST))/bin/distribution/extensions



include $(DEPTH)/config/autoconf.mk



DIRS = {972ce4c6-7e08-4474-a285-3208198ce6fd}
@@ -51,11 +53,13 @@ EXTENSIONS = \ 
  testpilot@labs.mozilla.com \

  $(NULL)



define _INSTALL_EXTENSIONS

$(PYTHON) $(topsrcdir)/config/nsinstall.py $(wildcard $(srcdir)/$(dir)/*) $(DIST)/bin/extensions/$(dir)

define _INSTALL_EXTENSION

cd $(srcdir)/$(dir) && \

  $(ZIP) -r9XD $(DISTROEXT)/$(dir).xpi *



endef # do not remove the blank line!



libs::

	$(foreach dir,$(EXTENSIONS),$(_INSTALL_EXTENSIONS))

	$(NSINSTALL) -D $(DISTROEXT)

	$(foreach dir,$(EXTENSIONS),$(_INSTALL_EXTENSION))

endif

browser/app/profile/extensions/testpilot@labs.mozilla.com/install.rdf

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
     xmlns:em="http://www.mozilla.org/2004/em-rdf#">

  <Description about="urn:mozilla:install-manifest">

    <em:id>testpilot@labs.mozilla.com</em:id>

    <em:version>1.0.3</em:version>

    <em:version>1.0.4</em:version>

    <em:type>2</em:type>



    <!-- Target Application this extension can install into,

browser/installer/package-manifest.in

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ 
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png

@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png

#if MOZ_UPDATE_CHANNEL == beta

@BINPATH@/extensions/testpilot@labs.mozilla.com/*

@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi

#endif

@BINPATH@/chrome/toolkit@JAREXT@

@BINPATH@/chrome/toolkit.manifest

browser/installer/removed-files.in

+119 −0
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ defaults/profile/extensions/installed-extensions.txt 
defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/

defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf

defaults/profile/search.rdf

#if MOZ_UPDATE_CHANNEL != beta

distribution/extensions/testpilot@labs.mozilla.com.xpi

#endif

extensions/talkback@mozilla.org/

extensions/talkback@mozilla.org/chrome.manifest

extensions/talkback@mozilla.org/components/@DLL_PREFIX@qfaservices@DLL_SUFFIX@
@@ -94,6 +97,122 @@ extensions/talkback@mozilla.org/components/qfaservices.xpt 
extensions/talkback@mozilla.org/install.rdf

extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}/

extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}/install.rdf

extensions/testpilot@labs.mozilla.com/chrome.manifest

extensions/testpilot@labs.mozilla.com/components/TestPilot.js

extensions/testpilot@labs.mozilla.com/content/all-studies-window.js

extensions/testpilot@labs.mozilla.com/content/all-studies-window.xul

extensions/testpilot@labs.mozilla.com/content/browser.css

extensions/testpilot@labs.mozilla.com/content/browser.js

extensions/testpilot@labs.mozilla.com/content/debug.html

extensions/testpilot@labs.mozilla.com/content/experiment-page.js

extensions/testpilot@labs.mozilla.com/content/feedback-browser.xul

extensions/testpilot@labs.mozilla.com/content/flot/jquery.colorhelpers.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.colorhelpers.min.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.crosshair.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.crosshair.min.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.image.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.image.min.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.min.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.navigate.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.navigate.min.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.selection.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.selection.min.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.stack.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.stack.min.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.threshold.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.flot.threshold.min.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.js

extensions/testpilot@labs.mozilla.com/content/flot/jquery.min.js

extensions/testpilot@labs.mozilla.com/content/raw-data-dialog.js

extensions/testpilot@labs.mozilla.com/content/raw-data-dialog.xul

extensions/testpilot@labs.mozilla.com/content/screen.css

extensions/testpilot@labs.mozilla.com/content/status-quit.html

extensions/testpilot@labs.mozilla.com/content/status.html

extensions/testpilot@labs.mozilla.com/content/survey-generator.js

extensions/testpilot@labs.mozilla.com/content/take-survey.html

extensions/testpilot@labs.mozilla.com/content/tp-browser.xul

extensions/testpilot@labs.mozilla.com/content/welcome-page.js

extensions/testpilot@labs.mozilla.com/content/welcome.html

extensions/testpilot@labs.mozilla.com/content/window-utils.js

extensions/testpilot@labs.mozilla.com/defaults/preferences/preferences.js

extensions/testpilot@labs.mozilla.com/install.rdf

extensions/testpilot@labs.mozilla.com/instrument/chrome.manifest

extensions/testpilot@labs.mozilla.com/instrument/install.rdf

extensions/testpilot@labs.mozilla.com/instrument/instrument.jsm

extensions/testpilot@labs.mozilla.com/instrument/instrument.xul

extensions/testpilot@labs.mozilla.com/modules/dbutils.js

extensions/testpilot@labs.mozilla.com/modules/experiment_data_store.js

extensions/testpilot@labs.mozilla.com/modules/extension-update.js

extensions/testpilot@labs.mozilla.com/modules/feedback.js

extensions/testpilot@labs.mozilla.com/modules/jar-code-store.js

extensions/testpilot@labs.mozilla.com/modules/lib/cuddlefish.js

extensions/testpilot@labs.mozilla.com/modules/lib/memory.js

extensions/testpilot@labs.mozilla.com/modules/lib/observer-service.js

extensions/testpilot@labs.mozilla.com/modules/lib/plain-text-console.js

extensions/testpilot@labs.mozilla.com/modules/lib/preferences-service.js

extensions/testpilot@labs.mozilla.com/modules/lib/securable-module.js

extensions/testpilot@labs.mozilla.com/modules/lib/timer.js

extensions/testpilot@labs.mozilla.com/modules/lib/traceback.js

extensions/testpilot@labs.mozilla.com/modules/lib/unit-test.js

extensions/testpilot@labs.mozilla.com/modules/lib/unload.js

extensions/testpilot@labs.mozilla.com/modules/lib/url.js

extensions/testpilot@labs.mozilla.com/modules/log4moz.js

extensions/testpilot@labs.mozilla.com/modules/metadata.js

extensions/testpilot@labs.mozilla.com/modules/Observers.js

extensions/testpilot@labs.mozilla.com/modules/remote-experiment-loader.js

extensions/testpilot@labs.mozilla.com/modules/setup.js

extensions/testpilot@labs.mozilla.com/modules/string_sanitizer.js

extensions/testpilot@labs.mozilla.com/modules/tasks.js

extensions/testpilot@labs.mozilla.com/skin/all/badge-default.png

extensions/testpilot@labs.mozilla.com/skin/all/bg.jpg

extensions/testpilot@labs.mozilla.com/skin/all/css/screen-standalone.css

extensions/testpilot@labs.mozilla.com/skin/all/dino_32x32.png

extensions/testpilot@labs.mozilla.com/skin/all/images/bg-status.jpg

extensions/testpilot@labs.mozilla.com/skin/all/images/callout.png

extensions/testpilot@labs.mozilla.com/skin/all/images/callout_continue.png

extensions/testpilot@labs.mozilla.com/skin/all/images/data1.jpg

extensions/testpilot@labs.mozilla.com/skin/all/images/data2.jpg

extensions/testpilot@labs.mozilla.com/skin/all/images/home_comments.png

extensions/testpilot@labs.mozilla.com/skin/all/images/home_computer.png

extensions/testpilot@labs.mozilla.com/skin/all/images/home_continue.png

extensions/testpilot@labs.mozilla.com/skin/all/images/home_quit.png

extensions/testpilot@labs.mozilla.com/skin/all/images/home_results.png

extensions/testpilot@labs.mozilla.com/skin/all/images/home_twitter.png

extensions/testpilot@labs.mozilla.com/skin/all/images/home_upcoming.png

extensions/testpilot@labs.mozilla.com/skin/all/logo.png

extensions/testpilot@labs.mozilla.com/skin/all/mozilla-logo.png

extensions/testpilot@labs.mozilla.com/skin/all/status-completed.png

extensions/testpilot@labs.mozilla.com/skin/all/status-ejected.png

extensions/testpilot@labs.mozilla.com/skin/all/status-missed.png

extensions/testpilot@labs.mozilla.com/skin/all/testpilot_16x16.png

extensions/testpilot@labs.mozilla.com/skin/all/testPilot_200x200.png

extensions/testpilot@labs.mozilla.com/skin/all/testpilot_32x32.png

extensions/testpilot@labs.mozilla.com/skin/all/tp-completedstudies-32x32.png

extensions/testpilot@labs.mozilla.com/skin/all/tp-currentstudies-32x32.png

extensions/testpilot@labs.mozilla.com/skin/all/tp-generic-32x32.png

extensions/testpilot@labs.mozilla.com/skin/all/tp-learned-32x32.png

extensions/testpilot@labs.mozilla.com/skin/all/tp-results-48x48.png

extensions/testpilot@labs.mozilla.com/skin/all/tp-settings-32x32.png

extensions/testpilot@labs.mozilla.com/skin/all/tp-study-48x48.png

extensions/testpilot@labs.mozilla.com/skin/all/tp-submit-48x48.png

extensions/testpilot@labs.mozilla.com/skin/linux/close_button.png

extensions/testpilot@labs.mozilla.com/skin/linux/feedback-frown-16x16.png

extensions/testpilot@labs.mozilla.com/skin/linux/feedback-smile-16x16.png

extensions/testpilot@labs.mozilla.com/skin/linux/feedback.css

extensions/testpilot@labs.mozilla.com/skin/mac/close_button.png

extensions/testpilot@labs.mozilla.com/skin/mac/feedback-frown-16x16.png

extensions/testpilot@labs.mozilla.com/skin/mac/feedback-smile-16x16.png

extensions/testpilot@labs.mozilla.com/skin/mac/feedback.css

extensions/testpilot@labs.mozilla.com/skin/mac/notification-tail-down.png

extensions/testpilot@labs.mozilla.com/skin/mac/notification-tail-up.png

extensions/testpilot@labs.mozilla.com/skin/win/close_button.png

extensions/testpilot@labs.mozilla.com/skin/win/feedback-frown-16x16.png

extensions/testpilot@labs.mozilla.com/skin/win/feedback-smile-16x16.png

extensions/testpilot@labs.mozilla.com/skin/win/feedback.css

extensions/testpilot@labs.mozilla.com/skin/win/notification-tail-down.png

extensions/testpilot@labs.mozilla.com/skin/win/notification-tail-up.png

extensions/testpilot@labs.mozilla.com/tests/test_data_store.js

greprefs/all.js

greprefs/security-prefs.js

greprefs/xpinstall.js

browser/locales/jar.mn

+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ 
% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd

% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties

% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd

#if MOZ_UPDATE_CHANNEL == beta

% locale testpilot @AB_CD@ %locale/feedback/

    locale/feedback/main.dtd                       (%feedback/main.dtd)

    locale/feedback/main.properties                (%feedback/main.properties)
 
#endif