Bug 1038458 - Part 7: Flatten browser/components/shell/{public,src}/ directories. r=mak

browser/components/build/moz.build

@@ -21,7 +21,7 @@ LOCAL_INCLUDES += [
     '../dirprovider',
     '../feeds',
     '../migration',
-    '../shell/src',
+    '../shell',
 ]
 
 USE_LIBS += [

browser/components/shell/moz.build

@@ -4,14 +4,46 @@
 # 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 += ['public', 'src']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
 
-XPCSHELL_TESTS_MANIFESTS += [
+JAR_MANIFESTS += ['jar.mn']
-    'test/unit/xpcshell.ini'
+
+XPIDL_SOURCES += [
+    'nsIShellService.idl',
 ]
 
-BROWSER_CHROME_MANIFESTS += [
+if CONFIG['OS_ARCH'] == 'WINNT':
-    'test/browser.ini',
+    XPIDL_SOURCES += [
+        'nsIWindowsShellService.idl',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    XPIDL_SOURCES += [
+        'nsIMacShellService.idl',
+    ]
+
+XPIDL_MODULE = 'shellservice'
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    SOURCES += [
+        'nsWindowsShellService.cpp',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    SOURCES += [
+        'nsMacShellService.cpp',
+    ]
+elif CONFIG['MOZ_WIDGET_GTK']:
+    SOURCES += [
+        'nsGNOMEShellService.cpp',
+    ]
+
+if SOURCES:
+    FINAL_LIBRARY = 'browsercomps'
+
+EXTRA_COMPONENTS += [
+    'nsSetDefaultBrowser.js',
+    'nsSetDefaultBrowser.manifest',
 ]
 
-JAR_MANIFESTS += ['jar.mn']
+for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'):
+    DEFINES[var] = '"%s"' % CONFIG[var]

browser/components/shell/public/moz.build

@@ -1,21 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    XPIDL_SOURCES += [
-        'nsIMacShellService.idl',
-    ]
-
-XPIDL_MODULE = 'shellservice'
-

browser/components/shell/src/moz.build

@@ -1,29 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    SOURCES += [
-        'nsWindowsShellService.cpp',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    SOURCES += [
-        'nsMacShellService.cpp',
-    ]
-elif CONFIG['MOZ_WIDGET_GTK']:
-    SOURCES += [
-        'nsGNOMEShellService.cpp',
-    ]
-
-if SOURCES:
-    FINAL_LIBRARY = 'browsercomps'
-
-EXTRA_COMPONENTS += [
-    'nsSetDefaultBrowser.js',
-    'nsSetDefaultBrowser.manifest',
-]
-
-for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION'):
-    DEFINES[var] = '"%s"' % CONFIG[var]