build/macosx/universal/flight.mk

Thu, 22 Jan 2015 13:21:57 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 22 Jan 2015 13:21:57 +0100
branch
TOR_BUG_9701
changeset 15
b8a032363ba2
permissions
-rw-r--r--

Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6

michael@0 1 # This Source Code Form is subject to the terms of the Mozilla Public
michael@0 2 # License, v. 2.0. If a copy of the MPL was not distributed with this
michael@0 3 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
michael@0 4
michael@0 5 # BE CAREFUL! This makefile handles a postflight_all rule for a
michael@0 6 # multi-project build, so DON'T rely on anything that might differ between
michael@0 7 # the two OBJDIRs.
michael@0 8
michael@0 9 ifndef OBJDIR
michael@0 10 OBJDIR_ARCH_1 = $(MOZ_OBJDIR)/$(firstword $(MOZ_BUILD_PROJECTS))
michael@0 11 OBJDIR_ARCH_2 = $(MOZ_OBJDIR)/$(word 2,$(MOZ_BUILD_PROJECTS))
michael@0 12 DIST_ARCH_1 = $(OBJDIR_ARCH_1)/dist
michael@0 13 DIST_ARCH_2 = $(OBJDIR_ARCH_2)/dist
michael@0 14 DIST_UNI = $(DIST_ARCH_1)/universal
michael@0 15 OBJDIR = $(OBJDIR_ARCH_1)
michael@0 16 endif
michael@0 17
michael@0 18 topsrcdir = $(TOPSRCDIR)
michael@0 19 DEPTH = $(OBJDIR)
michael@0 20 include $(OBJDIR)/config/autoconf.mk
michael@0 21
michael@0 22 DIST = $(OBJDIR)/dist
michael@0 23
michael@0 24 postflight_all:
michael@0 25 mkdir -p $(DIST_UNI)/$(MOZ_PKG_APPNAME)
michael@0 26 rm -f $(DIST_ARCH_2)/universal
michael@0 27 ln -s $(abspath $(DIST_UNI)) $(DIST_ARCH_2)/universal
michael@0 28 # Stage a package for buildsymbols to be happy. Doing so in OBJDIR_ARCH_1
michael@0 29 # actually does a universal staging with both OBJDIR_ARCH_1 and OBJDIR_ARCH_2.
michael@0 30 $(MAKE) -C $(OBJDIR_ARCH_1)/$(MOZ_BUILD_APP)/installer \
michael@0 31 PKG_SKIP_STRIP=1 stage-package
michael@0 32 ifdef ENABLE_TESTS
michael@0 33 # Now, repeat the process for the test package.
michael@0 34 $(MAKE) -C $(OBJDIR_ARCH_1) UNIVERSAL_BINARY= CHROME_JAR= package-tests
michael@0 35 $(MAKE) -C $(OBJDIR_ARCH_2) UNIVERSAL_BINARY= CHROME_JAR= package-tests
michael@0 36 rm -rf $(DIST_UNI)/test-package-stage
michael@0 37 # automation.py differs because it hardcodes a path to
michael@0 38 # dist/bin. It doesn't matter which one we use.
michael@0 39 if test -d $(DIST_ARCH_1)/test-package-stage -a \
michael@0 40 -d $(DIST_ARCH_2)/test-package-stage; then \
michael@0 41 cp $(DIST_ARCH_1)/test-package-stage/mochitest/automation.py \
michael@0 42 $(DIST_ARCH_2)/test-package-stage/mochitest/; \
michael@0 43 cp -RL $(DIST_ARCH_1)/test-package-stage/mochitest/extensions/specialpowers \
michael@0 44 $(DIST_ARCH_2)/test-package-stage/mochitest/extensions/; \
michael@0 45 cp $(DIST_ARCH_1)/test-package-stage/xpcshell/automation.py \
michael@0 46 $(DIST_ARCH_2)/test-package-stage/xpcshell/; \
michael@0 47 cp $(DIST_ARCH_1)/test-package-stage/reftest/automation.py \
michael@0 48 $(DIST_ARCH_2)/test-package-stage/reftest/; \
michael@0 49 cp -RL $(DIST_ARCH_1)/test-package-stage/reftest/specialpowers \
michael@0 50 $(DIST_ARCH_2)/test-package-stage/reftest/; \
michael@0 51 $(TOPSRCDIR)/build/macosx/universal/unify \
michael@0 52 --unify-with-sort "\.manifest$$" \
michael@0 53 --unify-with-sort "all-test-dirs\.list$$" \
michael@0 54 $(DIST_ARCH_1)/test-package-stage \
michael@0 55 $(DIST_ARCH_2)/test-package-stage \
michael@0 56 $(DIST_UNI)/test-package-stage; fi
michael@0 57 endif

mercurial