847508 - Allow using mach with comm-central after bug 840588

Status: RESOLVED FIXED

(Firefox Build System :: Mach Core, enhancement)

Description

[Jens Hatlak (:InvisibleSmiley)]

Since bug 840588, starting mach from the root of comm-central checkout results in the following error message:

Could not run mach: No mach source directory found

This is because there is no "mach" in comm-central, only under "mozilla" which is automatically created by comm-central's client.py.

Maybe we could simply create a "mach" wrapper script at the root of the comm-central repository, doing "exec mozilla/mach $@" or something like that.

Comment 1

[Gregory Szorc [:gps]]

Try copying the mach from m-c into c-c and change the path to look for source to include 'mozilla/'.

Comment 2

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

I copied the mach from m-c to c-c root, and did these changes:
-    mach_path = os.path.join(dir_path, "mozilla/build/mach_bootstrap.py")
+    mach_path = os.path.join(dir_path, "build/mach_bootstrap.py")
     if os.path.isfile(mach_path):
-        mach = load_mach(os.path.join(dir_path, "mozilla"))
+        mach = load_mach(dir_path)

Then calling ./mach in c-c the build runs, but I get:

 0:15.03 configure: error: --enable-application value not recognized (mail/build.mk does not exist).
 0:15.03 *** Fix above errors and then restart with               "/Applications/Xcode.app/Contents/Developer/usr/bin/make -f client.mk build"
 0:15.03 make[2]: *** [configure] Error 1
 0:15.03 make[1]: *** [/Users/kewisch/mozilla/comm-central/mozilla/objdir-tb/Makefile] Error 2
 0:15.03 make: *** [build] Error 2


Looks like its cwd is mozilla/

Comment 3

[Jens Hatlak (:InvisibleSmiley)]

Philipp: Same with me (with suite instead of mail). I didn't see how I could change the start path from the wrapper script (so that c-c's configure would be called instead of m-c's) without breaking mach's bootstrapping.

BTW it is enough to add the following line above the mach_path assignment:
    dir_path = os.path.join(dir_path, "mozilla")
since the original dir_path is not needed anymore afterwards.

Comment 4

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Forget any previous changes, the trick is to add a custom bootstrap function that calls:

 mach.load_commands_from_file(os.path.join(topsrcdir, "mozilla", path))

mach.main.Mach() needs to be called with the real topsrcdir, but the commands need to be loaded from the mozila subdir.

For fixing this bug I'd probably prefer a more global solution that allows using the mozilla mach directly, but it should be quite easy to create a custom boostrap function in a copy that is in the comm-central repo.

Comment 5

[Matt Brubeck (:mbrubeck)]

Attachment: mozilla-central patch

This patch adds an optional mozilla_dir argument to the mozilla-central mach_bootstrap file, for cases where the mozilla directory is not the topsrcdir.

Comment 6

[Matt Brubeck (:mbrubeck)]

Attachment: comm-central patch

This adds a mach_bootstrap file to comm-central/build which in turn loads the mozilla/build/mach_bootstrap file.

Comment 7

[Gregory Szorc [:gps]]

Comment on attachment 722362 [details] [diff] [review]
mozilla-central patch

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

Short and elegant - I like it!

Comment 8

[Justin Wood (:Callek)]

Comment on attachment 722363 [details] [diff] [review]
comm-central patch

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

I know nothing about mach, so I'm going to punt review to gps, while not technically a c-c build peer his review will be fine here

Comment 9

[Gregory Szorc [:gps]]

Comment on attachment 722363 [details] [diff] [review]
comm-central patch

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

Did you also chmod +x make.py? I was noticing that a few files in comm-central are missing the execute bit. I'm pretty sure this is one of them.

Comment 10

[Matt Brubeck (:mbrubeck)]

(In reply to Gregory Szorc [:gps] from comment #9)
> Did you also chmod +x make.py? I was noticing that a few files in
> comm-central are missing the execute bit. I'm pretty sure this is one of
> them.

Sorry, I couldn't figure out how to get Mercurial to pick up permission changes on my Windows box.  I'll that for someone to do in a separate bug...

http://hg.mozilla.org/comm-central/rev/4c46112cb677
https://hg.mozilla.org/mozilla-central/rev/0e7639e3bdfb

Comment 11

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/0e7639e3bdfb

Comment 12

[Matt Brubeck (:mbrubeck)]

Follow-up fix for 'make check' error on comm-central:
http://hg.mozilla.org/comm-central/rev/d4e20bfa3cce

Comment 13

[Justin Wood (:Callek)]

(In reply to Matt Brubeck (:mbrubeck) from comment #10)
> Sorry, I couldn't figure out how to get Mercurial to pick up permission
> changes on my Windows box.  I'll that for someone to do in a separate bug...

Yea, thats a problem. You have to use a unix based OS for mercurial to notice chmod changes to existing files. You *might* be able to cheat with some MQ manual munging, but its been a while since I tried that so can't recall if it works.