Bug 1244446 - Remove OSX universal builds postflight. r=gps,r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 01 Jun 2016 07:22:40 +0900
changeset 300749 e1bd07ec0b5b13ededa511dda2872de01df29bb2
parent 300748 9c5bfe6d61e021654a478a24342d51b12f26da14
child 300750 aa8cdba912d328070bf56330a3abe5b86e9cd136
push id30321
push usercbook@mozilla.com
push dateTue, 07 Jun 2016 13:29:08 +0000
treeherdermozilla-central@7f7c7d24700e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, ted
bugs1244446, 834228
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1244446 - Remove OSX universal builds postflight. r=gps,r=ted At this point, the only remaining part of the postflight for OSX universal builds dates back to bug 834228. Since then, many things have changed, one of them being that automation build steps have dependencies that can be expressed through make dependencies. While this is not directly related to bug 1244446, fixing this bug gets more complicated if postflight needs to happen before some of the automation build steps.
build/macosx/universal/flight.mk
build/macosx/universal/mozconfig.common
build/moz-automation.mk
deleted file mode 100644
--- a/build/macosx/universal/flight.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# BE CAREFUL!  This makefile handles a postflight_all rule for a
-# multi-project build, so DON'T rely on anything that might differ between
-# the two OBJDIRs.
-
-ifndef OBJDIR
-OBJDIR_ARCH_1 = $(MOZ_OBJDIR)/$(firstword $(MOZ_BUILD_PROJECTS))
-OBJDIR_ARCH_2 = $(MOZ_OBJDIR)/$(word 2,$(MOZ_BUILD_PROJECTS))
-DIST_ARCH_1 = $(OBJDIR_ARCH_1)/dist
-DIST_ARCH_2 = $(OBJDIR_ARCH_2)/dist
-DIST_UNI = $(DIST_ARCH_1)/universal
-OBJDIR = $(OBJDIR_ARCH_1)
-endif
-
-topsrcdir = $(TOPSRCDIR)
-DEPTH = $(OBJDIR)
-include $(OBJDIR)/config/autoconf.mk
-
-DIST = $(OBJDIR)/dist
-
-postflight_all:
-	mkdir -p $(DIST_UNI)/$(MOZ_PKG_APPNAME)
-	rm -f $(DIST_ARCH_2)/universal
-	ln -s $(abspath $(DIST_UNI)) $(DIST_ARCH_2)/universal
-# Stage a package for buildsymbols to be happy. Doing so in OBJDIR_ARCH_1
-# actually does a universal staging with both OBJDIR_ARCH_1 and OBJDIR_ARCH_2.
-	$(MAKE) -C $(OBJDIR_ARCH_1)/$(MOZ_BUILD_APP)/installer \
-	   PKG_SKIP_STRIP=1 stage-package
--- a/build/macosx/universal/mozconfig.common
+++ b/build/macosx/universal/mozconfig.common
@@ -1,16 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 mk_add_options MOZ_UNIFY_BDATE=1
 
-mk_add_options MOZ_POSTFLIGHT_ALL+=build/macosx/universal/flight.mk
-
 DARWIN_VERSION=`uname -r`
 ac_add_app_options i386 --target=i386-apple-darwin$DARWIN_VERSION
 ac_add_app_options x86_64 --target=x86_64-apple-darwin$DARWIN_VERSION
 ac_add_app_options i386 --with-unify-dist=../x86_64/dist
 ac_add_app_options x86_64 --with-unify-dist=../i386/dist
 
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.7.sdk
 
--- a/build/moz-automation.mk
+++ b/build/moz-automation.mk
@@ -83,16 +83,22 @@ automation/upload: automation/sdk
 # binaries/libs, and that's what we package/test.
 automation/pretty-package: automation/buildsymbols
 
 # The installer, sdk and packager all run stage-package, and may conflict
 # with each other.
 automation/installer: automation/package
 automation/sdk: automation/installer automation/package
 
+# Universal builds need package staging happening before buildsymbols
+# (bug 834228)
+ifdef UNIVERSAL_BINARY
+automation/buildsymbols: automation/package
+endif
+
 # The 'pretty' versions of targets run before the regular ones to avoid
 # conflicts in writing to the same files.
 automation/installer: automation/pretty-installer
 automation/package: automation/pretty-package
 automation/package-tests: automation/pretty-package-tests
 automation/l10n-check: automation/pretty-l10n-check
 automation/update-packaging: automation/pretty-update-packaging