473485 - snarf is no longer built by default in js.cpp, among other reverted changes

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Jeff Walden [:Waldo]]

http://hg.mozilla.org/mozilla-central/file/229681f85e7a/js/src/js.cpp#l3105

Present there...

http://hg.mozilla.org/mozilla-central/file/bac73f9f2d2b/js/src/js.cpp

...but no longer present there.

Also looks like a number of other changes got backed out at the same time, i.e. mention of the -j argument in ./js --help.

Comment 1

[Jeff Walden [:Waldo]]

hg di -r88d865ffd0a9:bac73f9f2d2b js.cpp | less

Comment 2

[Phil Ringnalda (:philor)]

Makes me dizzy.

So Brendan landed that in tracemonkey's js/src/js.cpp 2008-12-16, then Ted moved mozilla-central's js/src/js.cpp (which didn't yet have it) to js/src/shell/js.ccp 11:00 Christmas Eve, then the tree caught fire and everyone ignored it, then 17:26 Christmas Day sayrer merged tracemonkey into the burning tree, successfully putting that into js/src/shell/js.cpp, then 19:30 Christmas Day I backed out Ted's move, and hg backout thought it ought to revert a rename by putting back the js/src/js.cpp that was there before the rename, rather than by renaming the current js/src/shell/js.cpp with the merge.

Guess we probably need to look at every change in that Christmas merge to be sure of what touched any of js/src/Makefile.in, js/src/config/autoconf.mk.in, js/src/configure.in, js/src/editline/Makefile.in, and js/src/js.cpp, to see if hg backout felt the need to revert anything else.

Comment 3

[Phil Ringnalda (:philor)]

And while the diff from comment 1 (reversed) looks like an easy way to fix it, is it really sane? The way it's putting an #ifdef XP_WIN inside an #ifdef XP_UNIX makes me hope that's not actually putting it back like it was.

Comment 4

[Phil Ringnalda (:philor)]

Oh, apparently, so, since that's just what http://hg.mozilla.org/mozilla-central/rev/ac84a530de97 did

Comment 5

[Phil Ringnalda (:philor)]

Attachment: Undo, v1

I think this is all of it except the XP_WIN in XP_UNIX that I don't want to own blame on.

Comment 6

[Phil Ringnalda (:philor)]

Bet if I'd thought to cc Ted, he would have told me not to bother unscrewing js/src/js.cpp since he was about to move it back to js/src/shell/ again, and then I could have avoide raising questions about my sanity with that nsprpub/configure change that I didn't notice until it refused to apply. Too.

Comment 7

[(not currently active) Ted Mielczarek]

Oh yeah, heads up on that. :-)

Comment 8

[Jason Orendorff [:jorendorff]]

What's the status of this bug?  snarf is needed to do anything that touches imacros.

Comment 9

[Phil Ringnalda (:philor)]

Attachment: 2

Comment 10

[Jason Orendorff [:jorendorff]]

Comment on attachment 358340 [details] [diff] [review]
2

That looks good to me.  Thanks.

Comment 11

[Phil Ringnalda (:philor)]

http://hg.mozilla.org/mozilla-central/rev/5042081085b5