691411 - Move js/src/xpconnect to js/xpconnect

Status: RESOLVED FIXED

(Core :: XPConnect, defect)

Description

[Bobby Holley (:bholley)]

Spun off from bug 688012 - this is long-overdue.

Comment 1

[Bobby Holley (:bholley)]

Attachment: part 1 - Remove various dead directories in XPConnect. v1

The first patch here just gets rid of some dead code. Flagging khuey for review, since I know how much he likes negative diffs. ;-)

Comment 2

[Bobby Holley (:bholley)]

Attachment: part 2 - Move js/src/xpconnect to js/xpconnect and rename source files while we're at it. v1

This patch does the move.

We've also been wanting to capitalize the source files in XPConnect, but haven't been able to because, among other things, pure recasings break on windows. Since we're already moving these files, this is an excellent opportunity to recase them as well.

Flagging khuey for the nitty-gritty details. Flagging mrbkap for sr to get his stamp of approval on the whole operation.

I plan to lands the changes here along with the ones in bug 688012 to minimize the disruption in peoples' patch queues.

Comment 3

[Johnny Stenback (:jst)]

This will conflict pretty badly with peterv's nodelist binding changes in bug 648801. The changes there are rather large, so it would probably make sense to land this after bug 648801. And the changes there should land very soon now.

Comment 4

[Bobby Holley (:bholley)]

(In reply to Johnny Stenback (:jst, [e-mail]) from comment #3)
> This will conflict pretty badly with peterv's nodelist binding changes in
> bug 648801. The changes there are rather large, so it would probably make
> sense to land this after bug 648801. And the changes there should land very
> soon now.

Sure.

I think the patches can still be reviewed by khuey. We can hold off on blake's sr until peterv's stuff lands.

Comment 5

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Comment on attachment 564328 [details] [diff] [review]
part 1 - Remove various dead directories in XPConnect. v1

I didn't look very closely at this.

Comment 6

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Comment on attachment 564333 [details] [diff] [review]
part 2 - Move js/src/xpconnect to js/xpconnect and rename source files while we're at it. v1

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

This looks fine, but perhaps we should consider condensing things even more (e.g. merging public/ and src/, etc).

::: dom/base/Makefile.in
@@ +136,5 @@
>  include $(topsrcdir)/config/rules.mk
>  
>  LOCAL_INCLUDES += \
> +		-I$(srcdir)/../../js/xpconnect/src \
> +		-I$(srcdir)/../../js/xpconnect/wrappers \

Since we're here anyways, use $(topsrcdir)?

Comment 7

[Blake Kaplan (:mrbkap) (inactive)]

Comment on attachment 564333 [details] [diff] [review]
part 2 - Move js/src/xpconnect to js/xpconnect and rename source files while we're at it. v1

This is going to hurt my muscle memory for a while. Let's do it.

Comment 8

[Bobby Holley (:bholley)]

This landed to mozilla-central and appears to have stuck:

http://hg.mozilla.org/mozilla-central/rev/80d7e83b7659
http://hg.mozilla.org/mozilla-central/rev/51541b56d20d

It also required a followup fix for the dom_quickstubs.h dependency, which caused a race condition where the build might fail (but never on try :\ ):

http://hg.mozilla.org/mozilla-central/rev/6d5fd5a30c71

Resolving fixed.