557210 - Update MozillaBuild's Mercurial to version 1.5.x

Status: RESOLVED FIXED

(Firefox Build System :: MozillaBuild, task)

Description

[Mitchell Field [:Mitch]]

The currently-used version is 1.2.1 (2009-03-20). MozillaBuild should have a newer version, and the latest is 1.5.1 (2010-04-01).

Comment 1

[Justin Wood (:Callek)]

Attachment: v1

Ok few things.

1) This is untested, since I hear that the MozBuild "build" requires a very very specific setup, I can't be sure I have the correct setup.
2) Mercurial transitioned from a .exe installer to a .msi installer, thus the invoke method changed.
3) Did I mention this is untested?
4) The 1.4.x Mercurial.ini does not have a winmerge line at all, so I hand-modified the .patch for that file
5) (locally) I did a full addremove rather than renameing the old installer to the new spot, I figure with binary installer files, this will probably be best, but if you want a real rename/move thats file.
6) Assume Mercurial-1.2.1.exe is |hg rm|ed and actually deleted, and assume we added a mercurial-1.5.4.msi in its place from http://bitbucket.org/tortoisehg/thg-winbuild/downloads/mercurial-1.5.4.msi (Its not in attached because the patch was too big for bugzilla with it)

I'm happy to adjust this patch as needed, but I don't anticipate being able to test the patch[es] anytime soon.

Comment 2

[Justin Wood (:Callek)]

Comment on attachment 450047 [details] [diff] [review]
v1

whops, requested from the wind is not what I meant

Comment 3

[(not currently active) Ted Mielczarek]

Comment on attachment 450047 [details] [diff] [review]
v1

>diff --git a/packageit.py b/packageit.py
>--- a/packageit.py
>+++ b/packageit.py
>@@ -114,9 +114,8 @@
>             "/DIR=" + join(stagedir, "mozilla-build", "msys"),
>             # "/VERYSILENT", "/SUPRESSMSGBOXES",
>             "/SP-", "/NOICONS"])
>-check_call([join(sourcedir, "Mercurial-1.2.1.exe"),
>-            "/DIR=" + join(stagedir, "mozilla-build", "hg"),
>-            "/SP-", "/NOICONS"])
>+check_call(["msiexec", "/i", 
>+            join(sourcedir, "mercurial-1.5.4.msi")])

This isn't going to work right. You need to pass the target install dir to the installer command so that it points at the right directory. (The MozillaBuild build process sucks, but it doesn't require manually entering install locations.)

Comment 4

[(not currently active) Ted Mielczarek]

Stealing back. I tweaked your patch and got it working. I'll post a download link in a minute.

Comment 5

[(not currently active) Ted Mielczarek]

Test build with hg 1.5.4:
http://people.mozilla.com/~tmielczarek/MozillaBuildSetup1.5pre.exe

Comment 6

[(not currently active) Ted Mielczarek]

Pushed to m-b:
http://hg.mozilla.org/mozilla-build/rev/2527ef742292