Hook up the Tycho Add-on Manager to the build system

8 files changed, 150 insertions, 14 deletions

diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index 581fa9c505..bf08a9867a 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -302,6 +302,9 @@ def old_configure_options(*options):
     '--enable-mapi',
     '--enable-calendar',
     '--enable-incomplete-external-linkage',
+    
+    # Below are configure flags used by Basilisk
+    '--disable-webextensions',
 )
 @imports(_from='__builtin__', _import='compile')
 @imports(_from='__builtin__', _import='open')
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index 0b415d4487..f24c366e82 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -18,7 +18,6 @@ PREPROCESSED_WEBIDL_FILES = [
 
 WEBIDL_FILES = [
     'AbstractWorker.webidl',
-    'AddonManager.webidl',
     'AnalyserNode.webidl',
     'Animatable.webidl',
     'Animation.webidl',
@@ -592,6 +591,9 @@ WEBIDL_FILES = [
     'XULElement.webidl',
 ]
 
+if CONFIG['MOZ_WEBEXTENSIONS']:
+  WEBIDL_FILES += ['AddonManager.webidl']
+
 if CONFIG['MOZ_AUDIO_CHANNEL_MANAGER']:
     WEBIDL_FILES += [
         'AudioChannelManager.webidl',
@@ -692,7 +694,6 @@ else:
     ]
 
 GENERATED_EVENTS_WEBIDL_FILES = [
-    'AddonEvent.webidl',
     'AnimationPlaybackEvent.webidl',
     'AutocompleteErrorEvent.webidl',
     'BlobEvent.webidl',
@@ -734,6 +735,9 @@ GENERATED_EVENTS_WEBIDL_FILES = [
     'WebGLContextEvent.webidl',
 ]
 
+if CONFIG['MOZ_WEBEXTENSIONS']:
+  GENERATED_EVENTS_WEBIDL_FILES += ['AddonEvent.webidl']
+
 if CONFIG['MOZ_WEBRTC']:
     GENERATED_EVENTS_WEBIDL_FILES += [
         'RTCDataChannelEvent.webidl',
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index e42f0de000..e49e978f51 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -116,6 +116,17 @@
   locale/@AB_CD@/mozapps/extensions/newaddon.dtd                  (%chrome/mozapps/webextensions/newaddon.dtd)
   locale/@AB_CD@/mozapps/extensions/newaddon.properties           (%chrome/mozapps/webextensions/newaddon.properties)
 #endif
+#else
+  locale/@AB_CD@/mozapps/extensions/extensions.dtd                (%chrome/mozapps/extensions/extensions.dtd)
+  locale/@AB_CD@/mozapps/extensions/extensions.properties         (%chrome/mozapps/extensions/extensions.properties)
+  locale/@AB_CD@/mozapps/extensions/blocklist.dtd                 (%chrome/mozapps/extensions/blocklist.dtd)
+  locale/@AB_CD@/mozapps/extensions/about.dtd                     (%chrome/mozapps/extensions/about.dtd)
+  locale/@AB_CD@/mozapps/extensions/selectAddons.dtd              (%chrome/mozapps/extensions/selectAddons.dtd)
+  locale/@AB_CD@/mozapps/extensions/selectAddons.properties       (%chrome/mozapps/extensions/selectAddons.properties)
+  locale/@AB_CD@/mozapps/extensions/update.dtd                    (%chrome/mozapps/extensions/update.dtd)
+  locale/@AB_CD@/mozapps/extensions/update.properties             (%chrome/mozapps/extensions/update.properties)
+  locale/@AB_CD@/mozapps/extensions/newaddon.dtd                  (%chrome/mozapps/extensions/newaddon.dtd)
+  locale/@AB_CD@/mozapps/extensions/newaddon.properties           (%chrome/mozapps/extensions/newaddon.properties)
 #endif
   locale/@AB_CD@/mozapps/handling/handling.dtd                    (%chrome/mozapps/handling/handling.dtd)
   locale/@AB_CD@/mozapps/handling/handling.properties             (%chrome/mozapps/handling/handling.properties)
@@ -133,6 +144,9 @@
 #ifdef MOZ_WEBEXTENSIONS
   locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd           (%chrome/mozapps/webextensions/xpinstallConfirm.dtd)
   locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties    (%chrome/mozapps/webextensions/xpinstallConfirm.properties)
+#else
+  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd           (%chrome/mozapps/extensions/xpinstallConfirm.dtd)
+  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties    (%chrome/mozapps/extensions/xpinstallConfirm.properties)
 #endif
 % locale pluginproblem @AB_CD@ %locale/@AB_CD@/pluginproblem/
   locale/@AB_CD@/pluginproblem/pluginproblem.dtd                  (%chrome/pluginproblem/pluginproblem.dtd)
diff --git a/toolkit/moz.build b/toolkit/moz.build
index 9501938aec..ea7cc390d8 100644
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -23,6 +23,8 @@ DIRS += [
 
 if CONFIG['MOZ_WEBEXTENSIONS']:
     DIRS += ['mozapps/webextensions']
+else:
+    DIRS += ['mozapps/extensions']
 
 if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     DIRS += ['mozapps/update']
diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build
index d0b1fcb386..19f4492107 100644
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -52,6 +52,4 @@ UNIFIED_SOURCES += [
     'AddonPathService.cpp'
 ]
 
-FAIL_ON_WARNINGS = True
-
 FINAL_LIBRARY = 'xul'
diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn
index 0965662bdc..d4997d36ce 100644
--- a/toolkit/themes/linux/mozapps/jar.mn
+++ b/toolkit/themes/linux/mozapps/jar.mn
@@ -22,6 +22,30 @@ toolkit.jar:
   skin/classic/mozapps/extensions/localeGeneric.png        (webextensions/localeGeneric.png)
 * skin/classic/mozapps/extensions/newaddon.css             (webextensions/newaddon.css)
   skin/classic/mozapps/extensions/heart.png                (webextensions/heart.png)
+#else
++ skin/classic/mozapps/extensions/extensions.css           (extensions/extensions.css)
++ skin/classic/mozapps/extensions/category-search.png      (extensions/category-search.png)
++ skin/classic/mozapps/extensions/category-discover.png    (extensions/category-discover.png)
++ skin/classic/mozapps/extensions/category-languages.png   (extensions/localeGeneric.png)
++ skin/classic/mozapps/extensions/category-extensions.png  (extensions/extensionGeneric.png)
++ skin/classic/mozapps/extensions/category-themes.png      (extensions/themeGeneric.png)
++ skin/classic/mozapps/extensions/category-plugins.png     (extensions/category-plugins.png)
++ skin/classic/mozapps/extensions/category-service.png     (extensions/category-service.png)
++ skin/classic/mozapps/extensions/category-dictionaries.png (extensions/category-dictionaries.png)
++ skin/classic/mozapps/extensions/category-experiments.png (extensions/category-experiments.png)
++ skin/classic/mozapps/extensions/category-recent.png      (extensions/category-recent.png)
++ skin/classic/mozapps/extensions/category-available.png   (extensions/category-available.png)
++ skin/classic/mozapps/extensions/extensionGeneric.png     (extensions/extensionGeneric.png)
++ skin/classic/mozapps/extensions/extensionGeneric-16.png  (extensions/extensionGeneric-16.png)
++ skin/classic/mozapps/extensions/dictionaryGeneric.png    (extensions/dictionaryGeneric.png)
++ skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png)
++ skin/classic/mozapps/extensions/experimentGeneric.png    (extensions/experimentGeneric.png)
++ skin/classic/mozapps/extensions/themeGeneric.png         (extensions/themeGeneric.png)
++ skin/classic/mozapps/extensions/themeGeneric-16.png      (extensions/themeGeneric-16.png)
++ skin/classic/mozapps/extensions/localeGeneric.png        (extensions/localeGeneric.png)
++ skin/classic/mozapps/extensions/newaddon.css             (extensions/newaddon.css)
++ skin/classic/mozapps/extensions/selectAddons.css         (extensions/selectAddons.css)
++ skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png  (extensions/extensionGeneric.png)
 #endif
   skin/classic/mozapps/plugins/pluginGeneric.png           (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png           (plugins/pluginBlocked.png)
diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn
index 8da83da161..35927755bd 100644
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -37,6 +37,51 @@ toolkit.jar:
   skin/classic/mozapps/extensions/eula.css                        (webextensions/eula.css)
   skin/classic/mozapps/extensions/blocklist.css                   (webextensions/blocklist.css)
 * skin/classic/mozapps/extensions/newaddon.css                    (webextensions/newaddon.css)
+#else
+  skin/classic/mozapps/extensions/category-search.png             (extensions/category-search.png)
+  skin/classic/mozapps/extensions/category-discover.png           (extensions/category-discover.png)
+  skin/classic/mozapps/extensions/category-languages.png          (extensions/localeGeneric.png)
+  skin/classic/mozapps/extensions/category-searchengines.png      (extensions/category-searchengines.png)
+  skin/classic/mozapps/extensions/category-extensions.png         (extensions/extensionGeneric.png)
+  skin/classic/mozapps/extensions/category-themes.png             (extensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/category-plugins.png            (extensions/category-plugins.png)
+  skin/classic/mozapps/extensions/category-service.png            (extensions/category-service.png)
+  skin/classic/mozapps/extensions/category-dictionaries.png       (extensions/category-dictionaries.png)
+  skin/classic/mozapps/extensions/category-experiments.png        (extensions/category-experiments.png)
+  skin/classic/mozapps/extensions/category-recent.png             (extensions/category-recent.png)
+  skin/classic/mozapps/extensions/category-available.png          (extensions/category-available.png)
+  skin/classic/mozapps/extensions/discover-logo.png               (extensions/discover-logo.png)
+  skin/classic/mozapps/extensions/extensionGeneric.png            (extensions/extensionGeneric.png)
+  skin/classic/mozapps/extensions/extensionGeneric-16.png         (extensions/extensionGeneric-16.png)
+  skin/classic/mozapps/extensions/themeGeneric.png                (extensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/themeGeneric-16.png             (extensions/themeGeneric-16.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric.png           (extensions/dictionaryGeneric.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric-16.png        (extensions/dictionaryGeneric-16.png)
+  skin/classic/mozapps/extensions/experimentGeneric.png           (extensions/experimentGeneric.png)
+  skin/classic/mozapps/extensions/localeGeneric.png               (extensions/localeGeneric.png)
+  skin/classic/mozapps/extensions/rating-won.png                  (extensions/rating-won.png)
+  skin/classic/mozapps/extensions/rating-not-won.png              (extensions/rating-not-won.png)
+  skin/classic/mozapps/extensions/cancel.png                      (extensions/cancel.png)
+  skin/classic/mozapps/extensions/utilities.svg                   (../../shared/extensions/utilities.svg)
+  skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png    (extensions/toolbarbutton-dropmarker.png)
+  skin/classic/mozapps/extensions/heart.png                       (extensions/heart.png)
+  skin/classic/mozapps/extensions/navigation.png                  (extensions/navigation.png)
+  skin/classic/mozapps/extensions/stripes-warning.png             (extensions/stripes-warning.png)
+  skin/classic/mozapps/extensions/stripes-error.png               (extensions/stripes-error.png)
+  skin/classic/mozapps/extensions/stripes-info-positive.png       (extensions/stripes-info-positive.png)
+  skin/classic/mozapps/extensions/stripes-info-negative.png       (extensions/stripes-info-negative.png)
+  skin/classic/mozapps/extensions/alerticon-warning.png           (extensions/alerticon-warning.png)
+  skin/classic/mozapps/extensions/alerticon-error.png             (extensions/alerticon-error.png)
+  skin/classic/mozapps/extensions/alerticon-info-positive.png     (extensions/alerticon-info-positive.png)
+  skin/classic/mozapps/extensions/alerticon-info-negative.png     (extensions/alerticon-info-negative.png)
+  skin/classic/mozapps/extensions/search.png                      (extensions/search.png)
+  skin/classic/mozapps/extensions/about.css                       (extensions/about.css)
+* skin/classic/mozapps/extensions/extensions.css                  (extensions/extensions.css)
+* skin/classic/mozapps/extensions/selectAddons.css                (extensions/selectAddons.css)
+  skin/classic/mozapps/extensions/update.css                      (extensions/update.css)
+  skin/classic/mozapps/extensions/eula.css                        (extensions/eula.css)
+  skin/classic/mozapps/extensions/blocklist.css                   (extensions/blocklist.css)
+* skin/classic/mozapps/extensions/newaddon.css                    (extensions/newaddon.css)
 #endif
   skin/classic/mozapps/plugins/notifyPluginGeneric.png            (plugins/notifyPluginGeneric.png)
   skin/classic/mozapps/plugins/pluginGeneric.png                  (plugins/pluginGeneric.png)
@@ -52,6 +97,9 @@ toolkit.jar:
   skin/classic/mozapps/viewsource/viewsource.css                  (viewsource/viewsource.css)
 #ifdef MOZ_WEBEXTENSIONS
   skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (webextensions/xpinstallConfirm.css)
+#else
+  skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png         (extensions/extensionGeneric.png)
+  skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (extensions/xpinstallConfirm.css)
 #endif
   skin/classic/mozapps/handling/handling.css                      (handling/handling.css)
 
diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn
index b5907d0166..5986f18f12 100644
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -22,16 +22,6 @@ toolkit.jar:
   skin/classic/mozapps/extensions/localeGeneric.png          (webextensions/localeGeneric.png)
   skin/classic/mozapps/extensions/heart.png                  (webextensions/heart.png)
 * skin/classic/mozapps/extensions/newaddon.css               (webextensions/newaddon.css)
-#endif
-  skin/classic/mozapps/plugins/pluginGeneric.png             (plugins/pluginGeneric.png)
-  skin/classic/mozapps/plugins/pluginBlocked.png             (plugins/pluginBlocked.png)
-  skin/classic/mozapps/plugins/pluginGeneric-16.png          (plugins/pluginGeneric-16.png)
-  skin/classic/mozapps/profile/profileicon.png               (profile/profileicon.png)
-  skin/classic/mozapps/update/updates.css                    (update/updates.css)
-  skin/classic/mozapps/viewsource/viewsource.css             (viewsource/viewsource.css)
-  skin/classic/mozapps/downloads/downloadButtons-XP.png      (downloads/downloadButtons-XP.png)
-  skin/classic/mozapps/downloads/downloadIcon-XP.png         (downloads/downloadIcon-XP.png)
-#ifdef MOZ_WEBEXTENSIONS
   skin/classic/mozapps/extensions/category-discover-XP.png   (webextensions/category-discover-XP.png)
   skin/classic/mozapps/extensions/category-plugins-XP.png    (webextensions/category-plugins-XP.png)
   skin/classic/mozapps/extensions/category-recent-XP.png     (webextensions/category-recent-XP.png)
@@ -40,7 +30,60 @@ toolkit.jar:
   skin/classic/mozapps/extensions/themeGeneric-XP.png        (webextensions/themeGeneric-XP.png)
   skin/classic/mozapps/extensions/themeGeneric-16-XP.png     (webextensions/themeGeneric-16-XP.png)
   skin/classic/mozapps/extensions/localeGeneric-XP.png       (webextensions/localeGeneric-XP.png)
+#else
+ skin/classic/mozapps/extensions/about.css                  (extensions/about.css)
+  skin/classic/mozapps/extensions/blocklist.css              (extensions/blocklist.css)
+* skin/classic/mozapps/extensions/extensions.css             (extensions/extensions.css)
+* skin/classic/mozapps/extensions/selectAddons.css           (extensions/selectAddons.css)
+  skin/classic/mozapps/extensions/update.css                 (extensions/update.css)
+  skin/classic/mozapps/extensions/category-search.png        (extensions/category-search.png)
+  skin/classic/mozapps/extensions/category-discover.png      (extensions/category-discover.png)
+  skin/classic/mozapps/extensions/category-languages.png     (extensions/localeGeneric.png)
+  skin/classic/mozapps/extensions/category-searchengines.png (extensions/category-searchengines.png)
+  skin/classic/mozapps/extensions/category-extensions.png    (extensions/extensionGeneric.png)
+  skin/classic/mozapps/extensions/category-themes.png        (extensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/category-plugins.png       (extensions/category-plugins.png)
+  skin/classic/mozapps/extensions/category-service.png       (extensions/category-service.png)
+  skin/classic/mozapps/extensions/category-dictionaries.png  (extensions/dictionaryGeneric.png)
+  skin/classic/mozapps/extensions/category-recent.png        (extensions/category-recent.png)
+  skin/classic/mozapps/extensions/category-available.png     (extensions/category-available.png)
+  skin/classic/mozapps/extensions/discover-logo.png          (extensions/discover-logo.png)
+  skin/classic/mozapps/extensions/extensionGeneric.png       (extensions/extensionGeneric.png)
+  skin/classic/mozapps/extensions/extensionGeneric-16.png    (extensions/extensionGeneric-16.png)
+  skin/classic/mozapps/extensions/extensionGeneric-48.png    (extensions/extensionGeneric-48.png)
+  skin/classic/mozapps/extensions/themeGeneric.png           (extensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/themeGeneric-16.png        (extensions/themeGeneric-16.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric.png      (extensions/dictionaryGeneric.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric-16.png   (extensions/dictionaryGeneric-16.png)
+  skin/classic/mozapps/extensions/experimentGeneric.png      (extensions/experimentGeneric.png)
+  skin/classic/mozapps/extensions/localeGeneric.png          (extensions/localeGeneric.png)
+  skin/classic/mozapps/extensions/rating-won.png             (extensions/rating-won.png)
+  skin/classic/mozapps/extensions/rating-not-won.png         (extensions/rating-not-won.png)
+  skin/classic/mozapps/extensions/cancel.png                 (extensions/cancel.png)
+  skin/classic/mozapps/extensions/utilities.svg              (../../shared/extensions/utilities.svg)
+  skin/classic/mozapps/extensions/heart.png                  (extensions/heart.png)
+  skin/classic/mozapps/extensions/navigation.png             (extensions/navigation.png)
+  skin/classic/mozapps/extensions/stripes-warning.png        (extensions/stripes-warning.png)
+  skin/classic/mozapps/extensions/stripes-error.png          (extensions/stripes-error.png)
+  skin/classic/mozapps/extensions/stripes-info-positive.png  (extensions/stripes-info-positive.png)
+  skin/classic/mozapps/extensions/stripes-info-negative.png  (extensions/stripes-info-negative.png)
+  skin/classic/mozapps/extensions/alerticon-warning.png      (extensions/alerticon-warning.png)
+  skin/classic/mozapps/extensions/alerticon-error.png        (extensions/alerticon-error.png)
+  skin/classic/mozapps/extensions/alerticon-info-positive.png (extensions/alerticon-info-positive.png)
+  skin/classic/mozapps/extensions/alerticon-info-negative.png (extensions/alerticon-info-negative.png)
+  skin/classic/mozapps/extensions/eula.css                   (extensions/eula.css)
+  skin/classic/mozapps/extensions/newaddon.css               (extensions/newaddon.css)
+* skin/classic/mozapps/xpinstall/xpinstallConfirm.css        (extensions/xpinstallConfirm.css)
+  skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png    (extensions/extensionGeneric.png)
 #endif
+  skin/classic/mozapps/plugins/pluginGeneric.png             (plugins/pluginGeneric.png)
+  skin/classic/mozapps/plugins/pluginBlocked.png             (plugins/pluginBlocked.png)
+  skin/classic/mozapps/plugins/pluginGeneric-16.png          (plugins/pluginGeneric-16.png)
+  skin/classic/mozapps/profile/profileicon.png               (profile/profileicon.png)
+  skin/classic/mozapps/update/updates.css                    (update/updates.css)
+  skin/classic/mozapps/viewsource/viewsource.css             (viewsource/viewsource.css)
+  skin/classic/mozapps/downloads/downloadButtons-XP.png      (downloads/downloadButtons-XP.png)
+  skin/classic/mozapps/downloads/downloadIcon-XP.png         (downloads/downloadIcon-XP.png)
   skin/classic/mozapps/plugins/pluginGeneric-XP.png          (plugins/pluginGeneric-XP.png)
   skin/classic/mozapps/plugins/pluginBlocked-XP.png          (plugins/pluginBlocked-XP.png)
   skin/classic/mozapps/plugins/pluginGeneric-16-XP.png       (plugins/pluginGeneric-16-XP.png)