From 814b709ef896e158d46d8be2527f618f5fdc1ee6 Mon Sep 17 00:00:00 2001 From: NTD Date: Fri, 30 Nov 2018 11:55:54 -0500 Subject: [PATCH] Issue #889 - Clean up the Pale Moon tree - Part 1c: Move pageinfo to components --- application/palemoon/base/jar.mn | 8 -------- application/palemoon/components/moz.build | 1 + .../{base/content => components}/pageinfo/feeds.js | 0 .../{base/content => components}/pageinfo/feeds.xml | 0 application/palemoon/components/pageinfo/jar.mn | 13 +++++++++++++ application/palemoon/components/pageinfo/moz.build | 8 ++++++++ .../content => components}/pageinfo/pageInfo.css | 0 .../content => components}/pageinfo/pageInfo.js | 0 .../content => components}/pageinfo/pageInfo.xml | 0 .../content => components}/pageinfo/pageInfo.xul | 2 +- .../content => components}/pageinfo/permissions.js | 0 .../content => components}/pageinfo/security.js | 0 12 files changed, 23 insertions(+), 9 deletions(-) rename application/palemoon/{base/content => components}/pageinfo/feeds.js (100%) rename application/palemoon/{base/content => components}/pageinfo/feeds.xml (100%) create mode 100644 application/palemoon/components/pageinfo/jar.mn create mode 100644 application/palemoon/components/pageinfo/moz.build rename application/palemoon/{base/content => components}/pageinfo/pageInfo.css (100%) rename application/palemoon/{base/content => components}/pageinfo/pageInfo.js (100%) rename application/palemoon/{base/content => components}/pageinfo/pageInfo.xml (100%) rename application/palemoon/{base/content => components}/pageinfo/pageInfo.xul (99%) rename application/palemoon/{base/content => components}/pageinfo/permissions.js (100%) rename application/palemoon/{base/content => components}/pageinfo/security.js (100%) diff --git a/application/palemoon/base/jar.mn b/application/palemoon/base/jar.mn index 323f4a3b18..092993caa0 100644 --- a/application/palemoon/base/jar.mn +++ b/application/palemoon/base/jar.mn @@ -46,14 +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) -* content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) - content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) - content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) - content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) - content/browser/pageinfo/feeds.js (content/pageinfo/feeds.js) - content/browser/pageinfo/feeds.xml (content/pageinfo/feeds.xml) - content/browser/pageinfo/permissions.js (content/pageinfo/permissions.js) - content/browser/pageinfo/security.js (content/pageinfo/security.js) #ifdef MOZ_SERVICES_SYNC content/browser/sync/aboutSyncTabs.xul (content/sync/aboutSyncTabs.xul) content/browser/sync/aboutSyncTabs.js (content/sync/aboutSyncTabs.js) diff --git a/application/palemoon/components/moz.build b/application/palemoon/components/moz.build index 5e3feb1dd0..edc4c75a93 100644 --- a/application/palemoon/components/moz.build +++ b/application/palemoon/components/moz.build @@ -12,6 +12,7 @@ DIRS += [ 'feeds', 'fuel', 'newtab', + 'pageinfo', 'places', 'permissions', 'preferences', diff --git a/application/palemoon/base/content/pageinfo/feeds.js b/application/palemoon/components/pageinfo/feeds.js similarity index 100% rename from application/palemoon/base/content/pageinfo/feeds.js rename to application/palemoon/components/pageinfo/feeds.js diff --git a/application/palemoon/base/content/pageinfo/feeds.xml b/application/palemoon/components/pageinfo/feeds.xml similarity index 100% rename from application/palemoon/base/content/pageinfo/feeds.xml rename to application/palemoon/components/pageinfo/feeds.xml diff --git a/application/palemoon/components/pageinfo/jar.mn b/application/palemoon/components/pageinfo/jar.mn new file mode 100644 index 0000000000..229f991682 --- /dev/null +++ b/application/palemoon/components/pageinfo/jar.mn @@ -0,0 +1,13 @@ +# 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/pageinfo/pageInfo.xul + content/browser/pageinfo/pageInfo.js + content/browser/pageinfo/pageInfo.css + content/browser/pageinfo/pageInfo.xml + content/browser/pageinfo/feeds.js + content/browser/pageinfo/feeds.xml + content/browser/pageinfo/permissions.js + content/browser/pageinfo/security.js \ No newline at end of file diff --git a/application/palemoon/components/pageinfo/moz.build b/application/palemoon/components/pageinfo/moz.build new file mode 100644 index 0000000000..2d64d506c1 --- /dev/null +++ b/application/palemoon/components/pageinfo/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/pageinfo/pageInfo.css b/application/palemoon/components/pageinfo/pageInfo.css similarity index 100% rename from application/palemoon/base/content/pageinfo/pageInfo.css rename to application/palemoon/components/pageinfo/pageInfo.css diff --git a/application/palemoon/base/content/pageinfo/pageInfo.js b/application/palemoon/components/pageinfo/pageInfo.js similarity index 100% rename from application/palemoon/base/content/pageinfo/pageInfo.js rename to application/palemoon/components/pageinfo/pageInfo.js diff --git a/application/palemoon/base/content/pageinfo/pageInfo.xml b/application/palemoon/components/pageinfo/pageInfo.xml similarity index 100% rename from application/palemoon/base/content/pageinfo/pageInfo.xml rename to application/palemoon/components/pageinfo/pageInfo.xml diff --git a/application/palemoon/base/content/pageinfo/pageInfo.xul b/application/palemoon/components/pageinfo/pageInfo.xul similarity index 99% rename from application/palemoon/base/content/pageinfo/pageInfo.xul rename to application/palemoon/components/pageinfo/pageInfo.xul index e3a61d31ee..c7c486ab92 100644 --- a/application/palemoon/base/content/pageinfo/pageInfo.xul +++ b/application/palemoon/components/pageinfo/pageInfo.xul @@ -501,7 +501,7 @@ #ifdef XP_MACOSX -#include ../browserMountPoints.inc +#include ../../base/content/browserMountPoints.inc #endif diff --git a/application/palemoon/base/content/pageinfo/permissions.js b/application/palemoon/components/pageinfo/permissions.js similarity index 100% rename from application/palemoon/base/content/pageinfo/permissions.js rename to application/palemoon/components/pageinfo/permissions.js diff --git a/application/palemoon/base/content/pageinfo/security.js b/application/palemoon/components/pageinfo/security.js similarity index 100% rename from application/palemoon/base/content/pageinfo/security.js rename to application/palemoon/components/pageinfo/security.js