Bug 1428299 - Flatten SeaMonkey suite/profile structure and move to components/ r=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sun, 04 Mar 2018 13:24:25 +0000
changeset 31210 3ecaf3dfcd5644226f11cb534a1e8f1386471b61
parent 31209 8c54ff3e545e8322bd05c057053c5be1c2e8acc4
child 31211 6cf4a2d1662a4fd5911f358045bdcfcfaeb47085
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersfrg
bugs1428299
Bug 1428299 - Flatten SeaMonkey suite/profile structure and move to components/ r=frg
suite/build/moz.build
suite/components/moz.build
suite/components/profile/SuiteProfileMigrator.js
suite/components/profile/SuiteProfileMigrator.manifest
suite/components/profile/jar.mn
suite/components/profile/migration.js
suite/components/profile/migration.xul
suite/components/profile/moz.build
suite/components/profile/nsISuiteProfileMigrator.idl
suite/components/profile/nsNetscapeProfileMigratorBase.cpp
suite/components/profile/nsNetscapeProfileMigratorBase.h
suite/components/profile/nsSuiteDirectoryProvider.cpp
suite/components/profile/nsSuiteDirectoryProvider.h
suite/components/profile/nsSuiteProfileMigratorUtils.cpp
suite/components/profile/nsSuiteProfileMigratorUtils.h
suite/components/profile/nsThunderbirdProfileMigrator.cpp
suite/components/profile/nsThunderbirdProfileMigrator.h
suite/moz.build
suite/profile/jar.mn
suite/profile/migration.js
suite/profile/migration.xul
suite/profile/migration/public/moz.build
suite/profile/migration/public/nsISuiteProfileMigrator.idl
suite/profile/migration/src/SuiteProfileMigrator.js
suite/profile/migration/src/SuiteProfileMigrator.manifest
suite/profile/migration/src/moz.build
suite/profile/migration/src/nsNetscapeProfileMigratorBase.cpp
suite/profile/migration/src/nsNetscapeProfileMigratorBase.h
suite/profile/migration/src/nsSuiteProfileMigratorUtils.cpp
suite/profile/migration/src/nsSuiteProfileMigratorUtils.h
suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp
suite/profile/migration/src/nsThunderbirdProfileMigrator.h
suite/profile/moz.build
suite/profile/nsSuiteDirectoryProvider.cpp
suite/profile/nsSuiteDirectoryProvider.h
--- a/suite/build/moz.build
+++ b/suite/build/moz.build
@@ -11,12 +11,11 @@ SOURCES += [
     'nsSuiteModule.cpp',
 ]
 
 Library('suite')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../components/feeds',
+    '../components/profile',
     '../components/shell',
-    '../profile',
-    '../profile/migration/src',
 ]
--- a/suite/components/moz.build
+++ b/suite/components/moz.build
@@ -1,9 +1,10 @@
 # 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',
+    'profile',
     'shell',
 ]
rename from suite/profile/migration/src/SuiteProfileMigrator.js
rename to suite/components/profile/SuiteProfileMigrator.js
rename from suite/profile/migration/src/SuiteProfileMigrator.manifest
rename to suite/components/profile/SuiteProfileMigrator.manifest
rename from suite/profile/jar.mn
rename to suite/components/profile/jar.mn
rename from suite/profile/migration.js
rename to suite/components/profile/migration.js
rename from suite/profile/migration.xul
rename to suite/components/profile/migration.xul
rename from suite/profile/migration/src/moz.build
rename to suite/components/profile/moz.build
--- a/suite/profile/migration/src/moz.build
+++ b/suite/components/profile/moz.build
@@ -1,21 +1,29 @@
 # 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 += [
+    'nsISuiteProfileMigrator.idl',
+]
+
+XPIDL_MODULE = 'suitemigration'
+
 SOURCES += [
     'nsNetscapeProfileMigratorBase.cpp',
+    'nsSuiteDirectoryProvider.cpp',
     'nsSuiteProfileMigratorUtils.cpp',
     'nsThunderbirdProfileMigrator.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'SuiteProfileMigrator.manifest',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'SuiteProfileMigrator.js',
 ]
 
 FINAL_LIBRARY = 'suite'
 
+JAR_MANIFESTS += ['jar.mn']
rename from suite/profile/migration/public/nsISuiteProfileMigrator.idl
rename to suite/components/profile/nsISuiteProfileMigrator.idl
rename from suite/profile/migration/src/nsNetscapeProfileMigratorBase.cpp
rename to suite/components/profile/nsNetscapeProfileMigratorBase.cpp
rename from suite/profile/migration/src/nsNetscapeProfileMigratorBase.h
rename to suite/components/profile/nsNetscapeProfileMigratorBase.h
rename from suite/profile/nsSuiteDirectoryProvider.cpp
rename to suite/components/profile/nsSuiteDirectoryProvider.cpp
rename from suite/profile/nsSuiteDirectoryProvider.h
rename to suite/components/profile/nsSuiteDirectoryProvider.h
rename from suite/profile/migration/src/nsSuiteProfileMigratorUtils.cpp
rename to suite/components/profile/nsSuiteProfileMigratorUtils.cpp
rename from suite/profile/migration/src/nsSuiteProfileMigratorUtils.h
rename to suite/components/profile/nsSuiteProfileMigratorUtils.h
rename from suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp
rename to suite/components/profile/nsThunderbirdProfileMigrator.cpp
rename from suite/profile/migration/src/nsThunderbirdProfileMigrator.h
rename to suite/components/profile/nsThunderbirdProfileMigrator.h
--- a/suite/moz.build
+++ b/suite/moz.build
@@ -10,17 +10,16 @@ DIRS += [
     'common',
     'components',
     'extensions',
     'locales',
     'mailnews',
     'modules',
     'themes/classic',
     'themes/modern',
-    'profile',
     'security',
     '../common/src',
 ]
 
 if CONFIG['MAKENSISU']:
     DIRS += ['installer/windows']
 
 if CONFIG['MOZ_BUNDLED_FONTS']:
deleted file mode 100644
--- a/suite/profile/migration/public/moz.build
+++ /dev/null
@@ -1,11 +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 += [
-    'nsISuiteProfileMigrator.idl',
-]
-
-XPIDL_MODULE = 'suitemigration'
-
deleted file mode 100644
--- a/suite/profile/moz.build
+++ /dev/null
@@ -1,18 +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/.
-
-DIRS += [
-    'migration/public',
-    'migration/src',
-]
-
-SOURCES += [
-    'nsSuiteDirectoryProvider.cpp',
-]
-
-FINAL_LIBRARY = 'suite'
-
-JAR_MANIFESTS += ['jar.mn']
-