It's bee too long without changes in handling localeVersion strings ;-) To be serious, I already talked about this upcoming change in bug 154927 comment #33 This time, we should to the replacement at build time The Right Way (tm) and use the XUL preprocessor. We can go back from contents.rdf.in to contents.rdf, and only have a preprocessor statement in those files. This should make the whole thing easier to deal with. As we've been having the preprocessor in Seamonkey for some time now, it's time to make real use of it. I'll attach a patch very soon, I already have the changes in my tree, I just have to test them now ;-)

Here's the patch. I know, it looks quite big, but it contains renaming the contents*.rdf.in files back to contents*.rdf The real work is in the first few files mentioned (allmakefiles.sh, configure.in, mailnews/makefiles) Be sure to recreate configure from configure.in if you want to test the patch! My tree, from which I generated this patch, built without problems today, and all chrome seems to still work.

of course, much of the "real work" is also adding marks to all affected jar.mn files, so that the preprocessor is used, and adding #expand lines to the files themselves.

Comment on attachment 139791 [details] [diff] [review] patch - power to preprocessor.pl ;-) In configure.in, you shouldn't need the extra "" in the AC_DEFINE_UNQUOTED; please remove them unless they are necessary. I'm trusting you to have done your copy-paste correctly... I didn't pick through all of the contents.rdf with a fine-tooth comb.

Well, I just copied the AC_DEFINE_UNQUOTED from the line where MOZILLA_VERSION is set, and it has the "" set there as well, so I thought we may need them... I can remove them, but I think the new lines should be consistent with that line just above

