660219 - patcher needs to support objdir building

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[[e-mail] (:bhearsum)]

Picking up a very recent revision of mozilla-beta in bug 658094 had the unfortunate side effect of also picking up the bug that forces us to build in an objdir. Patcher needs to learn how to cope with objdirs.

Comment 1

[[e-mail] (:bhearsum)]

Attachment: build in an objdir in patcher

Build patcher tools in an objdir, and change MAR/MBSDIFF variables to point at it.

Worked fine in my manual test.

Comment 2

[Armen [:armenzg]]

Comment on attachment 535617 [details] [diff] [review]
build in an objdir in patcher

*stamp*

Comment 3

[[e-mail] (:bhearsum)]

Comment on attachment 535617 [details] [diff] [review]
build in an objdir in patcher

Landed, and moved the UPDATE_PACKAGING_R14 tag:
cvs commit: Examining .
Checking in MozAUSLib.pm;
/cvsroot/mozilla/tools/patcher/MozAUSLib.pm,v  <--  MozAUSLib.pm
new revision: 1.19; previous revision: 1.18
done
Checking in patcher2.pl;
/cvsroot/mozilla/tools/patcher/patcher2.pl,v  <--  patcher2.pl
new revision: 1.42; previous revision: 1.41
done
$ cvs tag UPDATE_PACKAGING_R14 MozAUSLib.pm patcher2.pl 
W MozAUSLib.pm : UPDATE_PACKAGING_R14 already exists on version 1.18 : NOT MOVING tag to version 1.19
W patcher2.pl : UPDATE_PACKAGING_R14 already exists on version 1.41 : NOT MOVING tag to version 1.42
$ cvs tag -F UPDATE_PACKAGING_R14 MozAUSLib.pm patcher2.pl 
T MozAUSLib.pm
T patcher2.pl

Comment 4

[[e-mail] (:bhearsum)]

Re-validated this in staging.

Comment 5

[[e-mail] (:bhearsum)]

Of course, once my test got to --create-patches I found an issue.

Comment 6

[[e-mail] (:bhearsum)]

Attachment: use OBJDIR when adding dist/host/bin to $PATH

Comment 7

[Armen [:armenzg]]

Comment on attachment 535642 [details] [diff] [review]
use OBJDIR when adding dist/host/bin to $PATH

nice :)

Comment 8

[[e-mail] (:bhearsum)]

Attachment: the right patch

Comment 9

[[e-mail] (:bhearsum)]

Comment on attachment 535645 [details] [diff] [review]
the right patch

cvs commit: Examining .
? b
Checking in patcher2.pl;
/cvsroot/mozilla/tools/patcher/patcher2.pl,v  <--  patcher2.pl
new revision: 1.43; previous revision: 1.42
done
[] bhearsum@voot:~/Mozilla/checkouts/clean/patcher$ cvs tag UPDATE_PACKAGING_R14 patcher2.pl
W patcher2.pl : UPDATE_PACKAGING_R14 already exists on version 1.42 : NOT MOVING tag to version 1.43
[] bhearsum@voot:~/Mozilla/checkouts/clean/patcher$ cvs tag -F UPDATE_PACKAGING_R14 patcher2.pl
T patcher2.pl

Comment 10

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

FWIW, this shouldn't have *forced* you to build in an object dir ... you should have been able to set MOZ_OBJDIR=path/to/srcdir.

Comment 11

[[e-mail] (:bhearsum)]

Ah, I wasn't sure that was supported at all anymore. In any case, it doesn't *hurt* to build in an objdir here. Thanks for that tip though, khuey!

Comment 12

[[e-mail] (:bhearsum)]

This worked fine in 5.0b3