build/win32/Makefile.in

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 MOZ_GLUE_LDFLAGS =
     7 include $(topsrcdir)/config/rules.mk
     9 ifdef WIN32_REDIST_DIR
    10 ifndef MOZ_DEBUG
    12 ifeq (1600,$(_MSC_VER))
    13 REDIST_FILES = \
    14   msvcp100.dll \
    15   msvcr100.dll \
    16   $(NULL)
    17 endif
    19 ifeq (1700,$(_MSC_VER))
    20 REDIST_FILES = \
    21   msvcp110.dll \
    22   msvcr110.dll \
    23   $(NULL)
    24 endif
    26 ifeq (1800,$(_MSC_VER))
    27 REDIST_FILES = \
    28   msvcp120.dll \
    29   msvcr120.dll \
    30   $(NULL)
    31 endif
    33 ifdef REDIST_FILES
    34 libs-preqs = \
    35   $(call mkdir_deps,$(FINAL_TARGET)) \
    36   $(NULL)
    38 libs:: $(libs-preqs)
    39 	install --preserve-timestamps $(foreach f,$(REDIST_FILES),'$(WIN32_REDIST_DIR)'/$(f)) $(FINAL_TARGET)
    40 endif
    42 endif # ! MOZ_DEBUG
    43 endif # WIN32_REDIST_DIR
    45 # run the binscope tool to make sure the binary and all libraries
    46 # are using all available Windows OS-level security mechanisms
    47 check::
    48 	$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/crashreporter-symbols/
    49 	$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/plugin-container.exe $(DIST)/crashreporter-symbols/

mercurial