235325 - AC_SUBST should not be needed for locale and region version

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, defect)

Description

[Robert Kaiser]

see http://lxr.mozilla.org/mozilla/source/configure.in#5416

we should not need to AC_SUBST the two variables of chrome-versions.sh, as we
should be using the XUL preprocessor for replacing, and that doesn't need
AC_SUBST (we have the AC_DEFINE_UNQUOTED for that).

For removing them, we should be sure the C preprocessor isn't used for those
replacements. I did a quick find for "*.rdf.in" in my tree, and found those
files though:

./toolkit/content/contents-platform.rdf.in
./toolkit/content/contents.rdf.in
./toolkit/content/contents-region.rdf.in
./toolkit/components/passwordmgr/resources/content/contents.rdf.in
./toolkit/components/passwordmgr/resources/locale/contents.rdf.in
./toolkit/mozapps/contents-content.rdf.in
./toolkit/mozapps/contents-locale.rdf.in
./toolkit/locale/contents-platform.rdf.in
./toolkit/locale/contents.rdf.in
./toolkit/locale/contents-region.rdf.in
./browser/extensions/inspector/content/contents.rdf.in

We should look into changing them to the XUL proprocessor before fixing this bug.

Comment 1

[Robert Kaiser]

A current lxr search for MOZILLA_LOCALE_VERSION still turns up the following:

/toolkit/components/passwordmgr/resources/content/contents.rdf.in, line 15 --
chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
/toolkit/components/passwordmgr/resources/locale/contents.rdf.in, line 25 --
chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
/toolkit/content/contents-platform.rdf.in, line 15 --
chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">
/toolkit/content/contents.rdf.in, line 15 --
chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
/toolkit/locale/contents-platform.rdf.in, line 23 --
chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
/toolkit/locale/contents.rdf.in, line 15 --
chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"
/toolkit/locale/contents.rdf.in, line 27 --
chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
/toolkit/mozapps/contents-locale.rdf.in, line 21 --
chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
/toolkit/mozapps/contents-content.rdf.in, line 16 --
chrome:localeVersion="@MOZILLA_LOCALE_VERSION@">

For MOZILLA_REGION_VERSION, I get:

/toolkit/content/contents-region.rdf.in, line 15 --
chrome:localeVersion="@MOZILLA_REGION_VERSION@">
/toolkit/locale/contents-region.rdf.in, line 16 --
chrome:localeVersion="@MOZILLA_REGION_VERSION@"
/toolkit/locale/contents-region.rdf.in, line 28 --
chrome:localeVersion="@MOZILLA_REGION_VERSION@"/>

bsmedberg:
If those files are still needing those variables anyways, shouldn't they be
moved to using the XUL preprocessor instead the C preprocessor?

If yes, as a remark to myself, the AC_SUBST is now at
http://lxr.mozilla.org/mozilla/source/configure.in#6036

Comment 2

[Benjamin Smedberg]

c:localeVersion is obsolete/unused for the toolkit; the simple solution is to
remove the references to MOZILLA_(LOCALE|REGION)_VERSION altogether, and remove
the variables.

Comment 3

[Robert Kaiser]

Attachment: remove those two AC_SUBST lines

Sometimes time works in favor of such bugs :)
The toolkit files are now free of those vars, they're only used in SeaMonkey nowadays, and by the chrome preprocessor, which doesn't need the AC_SUBST.

This patch just removes those lines to clean things up a bit.

Comment 4

[Robert Kaiser]

Checked into trunk.

Comment 5

[Daniel C]

References to http://lxr.mozilla.org/mozilla/ searches for:

Filenames with .rdf.in: http://lxr.mozilla.org/mozilla/find?string=%5C.rdf%5C.in
Files with MOZILLA_LOCALE_VERSION: http://lxr.mozilla.org/mozilla/search?string=MOZILLA_LOCALE_VERSION
Files with MOZILLA_REGION_VERSION: 
http://lxr.mozilla.org/mozilla/search?string=MOZILLA_REGION_VERSION

Comment 6

[Robert Kaiser]

(In reply to comment #5)
> References to http://lxr.mozilla.org/mozilla/ searches for:
> 
> Filenames with .rdf.in:
> http://lxr.mozilla.org/mozilla/find?string=%5C.rdf%5C.in

None of those need any of those AC_SUBST lines.

> Files with MOZILLA_LOCALE_VERSION:
> http://lxr.mozilla.org/mozilla/search?string=MOZILLA_LOCALE_VERSION
> Files with MOZILLA_REGION_VERSION: 
> http://lxr.mozilla.org/mozilla/search?string=MOZILLA_REGION_VERSION

all of those should be dealt with the AC_DEFINE_UNQUOTED and don't need the AC_SUBST.

QED