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

--HG--
rename : browser/components/migration/src/BrowserProfileMigrators.manifest => browser/components/migration/BrowserProfileMigrators.manifest
rename : browser/components/migration/src/ChromeProfileMigrator.js => browser/components/migration/ChromeProfileMigrator.js
rename : browser/components/migration/src/FirefoxProfileMigrator.js => browser/components/migration/FirefoxProfileMigrator.js
rename : browser/components/migration/src/IEProfileMigrator.js => browser/components/migration/IEProfileMigrator.js
rename : browser/components/migration/src/MigrationUtils.jsm => browser/components/migration/MigrationUtils.jsm
rename : browser/components/migration/src/ProfileMigrator.js => browser/components/migration/ProfileMigrator.js
rename : browser/components/migration/src/SafariProfileMigrator.js => browser/components/migration/SafariProfileMigrator.js
rename : browser/components/migration/public/nsIBrowserProfileMigrator.idl => browser/components/migration/nsIBrowserProfileMigrator.idl
rename : browser/components/migration/src/nsIEHistoryEnumerator.cpp => browser/components/migration/nsIEHistoryEnumerator.cpp
rename : browser/components/migration/src/nsIEHistoryEnumerator.h => browser/components/migration/nsIEHistoryEnumerator.h

browser/components/build/moz.build

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

browser/components/migration/moz.build

@@ -4,10 +4,51 @@
 # 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 += ['tests/unit/xpcshell.ini']
 
-XPCSHELL_TESTS_MANIFESTS += [
-    'tests/unit/xpcshell.ini',
+JAR_MANIFESTS += ['jar.mn']
+
+XPIDL_SOURCES += [
+    'nsIBrowserProfileMigrator.idl',
 ]
 
-JAR_MANIFESTS += ['jar.mn']
+XPIDL_MODULE = 'migration'
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    SOURCES += [
+        'nsIEHistoryEnumerator.cpp',
+    ]
+
+EXTRA_COMPONENTS += [
+    'FirefoxProfileMigrator.js',
+    'ProfileMigrator.js',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    EXTRA_COMPONENTS += [
+        'IEProfileMigrator.js',
+    ]
+    DEFINES['HAS_IE_MIGRATOR'] = True
+
+EXTRA_PP_COMPONENTS += [
+    'BrowserProfileMigrators.manifest',
+    'ChromeProfileMigrator.js',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    EXTRA_PP_COMPONENTS += [
+        'SafariProfileMigrator.js',
+    ]
+    DEFINES['HAS_SAFARI_MIGRATOR'] = True
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    EXTRA_PP_COMPONENTS += [
+        'SafariProfileMigrator.js',
+    ]
+    DEFINES['HAS_SAFARI_MIGRATOR'] = True
+
+EXTRA_PP_JS_MODULES += [
+    'MigrationUtils.jsm',
+]
+
+FINAL_LIBRARY = 'browsercomps'

browser/components/migration/public/moz.build

@@ -1,12 +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 += [
-    'nsIBrowserProfileMigrator.idl',
-]
-
-XPIDL_MODULE = 'migration'
-

browser/components/migration/src/moz.build

@@ -1,44 +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 += [
-        'nsIEHistoryEnumerator.cpp',
-    ]
-
-EXTRA_COMPONENTS += [
-    'FirefoxProfileMigrator.js',
-    'ProfileMigrator.js',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    EXTRA_COMPONENTS += [
-        'IEProfileMigrator.js',
-    ]
-    DEFINES['HAS_IE_MIGRATOR'] = True
-
-EXTRA_PP_COMPONENTS += [
-    'BrowserProfileMigrators.manifest',
-    'ChromeProfileMigrator.js',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    EXTRA_PP_COMPONENTS += [
-        'SafariProfileMigrator.js',
-    ]
-    DEFINES['HAS_SAFARI_MIGRATOR'] = True
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    EXTRA_PP_COMPONENTS += [
-        'SafariProfileMigrator.js',
-    ]
-    DEFINES['HAS_SAFARI_MIGRATOR'] = True
-
-EXTRA_PP_JS_MODULES += [
-    'MigrationUtils.jsm',
-]
-
-FINAL_LIBRARY = 'browsercomps'