Bug 1104823 - Fix packaging of UITour FHR recording (modules.manifest renamed to browsermodules.manifest for clarity), r=felipe, a=gavin
authorBenjamin Smedberg <benjamin@smedbergs.us>
Tue, 25 Nov 2014 15:13:01 -0800
changeset 226152 e350081598fa3b51e19f5ba64dd5680a2aab7ec1
parent 226151 c832bb48c4e2a4d4b1836dd5c2b7b4e683dd525f
child 226153 c0c3429824fcc3ebd11409664c8a8b4c739849da
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 17:57:20 +0000
reviewersfelipe, gavin
bugs1104823
milestone34.0
Bug 1104823 - Fix packaging of UITour FHR recording (modules.manifest renamed to browsermodules.manifest for clarity), r=felipe, a=gavin
browser/installer/package-manifest.in
browser/modules/browsermodules.manifest
browser/modules/modules.manifest
browser/modules/moz.build
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -175,16 +175,17 @@
 @BINPATH@/components/accessibility.xpt
 #endif
 @BINPATH@/components/appshell.xpt
 @BINPATH@/components/appstartup.xpt
 @BINPATH@/components/autocomplete.xpt
 @BINPATH@/components/autoconfig.xpt
 @BINPATH@/browser/components/browsercompsbase.xpt
 @BINPATH@/browser/components/browser-feeds.xpt
+@BINPATH@/browser/components/browsermodules.manifest
 @BINPATH@/components/caps.xpt
 @BINPATH@/components/chrome.xpt
 @BINPATH@/components/commandhandler.xpt
 @BINPATH@/components/commandlines.xpt
 @BINPATH@/components/composer.xpt
 @BINPATH@/components/content_base.xpt
 @BINPATH@/components/content_events.xpt
 @BINPATH@/components/content_htmldoc.xpt
rename from browser/modules/modules.manifest
rename to browser/modules/browsermodules.manifest
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -45,13 +45,13 @@ if CONFIG['NIGHTLY_BUILD']:
 EXTRA_PP_JS_MODULES += [
     'AboutHome.jsm',
     'RecentWindow.jsm',
     'UITour.jsm',
     'webrtcUI.jsm',
 ]
 
 EXTRA_PP_COMPONENTS += [
-    'modules.manifest',
+    'browsermodules.manifest',
 ]
 
 if CONFIG['MOZILLA_OFFICIAL']:
     DEFINES['MOZILLA_OFFICIAL'] = 1