Bug 1428149 - Flatten SeaMonkey suite/feeds structure and move to components/ r=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sun, 04 Mar 2018 13:24:24 +0000
changeset 31209 8c54ff3e545e8322bd05c057053c5be1c2e8acc4
parent 31208 2f4c545ecc13d1e401de11ce14d65be7945b32b2
child 31210 3ecaf3dfcd5644226f11cb534a1e8f1386471b61
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersfrg
bugs1428149
Bug 1428149 - Flatten SeaMonkey suite/feeds structure and move to components/ r=frg
suite/build/moz.build
suite/components/feeds/FeedConverter.js
suite/components/feeds/FeedWriter.js
suite/components/feeds/SuiteFeeds.manifest
suite/components/feeds/WebContentConverter.js
suite/components/feeds/moz.build
suite/components/feeds/nsFeedSniffer.cpp
suite/components/feeds/nsFeedSniffer.h
suite/components/feeds/nsIFeedResultService.idl
suite/components/feeds/nsIWebContentConverterRegistrar.idl
suite/components/moz.build
suite/feeds/public/moz.build
suite/feeds/public/nsIFeedResultService.idl
suite/feeds/public/nsIWebContentConverterRegistrar.idl
suite/feeds/src/FeedConverter.js
suite/feeds/src/FeedWriter.js
suite/feeds/src/SuiteFeeds.manifest
suite/feeds/src/WebContentConverter.js
suite/feeds/src/moz.build
suite/feeds/src/nsFeedSniffer.cpp
suite/feeds/src/nsFeedSniffer.h
suite/moz.build
--- a/suite/build/moz.build
+++ b/suite/build/moz.build
@@ -10,13 +10,13 @@ EXPORTS += [
 SOURCES += [
     'nsSuiteModule.cpp',
 ]
 
 Library('suite')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
+    '../components/feeds',
     '../components/shell',
-    '../feeds/src',
     '../profile',
     '../profile/migration/src',
 ]
rename from suite/feeds/src/FeedConverter.js
rename to suite/components/feeds/FeedConverter.js
rename from suite/feeds/src/FeedWriter.js
rename to suite/components/feeds/FeedWriter.js
rename from suite/feeds/src/SuiteFeeds.manifest
rename to suite/components/feeds/SuiteFeeds.manifest
rename from suite/feeds/src/WebContentConverter.js
rename to suite/components/feeds/WebContentConverter.js
rename from suite/feeds/src/moz.build
rename to suite/components/feeds/moz.build
--- a/suite/feeds/src/moz.build
+++ b/suite/components/feeds/moz.build
@@ -1,13 +1,20 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+XPIDL_SOURCES += [
+    'nsIFeedResultService.idl',
+    'nsIWebContentConverterRegistrar.idl',
+]
+
+XPIDL_MODULE = 'suitefeeds'
+
 SOURCES += [
     'nsFeedSniffer.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'FeedConverter.js',
     'FeedWriter.js',
     'SuiteFeeds.manifest',
rename from suite/feeds/src/nsFeedSniffer.cpp
rename to suite/components/feeds/nsFeedSniffer.cpp
rename from suite/feeds/src/nsFeedSniffer.h
rename to suite/components/feeds/nsFeedSniffer.h
rename from suite/feeds/public/nsIFeedResultService.idl
rename to suite/components/feeds/nsIFeedResultService.idl
rename from suite/feeds/public/nsIWebContentConverterRegistrar.idl
rename to suite/components/feeds/nsIWebContentConverterRegistrar.idl
--- a/suite/components/moz.build
+++ b/suite/components/moz.build
@@ -1,8 +1,9 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
+    'feeds',
     'shell',
 ]
deleted file mode 100644
--- a/suite/feeds/public/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsIFeedResultService.idl',
-    'nsIWebContentConverterRegistrar.idl',
-]
-
-XPIDL_MODULE = 'suitefeeds'
-
--- a/suite/moz.build
+++ b/suite/moz.build
@@ -5,18 +5,16 @@
 
 CONFIGURE_SUBST_FILES += ['installer/Makefile']
 
 DIRS += [
     'browser',
     'common',
     'components',
     'extensions',
-    'feeds/public',
-    'feeds/src',
     'locales',
     'mailnews',
     'modules',
     'themes/classic',
     'themes/modern',
     'profile',
     'security',
     '../common/src',