802706 - Remove usage of NSPRFormatTime.h from tree

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Isaac Aggrey [:isaac]]

Bug 794510 used a workaround for the NO_NSPR_10_SUPPORT macro by creating a new header NSPRFormatTime.h that temporarily undefines and redefines it in order to use PR_FormatTime() and PR_FormatTimeUSEnglish(): http://mxr.mozilla.org/mozilla-central/source/nsprpub/pr/include/prtime.h#258

Bug 794510 comment 5 - 7 has a bit more background.

Comment 1

[Brian Smith (:briansmith, :bsmith, use NEEDINFO?)]

After bug 804833, PR_FormatTime and PR_FormatTimeUSEnglish are exposed even with -DNO_NSPR_10_SUPPORT.

Isaac, I am assigning this bug to you since you did the original work and this seems like something you're interested in.

Comment 2

[Isaac Aggrey [:isaac]]

(In reply to Brian Smith (:bsmith) from comment #1)
> Isaac, I am assigning this bug to you since you did the original work and
> this seems like something you're interested in.

Thanks Brian. Now with bug 804833, it should be a straightforward removal.

Comment 3

[(no longer active)]

Note that we should probably wait for bug 804833 to hit mozilla-central as part of an NSPR release before we can land the fix to this bug.

Comment 4

[Isaac Aggrey [:isaac]]

(In reply to Ehsan Akhgari [:ehsan] from comment #3)
> Note that we should probably wait for bug 804833 to hit mozilla-central as
> part of an NSPR release before we can land the fix to this bug.

Right, I plan to hold off on posting a patch until then.

Comment 5

[(no longer active)]

Isaac, now that bug 804833 is fixed, do you wanna take this on?  Thanks!

Comment 6

[Isaac Aggrey [:isaac]]

(In reply to Ehsan Akhgari [:ehsan] from comment #5)
> Isaac, now that bug 804833 is fixed, do you wanna take this on?  Thanks!

Yep, bug 804833 was The One. Patch coming shortly...

Comment 7

[Isaac Aggrey [:isaac]]

Attachment: Patch

Try results in progress: https://tbpl.mozilla.org/?tree=Try&rev=7fcb994af3a2

Comment 8

[(no longer active)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/da25394a8b55

Comment 9

[(no longer active)]

Backed out because of build bustage: https://hg.mozilla.org/integration/mozilla-inbound/rev/e84da482e8ab

https://tbpl.mozilla.org/?tree=Mozilla-Inbound&rev=da25394a8b55

Comment 10

[Isaac Aggrey [:isaac]]

Attachment: Patch, v2

Sorry about that. This patch will work, I forgot to refresh my MQ for the last file (nsCertTree.cpp) I had to modify...

Comment 11

[Mozilla RelEng Bot]

Try run for 7fcb994af3a2 is complete.
Detailed breakdown of the results available here:
    https://tbpl.mozilla.org/?tree=Try&rev=7fcb994af3a2
Results (out of 254 total builds):
    exception: 26
    success: 65
    warnings: 4
    failure: 159
Builds (or logs if builds failed) available at:
http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/[e-mail]-7fcb994af3a2

Comment 12

[(no longer active)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/d391bed7d0fd

Comment 13

[Masatoshi Kimura [:emk]]

Please wait until the patch has been merged into mozilla-central.

Comment 14

[Ryan VanderMeulen [:RyanVM]]

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

Comment 15

[Isaac Aggrey [:isaac]]

(In reply to Masatoshi Kimura [:emk] from comment #13)
> Please wait until the patch has been merged into mozilla-central.

Sorry about that, I misread the exchange in bug 804833, comment 3.

Comment 16

[Justin Wood (:Callek)]

Can someone get http://mxr.mozilla.org/comm-central/source/mozilla/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp#13 removed as well. (I don't have an up-to-date tree atm, as in, it has lots of csets from a project branch)

Its currently busting SeaMonkey.

Comment 17

[Isaac Aggrey [:isaac]]

(In reply to Justin Wood (:Callek) from comment #16)
> Can someone get
> http://mxr.mozilla.org/comm-central/source/mozilla/extensions/gnomevfs/
> nsGnomeVFSProtocolHandler.cpp#13 removed as well. (I don't have an
> up-to-date tree atm, as in, it has lots of csets from a project branch)
> 
> Its currently busting SeaMonkey.

Sorry again, a lot of embarrassing mistakes for such a trivial bug...Ms2ger has fixed the issue on the latest version of the tree: http://hg.mozilla.org/mozilla-central/rev/4df2bf1d77e9

Thanks for that, Ms2ger.

Comment 18

[Mozilla RelEng Bot]

Try run for 7fcb994af3a2 is complete.
Detailed breakdown of the results available here:
    https://tbpl.mozilla.org/?tree=Try&rev=7fcb994af3a2
Results (out of 255 total builds):
    exception: 26
    success: 65
    warnings: 4
    failure: 160
Builds (or logs if builds failed) available at:
http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/[e-mail]-7fcb994af3a2