# HG changeset patch
# User Ian Neal <iann_cvs@blueyonder.co.uk>
# Date 1520169863 0
#      Sun Mar 04 13:24:23 2018 +0000
# Node ID 2f4c545ecc13d1e401de11ce14d65be7945b32b2
# Parent  c92370ea44deaa9dd89b3a9e62e3fb1456a74596
Bug 1428148 - Flatten SeaMonkey suite/shell structure and move to components/ r=frg

diff --git a/suite/build/moz.build b/suite/build/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 += [
+    '/suite/components/shell',
     '/suite/feeds/src',
     '/suite/profile',
     '/suite/profile/migration/src',
-    '/suite/shell/src',
 ]
diff --git a/suite/components/moz.build b/suite/components/moz.build
new file mode 100644
--- /dev/null
+++ b/suite/components/moz.build
@@ -0,0 +1,8 @@
+# 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 += [
+    'shell',
+]
diff --git a/suite/shell/src/moz.build b/suite/components/shell/moz.build
rename from suite/shell/src/moz.build
rename to suite/components/shell/moz.build
--- a/suite/shell/src/moz.build
+++ b/suite/components/shell/moz.build
@@ -1,13 +1,24 @@
 # 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 += [
+    'nsIShellService.idl',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    XPIDL_SOURCES += [
+        'nsIWindowsShellService.idl',
+    ]
+
+XPIDL_MODULE = 'shellservice'
+
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'nsWindowsShellService.cpp',
     ]
     LOCAL_INCLUDES += [
         '../../../mozilla/other-licenses/nsis/Contrib/CityHash/cityhash',
     ]
     OS_LIBS += [
diff --git a/suite/shell/src/nsGNOMEShellService.cpp b/suite/components/shell/nsGNOMEShellService.cpp
rename from suite/shell/src/nsGNOMEShellService.cpp
rename to suite/components/shell/nsGNOMEShellService.cpp
diff --git a/suite/shell/src/nsGNOMEShellService.h b/suite/components/shell/nsGNOMEShellService.h
rename from suite/shell/src/nsGNOMEShellService.h
rename to suite/components/shell/nsGNOMEShellService.h
diff --git a/suite/shell/public/nsIShellService.idl b/suite/components/shell/nsIShellService.idl
rename from suite/shell/public/nsIShellService.idl
rename to suite/components/shell/nsIShellService.idl
diff --git a/suite/shell/public/nsIWindowsShellService.idl b/suite/components/shell/nsIWindowsShellService.idl
rename from suite/shell/public/nsIWindowsShellService.idl
rename to suite/components/shell/nsIWindowsShellService.idl
diff --git a/suite/shell/src/nsMacShellService.cpp b/suite/components/shell/nsMacShellService.cpp
rename from suite/shell/src/nsMacShellService.cpp
rename to suite/components/shell/nsMacShellService.cpp
diff --git a/suite/shell/src/nsMacShellService.h b/suite/components/shell/nsMacShellService.h
rename from suite/shell/src/nsMacShellService.h
rename to suite/components/shell/nsMacShellService.h
diff --git a/suite/shell/src/nsSetDefault.js b/suite/components/shell/nsSetDefault.js
rename from suite/shell/src/nsSetDefault.js
rename to suite/components/shell/nsSetDefault.js
diff --git a/suite/shell/src/nsSetDefault.manifest b/suite/components/shell/nsSetDefault.manifest
rename from suite/shell/src/nsSetDefault.manifest
rename to suite/components/shell/nsSetDefault.manifest
diff --git a/suite/shell/src/nsShellService.h b/suite/components/shell/nsShellService.h
rename from suite/shell/src/nsShellService.h
rename to suite/components/shell/nsShellService.h
diff --git a/suite/shell/src/nsWindowsShellService.cpp b/suite/components/shell/nsWindowsShellService.cpp
rename from suite/shell/src/nsWindowsShellService.cpp
rename to suite/components/shell/nsWindowsShellService.cpp
diff --git a/suite/shell/src/nsWindowsShellService.h b/suite/components/shell/nsWindowsShellService.h
rename from suite/shell/src/nsWindowsShellService.h
rename to suite/components/shell/nsWindowsShellService.h
diff --git a/suite/moz.build b/suite/moz.build
--- a/suite/moz.build
+++ b/suite/moz.build
@@ -7,27 +7,26 @@ CONFIGURE_SUBST_FILES += ['installer/Mak
 
 # This should match /suite/installer/moz.build.
 if 'pre' in CONFIG['MOZ_APP_VERSION'] or 'a' in CONFIG['MOZ_APP_VERSION']:
     DIRS += ['debugQA']
 
 DIRS += [
     'browser',
     'common',
+    'components',
     'feeds/public',
     'feeds/src',
     'locales',
     'mailnews',
     'modules',
     'themes/classic',
     'themes/modern',
     'profile',
     'security',
-    'shell/public',
-    'shell/src',
     'smile',
 ]
 
 if CONFIG['MAKENSISU']:
     DIRS += ['installer/windows']
 
 if CONFIG['MOZ_BUNDLED_FONTS']:
     DIRS += ['/mozilla/browser/fonts']
diff --git a/suite/shell/public/moz.build b/suite/shell/public/moz.build
deleted file mode 100644
--- a/suite/shell/public/moz.build
+++ /dev/null
@@ -1,16 +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 += [
-    'nsIShellService.idl',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    XPIDL_SOURCES += [
-        'nsIWindowsShellService.idl',
-    ]
-
-XPIDL_MODULE = 'shellservice'
-