Bug 1322402 - Drop support for universal Mac builds. rs=bustage-fix
authorPike <l10n@mozilla.com> and Richard Marti <richard.marti@gmail.com> and Jorg K <jorgk@jorgk.com>
Fri, 17 Feb 2017 17:05:49 +0100
changeset 27653 6ee27a7af6cd3e7bd25f392048fd40160910275a
parent 27652 c52f5a6cdd14fa2c1d605889d24bd9b40a111c42
child 27654 6be063cc8da18b80f5f90db4fbc4206837298a92
push idunknown
push userunknown
push dateunknown
reviewersbustage-fix
bugs1322402
Bug 1322402 - Drop support for universal Mac builds. rs=bustage-fix
build/macosx/universal/check-sync-exceptions
build/macosx/universal/flight.mk
build/macosx/universal/mozconfig
build/macosx/universal/mozconfig.common
mail/config/mozconfigs/macosx-universal/l10n-mozconfig
mail/config/mozconfigs/macosx-universal/nightly
mail/config/mozconfigs/macosx-universal/release
mail/config/mozconfigs/macosx64/l10n-mozconfig
mail/config/mozconfigs/macosx64/nightly
mail/config/mozconfigs/macosx64/release
deleted file mode 100644
--- a/build/macosx/universal/check-sync-exceptions
+++ /dev/null
@@ -1,9 +0,0 @@
-flight.mk
-mozconfig.common
-
-# Ignore detritus left lying around by editing tools.
-*~
-.#*
-#*#
-*.orig
-*.rej
deleted file mode 100644
--- a/build/macosx/universal/flight.mk
+++ /dev/null
@@ -1,33 +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
-
-core_abspath = $(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1))
-
-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)/$(subst ../,,$(MOZ_BUILD_APP))/installer \
-	   PKG_SKIP_STRIP=1 stage-package
deleted file mode 100644
--- a/build/macosx/universal/mozconfig
+++ /dev/null
@@ -1,11 +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/.
-
-# i386/x86-64 Universal Build mozconfig
-
-# As used here, arguments in $MOZ_BUILD_PROJECTS are suitable as arguments
-# to gcc's -arch parameter.
-mk_add_options MOZ_BUILD_PROJECTS="x86_64 i386"
-
-. $topsrcdir/build/macosx/universal/mozconfig.common
deleted file mode 100644
--- a/build/macosx/universal/mozconfig.common
+++ /dev/null
@@ -1,54 +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/.
-
-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
-
-. $topsrcdir/build/macosx/mozconfig.common
-
-# $MOZ_BUILD_APP is only defined when sourced by configure.  That's not a
-# problem, because the variables it affects only need to be set for
-# configure.
-if test -n "$MOZ_BUILD_APP" ; then
-if test "$MOZ_BUILD_APP" = "i386" -o "$MOZ_BUILD_APP" = "x86_64"; then
-  TARGET_CPU=$MOZ_BUILD_APP
-
-  # $HOST_CXX is presently unused.  $HOST_CC will only be used during a cross
-  # compile.
-  HOST_CC=$CC
-  HOST_CXX=$CXX
-
-  NATIVE_CPU=`$topsrcdir/build/autoconf/config.guess | cut -f1 -d-`
-
-  # It's not strictly necessary to specify -arch during native builds, but it
-  # makes the merged about:buildconfig easier to follow, and it reduces
-  # conditionalized differences between builds.
-  CC="$CC -arch $TARGET_CPU"
-  CXX="$CXX -arch $TARGET_CPU"
-
-  # These must be set for cross builds, and don't hurt straight builds.
-  RANLIB=ranlib
-  AR=ar
-  AS=$CC
-  LD=ld
-  STRIP="strip"
-  OTOOL="otool"
-
-  # Each per-CPU build should be entirely oblivious to the fact that a
-  # universal binary will be produced.  The exception is packager.mk, which
-  # needs to know to look for universal bits when building the .dmg.
-  UNIVERSAL_BINARY=1
-
-  export CC CXX HOST_CC HOST_CXX RANLIB AR AS LD STRIP OTOOL
-fi
-fi
deleted file mode 100644
--- a/mail/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --disable-install-strip
-ac_add_options --with-l10n-base=../../../l10n
-ac_add_options --disable-compile-environment
-
-# Build lightning locales
-ac_add_options --enable-calendar
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-# Disable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=0
-# Disable enforcing that add-ons are signed by the trusted root
-MOZ_REQUIRE_ADDON_SIGNING=0
-
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
--- a/mail/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/mail/config/mozconfigs/macosx64/l10n-mozconfig
@@ -4,17 +4,16 @@ ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --disable-compile-environment
 
 # Build lightning locales
 ac_add_options --enable-calendar
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)"
rename from mail/config/mozconfigs/macosx-universal/nightly
rename to mail/config/mozconfigs/macosx64/nightly
--- a/mail/config/mozconfigs/macosx-universal/nightly
+++ b/mail/config/mozconfigs/macosx64/nightly
@@ -2,23 +2,18 @@
 # mixed up with host/target CPUs when trying to work out how to do the
 # universal build. When we redo the build system (bug 648979) this will
 # go away.
 if test -e "$topsrcdir/mail/config/version.txt"; then
   unset CC
   unset CXX
 fi
 
-# Make sure Lightning is also unified, this needs to happen before including
-# the universal mozconfig because Lightning's univeral.mk needs to run first.
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+. $topsrcdir/build/macosx/mozconfig.common
 
-. $topsrcdir/build/macosx/universal/mozconfig
-
-# Universal builds override the default of mail (bug 575283 comment 29)
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
rename from mail/config/mozconfigs/macosx-universal/release
rename to mail/config/mozconfigs/macosx64/release
--- a/mail/config/mozconfigs/macosx-universal/release
+++ b/mail/config/mozconfigs/macosx64/release
@@ -2,23 +2,18 @@
 # mixed up with host/target CPUs when trying to work out how to do the
 # universal build. When we redo the build system (bug 648979) this will
 # go away.
 if test -e "$topsrcdir/mail/config/version.txt"; then
   unset CC
   unset CXX
 fi
 
-# Make sure Lightning is also unified, this needs to happen before including
-# the universal mozconfig because Lightning's univeral.mk needs to run first.
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+. $topsrcdir/build/macosx/mozconfig.common
 
-. $topsrcdir/build/macosx/universal/mozconfig
-
-# Universal builds override the default of mail (bug 575283 comment 29)
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1