412362 - Universal build ID unification isn't working

Status: RESOLVED FIXED

(Camino Graveyard :: General, defect)

Description

[Mark Mentovai]

http://tinderbox.mozilla.org/showlog.cgi?log=Camino/1200343740.1200344818.16535.gz&fulltext=1

/builds/tinderbox/CmTrunk/Darwin_9.1.0_Depend/mozilla/build/macosx/universal/unify: copyIfIdentical: files differ:
  ../build/ppc/dist/camino/Camino.app/Contents/Info.plist,
  ../build/i386/dist/camino/Camino.app/Contents/Info.plist

Looking further up in the log, we see that when the files are created, different timestamps were used as the build ID for ppc and x86 portions:
	    -e "s/%PLATFORM_BUILD_ID%/2008011412/" \
and
	    -e "s/%PLATFORM_BUILD_ID%/2008011413/" \

We had been calling make-platformini.py ourselves since config/build_number disappeared in bug 383167.  Prior to bug 386740, the Python script checked for the MOZ_BUILD_DATE environment variable, set by client.mk during universal builds, and used it if present.  Since bug 386740, the Python script no longer does this.  The logic has moved to config/Makefile.in, and it is used to generate a new build ID file by a new name, config/buildid.  We should use this file (like we used to) instead of generating our own (like we had to).

Comment 1

[Mark Mentovai]

Attachment: Fix

Comment 2

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Comment on attachment 297077 [details] [diff] [review]
Fix

Hooray! r=ardssone

Comment 3

[Mark Mentovai]

Chicked en.