patch cleaned of conflicts to trunk and checked in right now. For reference - affected files: allmakefiles.sh configure.in mailnews/makefiles xpfe/communicator/jar.mn xpfe/components/prefwindow/resources/locale/en-US/mac/jar.mn xpfe/components/prefwindow/resources/locale/en-US/win/jar.mn xpfe/components/prefwindow/resources/locale/en-US/unix/jar.mn xpfe/components/download-manager/resources/mac/jar.mn xpfe/components/download-manager/resources/win/jar.mn xpfe/components/download-manager/resources/unix/jar.mn xpfe/global/jar.mn xpfe/global/resources/locale/en-US/os2/jar.mn xpfe/browser/jar.mn xpfe/browser/resources/content/mac/jar.mn xpfe/browser/resources/content/win/jar.mn xpfe/browser/resources/content/unix/jar.mn xpfe/browser/resources/locale/en-US/mac/jar.mn xpfe/browser/resources/locale/en-US/win/jar.mn xpfe/browser/resources/locale/en-US/unix/jar.mn mailnews/mapi/resources/content/jar.mn mailnews/jar.mn mailnews/extensions/mdn/jar.mn mailnews/extensions/smime/jar.mn mailnews/extensions/smoketest/jar.mn mailnews/extensions/mailviews/jar.mn editor/ui/jar.mn netwerk/resources/jar.mn security/manager/pki/resources/jar.mn security/manager/ssl/resources/jar.mn layout/html/forms/resources/jar.mn extensions/irc/jar.mn extensions/p3p/jar.mn extensions/help/resources/jar.mn extensions/pref/autoconfig/resources/jar.mn extensions/tasks/jar.mn extensions/tridentprofile/resources/jar.mn extensions/cookie/jar.mn extensions/venkman/resources/jar.mn extensions/wallet/jar.mn extensions/content-packs/resources/jar.mn extensions/inspector/jar.mn extensions/transformiix/resources/buster/jar.mn directory/xpcom/base/resources/jar.mn xpfe/communicator/resources/content/contents-platform.rdf xpfe/communicator/resources/content/contents.rdf xpfe/communicator/resources/content/contents-region.rdf xpfe/communicator/resources/locale/en-US/contents.rdf xpfe/communicator/resources/locale/en-US/contents-region.rdf xpfe/communicator/resources/locale/en-US/unix/contents-platform.rdf xpfe/communicator/resources/locale/en-US/win/contents-platform.rdf xpfe/communicator/resources/locale/en-US/mac/contents-platform.rdf xpfe/components/prefwindow/resources/locale/en-US/mac/contents-platform.rdf xpfe/components/prefwindow/resources/locale/en-US/win/contents-platform.rdf xpfe/components/prefwindow/resources/locale/en-US/unix/contents-platform.rdf xpfe/components/autocomplete/resources/locale/en-US/contents.rdf xpfe/components/download-manager/resources/mac/contents.rdf xpfe/components/download-manager/resources/win/contents.rdf xpfe/components/download-manager/resources/unix/contents.rdf xpfe/global/resources/content/contents-platform.rdf xpfe/global/resources/content/contents.rdf xpfe/global/resources/content/contents-region.rdf xpfe/global/resources/locale/en-US/mac/contents-platform.rdf xpfe/global/resources/locale/en-US/os2/contents-platform.rdf xpfe/global/resources/locale/en-US/win/contents-platform.rdf xpfe/global/resources/locale/en-US/unix/contents-platform.rdf xpfe/global/resources/locale/en-US/contents.rdf xpfe/global/resources/locale/en-US/contents-region.rdf xpfe/global/resources/locale/en-US/brand.dtd xpfe/global/resources/locale/en-US/region.dtd xpfe/browser/resources/content/mac/contents-platform.rdf xpfe/browser/resources/content/win/contents-platform.rdf xpfe/browser/resources/content/unix/contents-platform.rdf xpfe/browser/resources/content/contents.rdf xpfe/browser/resources/content/contents-region.rdf xpfe/browser/resources/locale/en-US/mac/contents-platform.rdf xpfe/browser/resources/locale/en-US/win/contents-platform.rdf xpfe/browser/resources/locale/en-US/unix/contents-platform.rdf xpfe/browser/resources/locale/en-US/contents.rdf xpfe/browser/resources/locale/en-US/contents-region.rdf mailnews/base/resources/content/contents.rdf mailnews/base/resources/content/contents-region.rdf mailnews/base/resources/locale/en-US/contents.rdf mailnews/base/resources/locale/en-US/contents-region.rdf mailnews/mapi/resources/content/contents.rdf mailnews/mapi/resources/locale/en-US/contents.rdf mailnews/extensions/mdn/resources/content/contents.rdf mailnews/extensions/mdn/resources/locale/en-US/contents.rdf mailnews/extensions/smime/resources/content/contents.rdf mailnews/extensions/smime/resources/locale/en-US/contents.rdf mailnews/extensions/smoketest/resources/content/contents.rdf mailnews/extensions/mailviews/resources/content/contents.rdf editor/ui/composer/content/contents.rdf editor/ui/composer/content/contents-region.rdf editor/ui/composer/locale/en-US/contents.rdf editor/ui/composer/locale/en-US/contents-region.rdf netwerk/resources/content/contents.rdf netwerk/resources/locale/en-US/contents.rdf security/manager/pki/resources/content/contents.rdf security/manager/pki/resources/locale/en-US/contents.rdf security/manager/ssl/resources/content/contents.rdf security/manager/ssl/resources/locale/en-US/contents.rdf layout/html/forms/resources/locale/en-US/contents.rdf extensions/irc/xul/content/contents.rdf extensions/irc/xul/locale/en-US/contents.rdf extensions/p3p/resources/content/contents.rdf extensions/p3p/resources/locale/en-US/contents.rdf extensions/help/resources/content/contents.rdf extensions/help/resources/locale/en-US/contents.rdf extensions/pref/autoconfig/resources/content/contents.rdf extensions/pref/autoconfig/resources/locale/en-US/contents.rdf extensions/tasks/resources/content/contents.rdf extensions/tasks/resources/locale/en-US/contents.rdf extensions/tridentprofile/resources/content/contents.rdf extensions/tridentprofile/resources/locale/en-US/contents.rdf extensions/cookie/resources/content/contents.rdf extensions/cookie/resources/locale/en-US/contents.rdf extensions/venkman/resources/content/contents.rdf extensions/venkman/resources/locale/en-US/contents.rdf extensions/wallet/resources/content/contents.rdf extensions/wallet/resources/locale/en-US/contents.rdf extensions/content-packs/resources/content/contents.rdf extensions/content-packs/resources/locale/en-US/contents.rdf extensions/inspector/resources/content/contents.rdf extensions/inspector/resources/locale/en-US/contents.rdf extensions/transformiix/resources/buster/contents.rdf directory/xpcom/base/resources/content/contents.rdf directory/xpcom/base/resources/locale/en-US/contents.rdf xpfe/communicator/resources/content/contents-platform.rdf.in xpfe/communicator/resources/content/contents.rdf.in xpfe/communicator/resources/content/contents-region.rdf.in xpfe/communicator/resources/locale/en-US/contents.rdf.in xpfe/communicator/resources/locale/en-US/contents-region.rdf.in xpfe/communicator/resources/locale/en-US/unix/contents-platform.rdf.in xpfe/communicator/resources/locale/en-US/win/contents-platform.rdf.in xpfe/communicator/resources/locale/en-US/mac/contents-platform.rdf.in xpfe/components/prefwindow/resources/locale/en-US/mac/contents-platform.rdf.in xpfe/components/prefwindow/resources/locale/en-US/win/contents-platform.rdf.in xpfe/components/prefwindow/resources/locale/en-US/unix/contents-platform.rdf.in xpfe/components/autocomplete/resources/locale/en-US/contents.rdf.in xpfe/components/download-manager/resources/mac/contents.rdf.in xpfe/components/download-manager/resources/win/contents.rdf.in xpfe/components/download-manager/resources/unix/contents.rdf.in xpfe/global/resources/content/contents-platform.rdf.in xpfe/global/resources/content/contents.rdf.in xpfe/global/resources/content/contents-region.rdf.in xpfe/global/resources/locale/en-US/mac/contents-platform.rdf.in xpfe/global/resources/locale/en-US/os2/contents-platform.rdf.in xpfe/global/resources/locale/en-US/win/contents-platform.rdf.in xpfe/global/resources/locale/en-US/unix/contents-platform.rdf.in xpfe/global/resources/locale/en-US/contents.rdf.in xpfe/global/resources/locale/en-US/contents-region.rdf.in xpfe/global/resources/locale/en-US/brand.dtd.in xpfe/global/resources/locale/en-US/region.dtd.in xpfe/browser/resources/content/mac/contents-platform.rdf.in xpfe/browser/resources/content/win/contents-platform.rdf.in xpfe/browser/resources/content/unix/contents-platform.rdf.in xpfe/browser/resources/content/contents.rdf.in xpfe/browser/resources/content/contents-region.rdf.in xpfe/browser/resources/locale/en-US/mac/contents-platform.rdf.in xpfe/browser/resources/locale/en-US/win/contents-platform.rdf.in xpfe/browser/resources/locale/en-US/unix/contents-platform.rdf.in xpfe/browser/resources/locale/en-US/contents.rdf.in xpfe/browser/resources/locale/en-US/contents-region.rdf.in mailnews/base/resources/content/contents.rdf.in mailnews/base/resources/content/contents-region.rdf.in mailnews/base/resources/locale/en-US/contents.rdf.in mailnews/base/resources/locale/en-US/contents-region.rdf.in mailnews/mapi/resources/content/contents.rdf.in mailnews/mapi/resources/locale/en-US/contents.rdf.in mailnews/extensions/mdn/resources/content/contents.rdf.in mailnews/extensions/mdn/resources/locale/en-US/contents.rdf.in mailnews/extensions/smime/resources/content/contents.rdf.in mailnews/extensions/smime/resources/locale/en-US/contents.rdf.in mailnews/extensions/smoketest/resources/content/contents.rdf.in mailnews/extensions/mailviews/resources/content/contents.rdf.in editor/ui/composer/content/contents.rdf.in editor/ui/composer/content/contents-region.rdf.in editor/ui/composer/locale/en-US/contents.rdf.in editor/ui/composer/locale/en-US/contents-region.rdf.in netwerk/resources/content/contents.rdf.in netwerk/resources/locale/en-US/contents.rdf.in security/manager/pki/resources/content/contents.rdf.in security/manager/pki/resources/locale/en-US/contents.rdf.in security/manager/ssl/resources/content/contents.rdf.in security/manager/ssl/resources/locale/en-US/contents.rdf.in layout/html/forms/resources/locale/en-US/contents.rdf.in extensions/irc/xul/content/contents.rdf.in extensions/irc/xul/locale/en-US/contents.rdf.in extensions/p3p/resources/content/contents.rdf.in extensions/p3p/resources/locale/en-US/contents.rdf.in extensions/help/resources/content/contents.rdf.in extensions/help/resources/locale/en-US/contents.rdf.in extensions/pref/autoconfig/resources/content/contents.rdf.in extensions/pref/autoconfig/resources/locale/en-US/contents.rdf.in extensions/tasks/resources/content/contents.rdf.in extensions/tasks/resources/locale/en-US/contents.rdf.in extensions/tridentprofile/resources/content/contents.rdf.in extensions/tridentprofile/resources/locale/en-US/contents.rdf.in extensions/cookie/resources/content/contents.rdf.in extensions/cookie/resources/locale/en-US/contents.rdf.in extensions/venkman/resources/content/contents.rdf.in extensions/venkman/resources/locale/en-US/contents.rdf.in extensions/wallet/resources/content/contents.rdf.in extensions/wallet/resources/locale/en-US/contents.rdf.in extensions/content-packs/resources/content/contents.rdf.in extensions/content-packs/resources/locale/en-US/contents.rdf.in extensions/inspector/resources/content/contents.rdf.in extensions/inspector/resources/locale/en-US/contents.rdf.in extensions/transformiix/resources/buster/contents.rdf.in directory/xpcom/base/resources/content/contents.rdf.in directory/xpcom/base/resources/locale/en-US/contents.rdf.in

