994485 - make desktop client pull and build without needing to hand-hack other repos & symlinks

Status: VERIFIED FIXED

(Hello (Loop) :: Client, defect, P1)

Description

[Dan Mosedale (:dmosedale, :dmose)]

Once we've gotten all the necessary signoffs to make the shared tests and code in loop-client public, we'll need to make the desktop build with loop enabled "Just Work" before we can actually have a candidate for merging into mozilla-central proper.

At the very least, this means that anyone using hg should be able to pull, build, and submit patches to the desktop client without having to go through any more process than they do today.

Comment 1

[Maire Reavy [:mreavy]]

Probably 1 day of work, but 3 days of discussion.

Comment 2

[Dan Mosedale (:dmosedale, :dmose)]

After discussion with Mark, and doing a bunch of think about localization, testing, and deployment questions, we've come to the conclusion that we're going to want to list out and prioritize the various constraints we're trying to satisfy with the new layout.  Mark said he was start an Etherpad on this tomorrow...

Comment 3

[Maire Reavy [:mreavy]]

This is currently blocked by 3rd party negotiations and agreements.  When they are resolved, this work can move forward.  Dan had been driving this and will likely continue (along with Standard8) once 3rd party negotiations have completed.

Comment 4

[Mark Banner (:standard8)]

Stealing as I'm now actively working on this.

The plan initially is to combine loop-client into the gecko/FF code, and then separate out the standalone (link clicker UI) parts later if necessary.

Hence we'll probably move the items in the user story into future bugs.

Comment 5

[Mark Banner (:standard8)]

Attachment: Commands outline

This is the rough outline of the series of commands we need to use to merge to Elm. I'll attach the filemap.txt in a moment.

I've tested this locally and it seems to be working so far. There will be some additional work to get the standalone code up and running again, which I'll handle in follow-up patches.

Comment 6

[Mark Banner (:standard8)]

Attachment: Loop-client to gecko-dev filemap

The aim here is to get everything in approximately the right places, before the merges, and hence have a clean import of changesets.

Once we're in hg, further moves are easy to do.

Comment 7

[Mark Banner (:standard8)]

Attachment: Make standalone tests work

This is a follow-up patch to get the standalone tests working and running in Marionette

Comment 8

[Dan Mosedale (:dmosedale, :dmose)]

Comment on attachment 8430770 [details]
Commands outline

Looks good.  As you mentioned while we were going over it, it'll be important to be sure that test_standalone_all.py gets added towards the end of this process somehow.

Comment 9

[Dan Mosedale (:dmosedale, :dmose)]

As discussed, you may want to bring over the .gitignore into the standalone directory.

Comment 10

[Dan Mosedale (:dmosedale, :dmose)]

Looks good so far; thanks for sorting through all this!

Comment 11

[Mark Banner (:standard8)]

Attachment: Loop-client to gecko-dev filemap v2

Updated for the .gitignore change.

Comment 12

[Mark Banner (:standard8)]

Attachment: Make standalone tests work v2

Updated to include the missing file.

Comment 13

[Mark Banner (:standard8)]

Attachment: Fix the standalone server

I believe this is enough to fix the standalone server - so that we can at least run unit tests from it. From what I can tell, it should fix it so you can make calls properly as well (this will need retesting once bug 976109 is landed).

Comment 14

[Dan Mosedale (:dmosedale, :dmose)]

Comment on attachment 8430956 [details] [diff] [review]
Fix the standalone server

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

r=dmose

Comment 15

[Mark Banner (:standard8)]

Attachment: Rewrite readme; remove redundant make-links.sh

This updates the readme file and removes the now redundant make-links.sh.

Comment 16

[Dan Mosedale (:dmosedale, :dmose)]

Comment on attachment 8431101 [details] [diff] [review]
Rewrite readme; remove redundant make-links.sh

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

r=dmose, with s/stanalone/standalone/

Comment 17

[Mark Banner (:standard8)]

Combined the first two patches into one, both have been landed:

https://hg.mozilla.org/projects/elm/rev/69fbe0ab93ee
https://hg.mozilla.org/projects/elm/rev/6159b4e9f5da

Comment 18

[Mark Banner (:standard8)]

This is now all "fixed" - gecko-dev and loop-client have been merged onto the elm branch.

Marking as fixed for tracking purposes. If we make changes to the structure of repos later, they will be filed as new bugs.

Comment 19

[Mark Banner (:standard8)]

https://hg.mozilla.org/mozilla-central/rev/69fbe0ab93ee
https://hg.mozilla.org/mozilla-central/rev/6159b4e9f5da

Comment 20

[u279076]

Assuming verified -- needinfo me to request QA testing.