toolkit/crashreporter/update-breakpad.sh@129ffea94266 (annotated)
toolkit/crashreporter/update-breakpad.sh
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
- -rwxr-xr-x
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.
| michael@0 | 1 | #!/bin/bash |
| michael@0 | 2 | # This Source Code Form is subject to the terms of the Mozilla Public |
| michael@0 | 3 | # License, v. 2.0. If a copy of the MPL was not distributed with this |
| michael@0 | 4 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
| michael@0 | 5 | |
| michael@0 | 6 | # Usage: update-breakpad.sh <path to breakpad SVN> |
| michael@0 | 7 | |
| michael@0 | 8 | if [ $# -lt 1 ]; then |
| michael@0 | 9 | echo "Usage: update-breakpad.sh /path/to/google-breakpad/" |
| michael@0 | 10 | exit 1 |
| michael@0 | 11 | fi |
| michael@0 | 12 | |
| michael@0 | 13 | crashreporter_dir=`dirname $0` |
| michael@0 | 14 | repo=${crashreporter_dir}/../.. |
| michael@0 | 15 | rm -rf ${crashreporter_dir}/google-breakpad |
| michael@0 | 16 | svn export $1 ${crashreporter_dir}/google-breakpad |
| michael@0 | 17 | |
| michael@0 | 18 | # remove some extraneous bits |
| michael@0 | 19 | rm -rf ${crashreporter_dir}/google-breakpad/src/third_party/protobuf ${crashreporter_dir}/google-breakpad/src/testing/ ${crashreporter_dir}/google-breakpad/src/tools/gyp/ |
| michael@0 | 20 | # restore our Makefile.ins |
| michael@0 | 21 | hg -R ${repo} st -n | grep "Makefile\.in$" | xargs hg revert --no-backup |
| michael@0 | 22 | # and moz.build files |
| michael@0 | 23 | hg -R ${repo} st -n | grep "moz\.build$" | xargs hg revert --no-backup |
| michael@0 | 24 | # and some other makefiles |
| michael@0 | 25 | hg -R ${repo} st -n | grep "objs\.mk$" | xargs hg revert --no-backup |
| michael@0 | 26 | |
| michael@0 | 27 | # Record `svn info` |
| michael@0 | 28 | svn info $1 > ${crashreporter_dir}/google-breakpad/SVN-INFO |
| michael@0 | 29 | |
| michael@0 | 30 | # Apply any local patches |
| michael@0 | 31 | shopt -s nullglob |
| michael@0 | 32 | for p in ${crashreporter_dir}/breakpad-patches/*.patch; do |
| michael@0 | 33 | if grep -q -e "--git" $p; then |
| michael@0 | 34 | patch_opts="-p1" |
| michael@0 | 35 | else |
| michael@0 | 36 | patch_opts="-p0" |
| michael@0 | 37 | fi |
| michael@0 | 38 | echo "Applying $p" |
| michael@0 | 39 | if ! filterdiff -x '*/Makefile*' $p | \ |
| michael@0 | 40 | patch -d ${crashreporter_dir}/google-breakpad ${patch_opts}; then |
| michael@0 | 41 | echo "Failed to apply $p" |
| michael@0 | 42 | exit 1 |
| michael@0 | 43 | fi |
| michael@0 | 44 | done |
| michael@0 | 45 | # remove any .orig files that snuck in |
| michael@0 | 46 | find ${crashreporter_dir}/google-breakpad -name "*.orig" -print0 | xargs -0 rm |
| michael@0 | 47 | |
| michael@0 | 48 | hg addremove ${crashreporter_dir}/google-breakpad/ |
