661792 - calling 'make sdk' after 'make package' deletes xulrunner dmg

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Nick Thomas [:nthomas] (UTC+12)]

Bug 653971 is getting xulrunner nightlies working again on m-c through to beta; it fixes an error in make package. While testing it, I noticed that we fail the 'find_filepath' step after packaging, which is executing
  bash -c 'find build/obj-firefox/i386/dist -maxdepth 1 -type f -name *.dmg'
   in dir /builds/slave/cen-osx64-xr/. (timeout 1200 secs)
It doesn't find any files there, despite 'make package' creating
  build/obj-firefox/i386/dist/xulrunner-7.0a1.en-US.mac-pkg.dmg

Between calling 'make package' and 'find_filepath' we create the SDKs with 'make -f client.mk sdk', and that is deleting the dmg. If I'm reading this code right we call the stage-package target
 http://mxr.mozilla.org/mozilla-central/source/toolkit/mozapps/installer/packager.mk#577
and at line 578
  $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg 
evaluates to
  ./dist/xulrunner-7.0a1.en-US.mac.dmg
Since we start from obj-firefox/i386/ the dmg is removed. This code appears to have existed for quite some time.

We hit this now because bug 557260 changed the order to 
  package, sdk, set some properties, upload, 
from 
  sdk, package, set some properties, upload
at
  http://hg.mozilla.org/build/buildbotcustom/rev/4eb403acc298#l4.365
Firefox nightlies aren't failing, so something differs down these codepaths for it.

It's not obvious to me if this should be fixed in the packaging voodoo or in buildbot sequencing. Or if we still need to call 'make package' earlier given the comment
  #Moved |make package| before |make package-tests| to work around bug629194
(at http://hg.mozilla.org/build/buildbotcustom/rev/4eb403acc298#l4.377), if bug 629194 is now marked fixed.

Comment 1

[Aki Sasaki (not active)]

Attachment: move make package back below package-tests

Mobile builds no longer need to have make package before package-tests, so I'm reverting the order.

Comment 2

[Aki Sasaki (not active)]

Comment on attachment 537504 [details] [diff] [review]
move make package back below package-tests

http://hg.mozilla.org/build/buildbotcustom/rev/31a753e4c1ad