build/macosx/universal/flight.mk@129ffea94266
build/macosx/universal/flight.mk
Sat, 03 Jan 2015 20:18:00 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 03 Jan 2015 20:18:00 +0100
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
- permissions
- -rw-r--r--
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
1 # This Source Code Form is subject to the terms of the Mozilla Public
2 # License, v. 2.0. If a copy of the MPL was not distributed with this
3 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
5 # BE CAREFUL! This makefile handles a postflight_all rule for a
6 # multi-project build, so DON'T rely on anything that might differ between
7 # the two OBJDIRs.
9 ifndef OBJDIR
10 OBJDIR_ARCH_1 = $(MOZ_OBJDIR)/$(firstword $(MOZ_BUILD_PROJECTS))
11 OBJDIR_ARCH_2 = $(MOZ_OBJDIR)/$(word 2,$(MOZ_BUILD_PROJECTS))
12 DIST_ARCH_1 = $(OBJDIR_ARCH_1)/dist
13 DIST_ARCH_2 = $(OBJDIR_ARCH_2)/dist
14 DIST_UNI = $(DIST_ARCH_1)/universal
15 OBJDIR = $(OBJDIR_ARCH_1)
16 endif
18 topsrcdir = $(TOPSRCDIR)
19 DEPTH = $(OBJDIR)
20 include $(OBJDIR)/config/autoconf.mk
22 DIST = $(OBJDIR)/dist
24 postflight_all:
25 mkdir -p $(DIST_UNI)/$(MOZ_PKG_APPNAME)
26 rm -f $(DIST_ARCH_2)/universal
27 ln -s $(abspath $(DIST_UNI)) $(DIST_ARCH_2)/universal
28 # Stage a package for buildsymbols to be happy. Doing so in OBJDIR_ARCH_1
29 # actually does a universal staging with both OBJDIR_ARCH_1 and OBJDIR_ARCH_2.
30 $(MAKE) -C $(OBJDIR_ARCH_1)/$(MOZ_BUILD_APP)/installer \
31 PKG_SKIP_STRIP=1 stage-package
32 ifdef ENABLE_TESTS
33 # Now, repeat the process for the test package.
34 $(MAKE) -C $(OBJDIR_ARCH_1) UNIVERSAL_BINARY= CHROME_JAR= package-tests
35 $(MAKE) -C $(OBJDIR_ARCH_2) UNIVERSAL_BINARY= CHROME_JAR= package-tests
36 rm -rf $(DIST_UNI)/test-package-stage
37 # automation.py differs because it hardcodes a path to
38 # dist/bin. It doesn't matter which one we use.
39 if test -d $(DIST_ARCH_1)/test-package-stage -a \
40 -d $(DIST_ARCH_2)/test-package-stage; then \
41 cp $(DIST_ARCH_1)/test-package-stage/mochitest/automation.py \
42 $(DIST_ARCH_2)/test-package-stage/mochitest/; \
43 cp -RL $(DIST_ARCH_1)/test-package-stage/mochitest/extensions/specialpowers \
44 $(DIST_ARCH_2)/test-package-stage/mochitest/extensions/; \
45 cp $(DIST_ARCH_1)/test-package-stage/xpcshell/automation.py \
46 $(DIST_ARCH_2)/test-package-stage/xpcshell/; \
47 cp $(DIST_ARCH_1)/test-package-stage/reftest/automation.py \
48 $(DIST_ARCH_2)/test-package-stage/reftest/; \
49 cp -RL $(DIST_ARCH_1)/test-package-stage/reftest/specialpowers \
50 $(DIST_ARCH_2)/test-package-stage/reftest/; \
51 $(TOPSRCDIR)/build/macosx/universal/unify \
52 --unify-with-sort "\.manifest$$" \
53 --unify-with-sort "all-test-dirs\.list$$" \
54 $(DIST_ARCH_1)/test-package-stage \
55 $(DIST_ARCH_2)/test-package-stage \
56 $(DIST_UNI)/test-package-stage; fi
57 endif
