Sat, 03 Jan 2015 20:18:00 +0100
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 # assemble package names, see convention at
6 # http://developer.mozilla.org/index.php?title=En/Package_Filename_Convention
7 # for (at least Firefox) releases we use a different format with directories,
8 # e.g. win32/de/Firefox Setup 3.0.1.exe
9 # the latter format is triggered with MOZ_PKG_PRETTYNAMES=1
11 ifndef PACKAGE_NAME_MK_INCLUDED
12 PACKAGE_NAME_MK_INCLUDED := 1
14 ifndef MOZ_PKG_VERSION
15 MOZ_PKG_VERSION = $(MOZ_APP_VERSION)
16 endif
18 ifndef MOZ_PKG_PLATFORM
19 MOZ_PKG_PLATFORM := $(TARGET_OS)-$(TARGET_CPU)
21 # TARGET_OS/TARGET_CPU may be unintuitive, so we hardcode some special formats
22 ifeq ($(OS_ARCH),WINNT)
23 ifeq ($(TARGET_CPU),x86_64)
24 MOZ_PKG_PLATFORM := win64-$(TARGET_CPU)
25 else
26 MOZ_PKG_PLATFORM := win32
27 endif
28 endif
29 ifeq ($(OS_ARCH),Darwin)
30 ifdef UNIVERSAL_BINARY
31 MOZ_PKG_PLATFORM := mac
32 else
33 ifeq ($(TARGET_CPU),x86_64)
34 MOZ_PKG_PLATFORM := mac64
35 else
36 MOZ_PKG_PLATFORM := mac
37 endif
38 endif
39 endif
40 ifeq ($(TARGET_OS),linux-gnu)
41 MOZ_PKG_PLATFORM := linux-$(TARGET_CPU)
42 endif
43 endif #MOZ_PKG_PLATFORM
45 ifdef MOZ_PKG_SPECIAL
46 MOZ_PKG_PLATFORM := $(MOZ_PKG_PLATFORM)-$(MOZ_PKG_SPECIAL)
47 endif
49 MOZ_PKG_DIR = $(MOZ_APP_NAME)
51 ifndef MOZ_PKG_PRETTYNAMES # standard package names
53 ifndef MOZ_PKG_APPNAME
54 MOZ_PKG_APPNAME = $(MOZ_APP_NAME)
55 endif
57 PKG_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
58 PKG_PATH =
59 PKG_INST_BASENAME = $(PKG_BASENAME).installer
60 PKG_STUB_BASENAME = $(PKG_BASENAME).installer-stub
61 PKG_INST_PATH = install/sea/
62 PKG_UPDATE_BASENAME = $(PKG_BASENAME)
63 CHECKSUMS_FILE_BASENAME = $(PKG_BASENAME)
64 MOZ_INFO_BASENAME = $(PKG_BASENAME)
65 PKG_UPDATE_PATH = update/
66 COMPLETE_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).complete.mar
67 # PARTIAL_MAR needs to be processed by $(wildcard) before you use it.
68 PARTIAL_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).partial.*.mar
69 PKG_LANGPACK_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).langpack
70 PKG_LANGPACK_PATH = $(MOZ_PKG_PLATFORM)/xpi/
71 LANGPACK = $(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
72 PKG_SRCPACK_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).source
73 PKG_BUNDLE_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION)
74 PKG_SRCPACK_PATH =
76 else # "pretty" release package names
78 ifndef MOZ_PKG_APPNAME
79 MOZ_PKG_APPNAME = $(MOZ_APP_DISPLAYNAME)
80 endif
81 MOZ_PKG_APPNAME_LC = $(shell echo $(MOZ_PKG_APPNAME) | tr '[A-Z]' '[a-z]')
84 ifndef MOZ_PKG_LONGVERSION
85 MOZ_PKG_LONGVERSION = $(shell echo $(MOZ_PKG_VERSION))
86 endif
88 ifeq (,$(filter-out Darwin, $(OS_ARCH))) # Mac
89 PKG_BASENAME = $(MOZ_PKG_APPNAME) $(MOZ_PKG_LONGVERSION)
90 PKG_INST_BASENAME = $(MOZ_PKG_APPNAME) Setup $(MOZ_PKG_LONGVERSION)
91 else
92 ifeq (,$(filter-out WINNT, $(OS_ARCH))) # Windows
93 PKG_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
94 PKG_INST_BASENAME = $(MOZ_PKG_APPNAME) Setup $(MOZ_PKG_LONGVERSION)
95 PKG_STUB_BASENAME = $(MOZ_PKG_APPNAME) Setup Stub $(MOZ_PKG_LONGVERSION)
96 else # unix (actually, not Windows, Mac or OS/2)
97 PKG_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
98 PKG_INST_BASENAME = $(MOZ_PKG_APPNAME_LC)-setup-$(MOZ_PKG_VERSION)
99 endif
100 endif
101 PKG_PATH = $(MOZ_PKG_PLATFORM)/$(AB_CD)/
102 CHECKSUMS_FILE_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
103 MOZ_INFO_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
104 ifeq ($(MOZ_APP_NAME),xulrunner)
105 PKG_PATH = runtimes/
106 PKG_BASENAME = $(MOZ_APP_NAME)-$(MOZ_PKG_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
107 CHECKSUMS_FILE_BASENAME = $(PKG_BASENAME)
108 MOZ_INFO_BASENAME = $(PKG_BASENAME)
109 endif
110 PKG_INST_PATH = $(PKG_PATH)
111 PKG_UPDATE_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
112 PKG_UPDATE_PATH = update/$(PKG_PATH)
113 COMPLETE_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).complete.mar
114 # PARTIAL_MAR needs to be processed by $(wildcard) before you use it.
115 PARTIAL_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).partial.*.mar
116 PKG_LANGPACK_BASENAME = $(AB_CD)
117 PKG_LANGPACK_PATH = $(MOZ_PKG_PLATFORM)/xpi/
118 LANGPACK = $(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
119 PKG_SRCPACK_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION).source
120 PKG_BUNDLE_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
121 PKG_SRCPACK_PATH = source/
123 endif # MOZ_PKG_PRETTYNAMES
125 # Symbol package naming
126 SYMBOL_FULL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols-full
127 SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols
129 # Test package naming
130 TEST_PACKAGE = $(PKG_BASENAME).tests.zip
132 ifneq (,$(wildcard $(DIST)/bin/application.ini))
133 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
134 else
135 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
136 endif
138 ifndef INCLUDED_RCS_MK
139 USE_RCS_MK := 1
140 include $(topsrcdir)/config/makefiles/makeutils.mk
141 endif
143 MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null))
145 ###########################################################################
146 # bug: 746277 - preserve existing functionality.
147 # MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists
148 ###########################################################################
149 MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL))
151 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt
152 MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json
154 # JavaScript Shell
155 PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip
157 endif # PACKAGE_NAME_MK_INCLUDED