778845 - Must upgrade Aurora 16 to NSPR 4.9.2 final

Status: RESOLVED FIXED

(Core :: General, defect)

Description

[Kai Engert (:KaiE:)]

The Aurora 16 branch currently uses NSPR 4.9.2 beta.
We must upgrade it to 4.9.2 final because of policy.

There was one change between beta and final:


Bug 758837: add a comment to explain the source of the 15-char name length
limit.  Copy the null terminator from the input thread name.  r=honzab.

Comment 1

[Kai Engert (:KaiE:)]

Attachment: dummy patch

Comment 2

[Kai Engert (:KaiE:)]

Please approve and land bug 766038 on Aurora 16, too.

Comment 3

[Kai Engert (:KaiE:)]

Comment on attachment 647243 [details] [diff] [review]
dummy patch

permission from wtc during today's meeting

Comment 4

[Kai Engert (:KaiE:)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/38b216220e60

Comment 5

[Wan-Teh Chang]

(In reply to Kai Engert (:kaie) from comment #4)
> https://hg.mozilla.org/integration/mozilla-inbound/rev/38b216220e60

You forgot to make a dummy change to nsprpub/config/prdepend.h.

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/38b216220e60

Comment 7

[Mike Hommey [:glandium]]

Next time, please use:
$ python client.py update_nspr NSPR_4_9_2_RTM

Comment 8

[Kai Engert (:KaiE:)]

> You forgot to make a dummy change to nsprpub/config/prdepend.h.

yes indeed, I will when landing on aurora (not to readers, this is simply to force a rebuild).


> $ python client.py update_nspr NSPR_4_9_2_RTM

That's what I did? Why do you believe I didn't?
Or do you refer to the contents of the attachment?

Comment 9

[Kai Engert (:KaiE:)]

Wan-Teh, should we file a bug that suggests to enhance the client.py script, to automatically apply a dummy change to the header file, by appending an empty line? We can eventually clean up the lines that get added over time, but it will make sure we won't forget about it.

Comment 10

[Kai Engert (:KaiE:)]

https://hg.mozilla.org/releases/mozilla-aurora/rev/3124a5d23996

Comment 11

[Mike Hommey [:glandium]]

(In reply to Kai Engert (:kaie) from comment #8)
> > $ python client.py update_nspr NSPR_4_9_2_RTM
> 
> That's what I did? Why do you believe I didn't?

Because it should have picked the nsprpub/config/prdepend.h change.

Comment 12

[Mike Hommey [:glandium]]

(In reply to Mike Hommey [:glandium] from comment #11)
> (In reply to Kai Engert (:kaie) from comment #8)
> > > $ python client.py update_nspr NSPR_4_9_2_RTM
> > 
> > That's what I did? Why do you believe I didn't?
> 
> Because it should have picked the nsprpub/config/prdepend.h change.

I mean, it does if I run it...

Comment 13

[Kai Engert (:KaiE:)]

> > Because it should have picked the nsprpub/config/prdepend.h change.
> I mean, it does if I run it...


I don't see code in client.py to update that file.
We do that manually.

If you saw that file changed, then that file in the release is different from the one that you were using in your local tree.
We frequently change this file in order to trigger rebuilds.

If comment 9 I suggest to enhance client.py to automatically add a dummy line to the dummy file whenever we use the script to update NSPR (or NSS, different file), so we won't forget about it and can avoid confusion.

If you like this idea, we should file a bug.

Comment 14

[Wan-Teh Chang]

I think this would be a good change to client.py.

We should be more sophisticated: if the last line of prdepend.h is a blank line,
remove it. Otherwise, append a blank line.

Comment 15

[Kai Engert (:KaiE:)]

> We should be more sophisticated: if the last line of prdepend.h is a blank
> line, remove it. Otherwise, append a blank line.

I've implemented the proposal in bug 782784.