1346659 - Sync mozmake with a newer upstream rev and split out building it from MozillaBuild packaging

Status: RESOLVED FIXED

(Firefox Build System :: MozillaBuild, task)

Description

[Ryan VanderMeulen [:RyanVM]]

Attachment: rough patch

Over in bug 1346643, I'm trying to make MozillaBuild easier to package outside of the custom builder VM so less daunting for new contributors to hack on. One of the big changes to help facilitate that is avoiding building components during the packaging step.

I've already moved autoconf-2.13 and make-3.81.90 to separate prebuilt packages since those are highly unlikely to ever change again before they're deprecated outright. For mozmake, however, I wanted to make it possible to continue updating it in the future should the need arise. Therefore, I created a new make-mozmake.sh script which does the build work previously done in packageit.sh with the end result being an updated mozmake.exe in the main MozillaBuild source directory.

I also used these changes as an opportunity to update to a newer upstream version as there's been a couple releases since our last update. I ended up just grabbing upstream master since even 4.2.1 is already 9 months old. I was able to successfully build it on my host machine from a regular MozillaBuild start-shell-msvc2015.bat shell and have confirmed that I can still successfully build mozilla-central with the resulting binary :)

You may also notice a reference to an upstream subproc build issue in make-mozmake.sh. A post-4.1 commit (rev fb7a7ad I believe) appears to have broken builds with NMake, causing fatal errors after being unable to find glob.h. Adding ../../glob to the list of includes in w32/subproc/NMakefile fixes the issue for me. I've emailed Paul Smith about it as well to see if there's a better solution, but this works for now at least.

I don't want to get too far into the weeds with this since I'm still hoping that MozillaBuild's long-term future is a short one, but I'd still very much like to get any feedback you have on this, Mike!

Comment 1

[Mike Hommey [:glandium]]

Comment on attachment 8846449 [details] [diff] [review]
rough patch

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

::: make-mozmake.sh
@@ +18,5 @@
> +cp NMakefile.template NMakefile
> +nmake -f NMakefile
> +cp WinRel/make.exe "../../mozmake.exe"
> +popd
> +rm -rf mozmake "make-${MAKE_VERSION}.tar.bz2"

Removing the tarball seems a bit extreme considering the script assumes it's here in the first place.

Comment 2

[Ryan VanderMeulen [:RyanVM]]

That's fair, thanks.

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/mozilla-build/rev/717c52754294
Bundle a pre-built mozmake binary and update to upstream rev ga95cb30. r=glandium