Bug 1246591 - fix moz.build file and .eslintignore, r=MattN
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Mon, 08 Feb 2016 12:58:28 +0000
changeset 329835 1aca4f26143989f5491d94a51390de20fca8f76a
parent 329834 4ae0a01c95a322d0c02169d915267c84e5e2e166
child 329836 e0be6880f8e00767529ba5562ae862b7f29d66c2
push id10617
push userdtownsend@mozilla.com
push dateTue, 09 Feb 2016 16:30:19 +0000
reviewersMattN
bugs1246591
milestone47.0a1
Bug 1246591 - fix moz.build file and .eslintignore, r=MattN
.eslintignore
browser/components/migration/moz.build
--- a/.eslintignore
+++ b/.eslintignore
@@ -59,17 +59,16 @@ b2g/locales/en-US/b2g-l10n.js
 browser/app/**
 browser/base/content/browser-social.js
 browser/base/content/nsContextMenu.js
 browser/base/content/sanitizeDialog.js
 browser/base/content/test/**
 browser/base/content/newtab/**
 browser/components/downloads/**
 browser/components/feeds/**
-browser/components/migration/**
 browser/components/pocket/**
 browser/components/preferences/**
 browser/components/privatebrowsing/**
 browser/components/sessionstore/**
 browser/components/shell/**
 browser/components/tabview/**
 browser/components/translation/**
 browser/extensions/pdfjs/**
--- a/browser/components/migration/moz.build
+++ b/browser/components/migration/moz.build
@@ -9,59 +9,51 @@ XPCSHELL_TESTS_MANIFESTS += ['tests/unit
 JAR_MANIFESTS += ['jar.mn']
 
 XPIDL_SOURCES += [
     'nsIBrowserProfileMigrator.idl',
 ]
 
 XPIDL_MODULE = 'migration'
 
+EXTRA_COMPONENTS += [
+    'ChromeProfileMigrator.js',
+    'FirefoxProfileMigrator.js',
+    'ProfileMigrator.js',
+]
+
+EXTRA_PP_COMPONENTS += [
+    'BrowserProfileMigrators.manifest',
+]
+
+EXTRA_JS_MODULES += [
+    'MigrationUtils.jsm',
+]
+
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'nsIEHistoryEnumerator.cpp',
     ]
-
-EXTRA_COMPONENTS += [
-    'FirefoxProfileMigrator.js',
-    'ProfileMigrator.js',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
     EXTRA_COMPONENTS += [
         '360seProfileMigrator.js',
         'EdgeProfileMigrator.js',
         'IEProfileMigrator.js',
+        'SafariProfileMigrator.js',
     ]
+    EXTRA_JS_MODULES += [
+        'ESEDBReader.jsm',
+        'MSMigrationUtils.jsm',
+    ]
+    DEFINES['HAS_SAFARI_MIGRATOR'] = True
     DEFINES['HAS_360SE_MIGRATOR'] = True
     DEFINES['HAS_IE_MIGRATOR'] = True
     DEFINES['HAS_EDGE_MIGRATOR'] = True
 
-EXTRA_PP_COMPONENTS += [
-    'BrowserProfileMigrators.manifest',
-    'ChromeProfileMigrator.js',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    EXTRA_PP_COMPONENTS += [
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    EXTRA_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',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    EXTRA_JS_MODULES += [
-        'ESEDBReader.jsm',
-        'MSMigrationUtils.jsm',
-    ]
-
 FINAL_LIBRARY = 'browsercomps'
 
 with Files('**'):
     BUG_COMPONENT = ('Firefox', 'Migration')