diff --git a/application/palemoon/base/jar.mn b/application/palemoon/base/jar.mn index 092993caa0..b3826e603b 100644 --- a/application/palemoon/base/jar.mn +++ b/application/palemoon/base/jar.mn @@ -46,25 +46,6 @@ browser.jar: content/browser/padlock_classic_low.png (content/padlock_classic_low.png) content/browser/padlock_classic_broken.png (content/padlock_classic_broken.png) content/browser/palemoon.xhtml (content/palemoon.xhtml) -#ifdef MOZ_SERVICES_SYNC - content/browser/sync/aboutSyncTabs.xul (content/sync/aboutSyncTabs.xul) - content/browser/sync/aboutSyncTabs.js (content/sync/aboutSyncTabs.js) - content/browser/sync/aboutSyncTabs.css (content/sync/aboutSyncTabs.css) - content/browser/sync/aboutSyncTabs-bindings.xml (content/sync/aboutSyncTabs-bindings.xml) - content/browser/sync/setup.xul (content/sync/setup.xul) - content/browser/sync/addDevice.js (content/sync/addDevice.js) - content/browser/sync/addDevice.xul (content/sync/addDevice.xul) - content/browser/sync/setup.js (content/sync/setup.js) - content/browser/sync/genericChange.xul (content/sync/genericChange.xul) - content/browser/sync/genericChange.js (content/sync/genericChange.js) - content/browser/sync/key.xhtml (content/sync/key.xhtml) - content/browser/sync/notification.xml (content/sync/notification.xml) - content/browser/sync/quota.xul (content/sync/quota.xul) - content/browser/sync/quota.js (content/sync/quota.js) - content/browser/sync/utils.js (content/sync/utils.js) - content/browser/sync/progress.js (content/sync/progress.js) - content/browser/sync/progress.xhtml (content/sync/progress.xhtml) -#endif content/browser/openLocation.js (content/openLocation.js) content/browser/openLocation.xul (content/openLocation.xul) content/browser/safeMode.css (content/safeMode.css) diff --git a/application/palemoon/components/moz.build b/application/palemoon/components/moz.build index edc4c75a93..eb2771c487 100644 --- a/application/palemoon/components/moz.build +++ b/application/palemoon/components/moz.build @@ -25,6 +25,9 @@ DIRS += [ if CONFIG['MOZ_BROWSER_STATUSBAR']: DIRS += ['statusbar'] +if CONFIG['MOZ_SERVICES_SYNC']: + DIRS += ['sync'] + DIRS += ['build'] XPIDL_SOURCES += [ diff --git a/application/palemoon/base/content/sync/aboutSyncTabs-bindings.xml b/application/palemoon/components/sync/aboutSyncTabs-bindings.xml similarity index 100% rename from application/palemoon/base/content/sync/aboutSyncTabs-bindings.xml rename to application/palemoon/components/sync/aboutSyncTabs-bindings.xml diff --git a/application/palemoon/base/content/sync/aboutSyncTabs.css b/application/palemoon/components/sync/aboutSyncTabs.css similarity index 100% rename from application/palemoon/base/content/sync/aboutSyncTabs.css rename to application/palemoon/components/sync/aboutSyncTabs.css diff --git a/application/palemoon/base/content/sync/aboutSyncTabs.js b/application/palemoon/components/sync/aboutSyncTabs.js similarity index 100% rename from application/palemoon/base/content/sync/aboutSyncTabs.js rename to application/palemoon/components/sync/aboutSyncTabs.js diff --git a/application/palemoon/base/content/sync/aboutSyncTabs.xul b/application/palemoon/components/sync/aboutSyncTabs.xul similarity index 100% rename from application/palemoon/base/content/sync/aboutSyncTabs.xul rename to application/palemoon/components/sync/aboutSyncTabs.xul diff --git a/application/palemoon/base/content/sync/addDevice.js b/application/palemoon/components/sync/addDevice.js similarity index 100% rename from application/palemoon/base/content/sync/addDevice.js rename to application/palemoon/components/sync/addDevice.js diff --git a/application/palemoon/base/content/sync/addDevice.xul b/application/palemoon/components/sync/addDevice.xul similarity index 100% rename from application/palemoon/base/content/sync/addDevice.xul rename to application/palemoon/components/sync/addDevice.xul diff --git a/application/palemoon/base/content/sync/genericChange.js b/application/palemoon/components/sync/genericChange.js similarity index 100% rename from application/palemoon/base/content/sync/genericChange.js rename to application/palemoon/components/sync/genericChange.js diff --git a/application/palemoon/base/content/sync/genericChange.xul b/application/palemoon/components/sync/genericChange.xul similarity index 100% rename from application/palemoon/base/content/sync/genericChange.xul rename to application/palemoon/components/sync/genericChange.xul diff --git a/application/palemoon/components/sync/jar.mn b/application/palemoon/components/sync/jar.mn new file mode 100644 index 0000000000..3782038cd3 --- /dev/null +++ b/application/palemoon/components/sync/jar.mn @@ -0,0 +1,22 @@ +# 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/. + +browser.jar: + content/browser/sync/aboutSyncTabs.xul + content/browser/sync/aboutSyncTabs.js + content/browser/sync/aboutSyncTabs.css + content/browser/sync/aboutSyncTabs-bindings.xml + content/browser/sync/setup.xul + content/browser/sync/addDevice.js + content/browser/sync/addDevice.xul + content/browser/sync/setup.js + content/browser/sync/genericChange.xul + content/browser/sync/genericChange.js + content/browser/sync/key.xhtml + content/browser/sync/notification.xml + content/browser/sync/quota.xul + content/browser/sync/quota.js + content/browser/sync/utils.js + content/browser/sync/progress.js + content/browser/sync/progress.xhtml \ No newline at end of file diff --git a/application/palemoon/base/content/sync/key.xhtml b/application/palemoon/components/sync/key.xhtml similarity index 100% rename from application/palemoon/base/content/sync/key.xhtml rename to application/palemoon/components/sync/key.xhtml diff --git a/application/palemoon/components/sync/moz.build b/application/palemoon/components/sync/moz.build new file mode 100644 index 0000000000..2d64d506c1 --- /dev/null +++ b/application/palemoon/components/sync/moz.build @@ -0,0 +1,8 @@ +# -*- 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/. + +JAR_MANIFESTS += ['jar.mn'] + diff --git a/application/palemoon/base/content/sync/notification.xml b/application/palemoon/components/sync/notification.xml similarity index 100% rename from application/palemoon/base/content/sync/notification.xml rename to application/palemoon/components/sync/notification.xml diff --git a/application/palemoon/base/content/sync/progress.js b/application/palemoon/components/sync/progress.js similarity index 100% rename from application/palemoon/base/content/sync/progress.js rename to application/palemoon/components/sync/progress.js diff --git a/application/palemoon/base/content/sync/progress.xhtml b/application/palemoon/components/sync/progress.xhtml similarity index 100% rename from application/palemoon/base/content/sync/progress.xhtml rename to application/palemoon/components/sync/progress.xhtml diff --git a/application/palemoon/base/content/sync/quota.js b/application/palemoon/components/sync/quota.js similarity index 100% rename from application/palemoon/base/content/sync/quota.js rename to application/palemoon/components/sync/quota.js diff --git a/application/palemoon/base/content/sync/quota.xul b/application/palemoon/components/sync/quota.xul similarity index 100% rename from application/palemoon/base/content/sync/quota.xul rename to application/palemoon/components/sync/quota.xul diff --git a/application/palemoon/base/content/sync/setup.js b/application/palemoon/components/sync/setup.js similarity index 100% rename from application/palemoon/base/content/sync/setup.js rename to application/palemoon/components/sync/setup.js diff --git a/application/palemoon/base/content/sync/setup.xul b/application/palemoon/components/sync/setup.xul similarity index 100% rename from application/palemoon/base/content/sync/setup.xul rename to application/palemoon/components/sync/setup.xul diff --git a/application/palemoon/base/content/sync/utils.js b/application/palemoon/components/sync/utils.js similarity index 100% rename from application/palemoon/base/content/sync/utils.js rename to application/palemoon/components/sync/utils.js