1248027 - AppConstants.SOURCE_REVISION_URL switched from `` to `1` for unofficial builds

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Matthew N. [:MattN]]

The comment says:
> // URL to the hg revision this was built from (e.g.
> // "https://hg.mozilla.org/mozilla-central/rev/6256ec9113c1")
> // On unofficial builds, this is an empty string.

but http://hg.mozilla.org/mozilla-central/rev/51029f4d82d3#l14.20 changed it to return `1` via `#define MOZ_SOURCE_URL` which broke https://mxr.mozilla.org/mozilla-central/source/browser/tools/mozscreenshots/head.js?rev=59049fe7a107&mark=29#23

Comment 1

[Michael Shal [:mshal]]

There appears to be a difference between how preprocessor.py and cpp treat '#define FOO' in a source file. preprocessor.py has the value as '1', while cpp is an empty string. (Both preprocessor.py and cpp treat '-DFOO' on the command-line as if it were '-DFOO=1', which is probably why preprocessor.py does this for the #define case as well).

I'm testing out a patch that makes preprocessor.py behave more like cpp, which should fix this. But if that causes other problems we should probably just do something like:

#ifdef MOZ_SOURCE_URL
  SOURCE_REVISION_URL: "@MOZ_SOURCE_URL@",
#else
  SOURCE_REVISION_URL: "",
#endif

Comment 2

[Michael Shal [:mshal]]

Attachment: 0001-Bug-1248027-define-FOO-should-use-an-empty-value-not.patch

Comment 3

[Mike Hommey [:glandium]]

Comment on attachment 8720010 [details] [diff] [review]
0001-Bug-1248027-define-FOO-should-use-an-empty-value-not.patch

Review of attachment 8720010 [details] [diff] [review]:
-----------------------------------------------------------------

Please add a test for -DFOO on the command line (there are a few tests with command line handling, if you need examples)

Comment 4

[Michael Shal [:mshal]]

Attachment: 0001-Bug-1248027-define-FOO-should-use-an-empty-value-not.patch

Now with a new test case.

Comment 5

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/3a5db049a13e

Comment 6

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/3a5db049a13e

Comment 7

[Pulsebot]

https://hg.mozilla.org/integration/fx-team/rev/dbba65699809

Comment 8

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/dbba65699809