From 36bda6fd1b685f8de573e95d88d778eab640bd02 Mon Sep 17 00:00:00 2001 From: "scott%scott-macgregor.org" Date: Thu, 12 Feb 2004 05:45:10 +0000 Subject: [PATCH] Bug #232011 Should effect thunderbird only. Thunderbird changes for using the xul pre-processor to generate the locale version. No more need for contents.rdf.in files. --- allmakefiles.sh | 7 ------- mail/base/jar.mn | 6 +++--- .../inspector/content/{contents.rdf.in => contents.rdf} | 2 +- mail/extensions/inspector/jar.mn | 2 +- .../offline/content/{contents.rdf.in => contents.rdf} | 2 +- mail/extensions/offline/jar.mn | 4 ++-- .../offline/locale/{contents.rdf.in => contents.rdf} | 2 +- mail/extensions/smime/content/contents.rdf | 2 +- mail/extensions/smime/content/msgCompSMIMEOverlay.xul | 2 -- mail/extensions/smime/jar.mn | 2 +- 10 files changed, 11 insertions(+), 20 deletions(-) rename mail/extensions/inspector/content/{contents.rdf.in => contents.rdf} (97%) mode change 100755 => 100644 rename mail/extensions/offline/content/{contents.rdf.in => contents.rdf} (95%) mode change 100755 => 100644 rename mail/extensions/offline/locale/{contents.rdf.in => contents.rdf} (92%) mode change 100755 => 100644 diff --git a/allmakefiles.sh b/allmakefiles.sh index 54501c6a92ef..6a7ed0112cec 100755 --- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -943,13 +943,6 @@ mail/extensions/offline/Makefile mail/extensions/inspector/Makefile mail/config/Makefile xpfe/components/build2/Makefile -mail/base/content/contents.rdf -mail/base/content/help.rdf -mail/base/content/messenger-views.rdf -mail/base/content/navigator.rdf -mail/extensions/offline/content/contents.rdf -mail/extensions/offline/locale/contents.rdf -mail/extensions/inspector/content/contents.rdf " MAKEFILES_standalone_composer=" diff --git a/mail/base/jar.mn b/mail/base/jar.mn index 4f4def29a789..92926b70dafc 100644 --- a/mail/base/jar.mn +++ b/mail/base/jar.mn @@ -1,5 +1,5 @@ messenger.jar: -+ content/messenger/contents.rdf (content/contents.rdf) +*+ content/messenger/contents.rdf (content/contents.rdf) *+ content/messenger/mail3PaneWindowVertLayout.xul (content/mail3PaneWindowVertLayout.xul) + content/messenger/mailTasksOverlay.xul (content/mailTasksOverlay.xul) *+ content/messenger/mailWindow.js (content/mailWindow.js) @@ -27,7 +27,7 @@ messenger.jar: *+ content/messenger/junkMail.xul (content/junkMail.xul) *+ content/messenger/junkMail.js (content/junkMail.js) *+ content/messenger/msgSelectOffline.xul (content/msgSelectOffline.xul) -+ content/messenger-views/contents.rdf (content/messenger-views.rdf) +*+ content/messenger-views/contents.rdf (content/messenger-views.rdf) content/messenger/about-thunderbird.png (content/about-thunderbird.png) classic.jar: @@ -99,7 +99,7 @@ classic.jar: skin/classic/messenger/icons/unreadmail.png (skin/icons/unreadmail.png) comm.jar: - content/help/contents.rdf (content/help.rdf) +* content/help/contents.rdf (content/help.rdf) content/help/contextHelp.js (content/contextHelp.js) *+ content/communicator/contentAreaClick.js (content/contentAreaClick.js) diff --git a/mail/extensions/inspector/content/contents.rdf.in b/mail/extensions/inspector/content/contents.rdf old mode 100755 new mode 100644 similarity index 97% rename from mail/extensions/inspector/content/contents.rdf.in rename to mail/extensions/inspector/content/contents.rdf index 4d4c4c7b617f..67ba8dcd3c9c --- a/mail/extensions/inspector/content/contents.rdf.in +++ b/mail/extensions/inspector/content/contents.rdf @@ -12,7 +12,7 @@ chrome:displayName="Document Inspector" chrome:author="Joe Hewitt" chrome:name="inspector" - chrome:localeVersion="@MOZILLA_LOCALE_VERSION@" +#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__" chrome:skinVersion="1.5"> diff --git a/mail/extensions/inspector/jar.mn b/mail/extensions/inspector/jar.mn index 9816e95b1ce8..731082ca9d4b 100755 --- a/mail/extensions/inspector/jar.mn +++ b/mail/extensions/inspector/jar.mn @@ -1,3 +1,3 @@ inspector.jar: -+ content/inspector/contents.rdf (content/contents.rdf) +*+ content/inspector/contents.rdf (content/contents.rdf) + content/inspector/tasksOverlay.xul (content/tasksOverlay.xul) diff --git a/mail/extensions/offline/content/contents.rdf.in b/mail/extensions/offline/content/contents.rdf old mode 100755 new mode 100644 similarity index 95% rename from mail/extensions/offline/content/contents.rdf.in rename to mail/extensions/offline/content/contents.rdf index 93546153d7c9..6779d8d056b1 --- a/mail/extensions/offline/content/contents.rdf.in +++ b/mail/extensions/offline/content/contents.rdf @@ -17,7 +17,7 @@ chrome:description="This extension adds offline support to Mozilla Thunderbird." chrome:extension="true" chrome:settingsURL="chrome://messenger-offline/content/pref-offline.xul" - chrome:localeVersion="@MOZILLA_LOCALE_VERSION@" +#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__" chrome:skinVersion="1.5"> diff --git a/mail/extensions/offline/jar.mn b/mail/extensions/offline/jar.mn index 545d033d2f6e..ffdac2097a73 100644 --- a/mail/extensions/offline/jar.mn +++ b/mail/extensions/offline/jar.mn @@ -1,13 +1,13 @@ offline.jar: * content/messenger-offline/msgOfflineOverlay.xul (content/msgOfflineOverlay.xul) * content/messenger-offline/mail-offline.js (content/mail-offline.js) - content/messenger-offline/contents.rdf (content/contents.rdf) +* content/messenger-offline/contents.rdf (content/contents.rdf) * content/messenger-offline/pref-offline.xul (content/pref-offline.xul) offline.jar: locale/en-US/messenger-offline/offline.properties (locale/offline.properties) locale/en-US/messenger-offline/offline.dtd (locale/offline.dtd) locale/en-US/messenger-offline/pref-offline.dtd (locale/pref-offline.dtd) - locale/en-US/messenger-offline/contents.rdf (locale/contents.rdf) +* locale/en-US/messenger-offline/contents.rdf (locale/contents.rdf) diff --git a/mail/extensions/offline/locale/contents.rdf.in b/mail/extensions/offline/locale/contents.rdf old mode 100755 new mode 100644 similarity index 92% rename from mail/extensions/offline/locale/contents.rdf.in rename to mail/extensions/offline/locale/contents.rdf index f29009befff8..9591d59f3ce9 --- a/mail/extensions/offline/locale/contents.rdf.in +++ b/mail/extensions/offline/locale/contents.rdf @@ -19,5 +19,5 @@ +#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"/> diff --git a/mail/extensions/smime/content/contents.rdf b/mail/extensions/smime/content/contents.rdf index 6d1d1dacdf5d..9254944d2d64 100644 --- a/mail/extensions/smime/content/contents.rdf +++ b/mail/extensions/smime/content/contents.rdf @@ -13,7 +13,7 @@ chrome:displayName="Messenger" chrome:author="mozilla.org" chrome:name="messenger-smime" - chrome:localeVersion="1.7a" +#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__" chrome:skinVersion="1.5"> diff --git a/mail/extensions/smime/content/msgCompSMIMEOverlay.xul b/mail/extensions/smime/content/msgCompSMIMEOverlay.xul index 2f8f0739378e..0c17738b9018 100644 --- a/mail/extensions/smime/content/msgCompSMIMEOverlay.xul +++ b/mail/extensions/smime/content/msgCompSMIMEOverlay.xul @@ -27,8 +27,6 @@ - -