Hi Kairo, per the rules on tinderbox, it would have been helpful if you gave the thunderbird and firebird owners a heads up so we could have corresponding changes made for mozilla/mail, browser and toolkit.

mscott, if you'd _need_ any such corresponding changes, then yes. You don't _need_ them though, as I could build and run fb and tb sucessfully from my tree with those changes being only in Seamonkey. That's why I didn't inform you. You can pick up that way for fb and tb as well (and it would probably be the nicer way in the long term), but you don't have to, as they build and pick up the version strings from chrome-versions.sh also the previously used way.

aah cool. thanks for the clarification. I'llstill try to convert tbird over to the new way.

FYI, I've made this conversion for thunderbird with lots of help from stephen walker. toolkit and browser still need to be converted.

mscott: nice :) I filed bug 234014 for using the same mechanism for skinVersion.

There's a problem with that patch, apparently.... the region.dtd in my nightly (_after_ preprocessing, presumably) has: <!ENTITY releaseURL "http://www.mozilla.org/releases/mozilla@MOZILLA_VERSION@"> Which is pretty wrong...

OK, this one-liner fixes the regression bz noted...

Comment on attachment 141682 [details] [diff] [review] patch for the region.dtd change I had forgotten fix a regression I caused, so that Help > Release Notes URL was wrong.

REOPENing for the (small) regression with the one-liner fix.

Comment on attachment 141682 [details] [diff] [review] patch for the region.dtd change I had forgotten r=me (no sr needed)

regression fix checked in.