Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Side by Side Diff: chrome/chrome_installer.gypi

Issue 10377173: Do Keychain reauthorization at update time (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/mac/keychain_reauthorize.mm ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', 7 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
8 # 'branding_dir' is set in the 'conditions' section at the bottom. 8 # 'branding_dir' is set in the 'conditions' section at the bottom.
9 }, 9 },
10 'conditions': [ 10 'conditions': [
(...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 # work properly in a shell script, where ${BUILT_PRODUCTS_DIR} is 887 # work properly in a shell script, where ${BUILT_PRODUCTS_DIR} is
888 # needed. 888 # needed.
889 'mac_packaging_sh_dir': 889 'mac_packaging_sh_dir':
890 '${BUILT_PRODUCTS_DIR}/<(mac_product_name) Packaging', 890 '${BUILT_PRODUCTS_DIR}/<(mac_product_name) Packaging',
891 }, # variables 891 }, # variables
892 'targets': [ 892 'targets': [
893 { 893 {
894 'target_name': 'installer_packaging', 894 'target_name': 'installer_packaging',
895 'type': 'none', 895 'type': 'none',
896 'dependencies': [ 896 'dependencies': [
897 'keychain_reauthorize',
897 'installer/mac/third_party/bsdiff/goobsdiff.gyp:*', 898 'installer/mac/third_party/bsdiff/goobsdiff.gyp:*',
898 'installer/mac/third_party/xz/xz.gyp:*', 899 'installer/mac/third_party/xz/xz.gyp:*',
899 ], 900 ],
900 'conditions': [ 901 'conditions': [
901 ['buildtype=="Official"', { 902 ['buildtype=="Official"', {
902 'actions': [ 903 'actions': [
903 { 904 {
904 # Create sign.sh, the script that the packaging system will 905 # Create sign.sh, the script that the packaging system will
905 # use to sign the .app bundle. 906 # use to sign the .app bundle.
906 'action_name': 'Make sign.sh', 907 'action_name': 'Make sign.sh',
(...skipping 24 matching lines...) Expand all
931 ], # conditions 932 ], # conditions
932 'copies': [ 933 'copies': [
933 { 934 {
934 # Put the files where the packaging system will find them. The 935 # Put the files where the packaging system will find them. The
935 # packager will use these when building the "full installer" 936 # packager will use these when building the "full installer"
936 # disk images and delta/differential update disk images. 937 # disk images and delta/differential update disk images.
937 'destination': '<(mac_packaging_dir)', 938 'destination': '<(mac_packaging_dir)',
938 'files': [ 939 'files': [
939 '<(PRODUCT_DIR)/goobsdiff', 940 '<(PRODUCT_DIR)/goobsdiff',
940 '<(PRODUCT_DIR)/goobspatch', 941 '<(PRODUCT_DIR)/goobspatch',
942 '<(PRODUCT_DIR)/keychain_reauthorize',
941 '<(PRODUCT_DIR)/liblzma_decompress.dylib', 943 '<(PRODUCT_DIR)/liblzma_decompress.dylib',
942 '<(PRODUCT_DIR)/xz', 944 '<(PRODUCT_DIR)/xz',
943 '<(PRODUCT_DIR)/xzdec', 945 '<(PRODUCT_DIR)/xzdec',
944 'installer/mac/dirdiffer.sh', 946 'installer/mac/dirdiffer.sh',
945 'installer/mac/dirpatcher.sh', 947 'installer/mac/dirpatcher.sh',
946 'installer/mac/dmgdiffer.sh', 948 'installer/mac/dmgdiffer.sh',
947 'installer/mac/pkg-dmg', 949 'installer/mac/pkg-dmg',
948 ], 950 ],
949 'conditions': [ 951 'conditions': [
950 ['mac_keystone==1', { 952 ['mac_keystone==1', {
(...skipping 10 matching lines...) Expand all
961 'installer/mac/internal/chrome_dmg_background.png', 963 'installer/mac/internal/chrome_dmg_background.png',
962 'installer/mac/internal/chrome_dmg_dsstore', 964 'installer/mac/internal/chrome_dmg_dsstore',
963 'installer/mac/internal/chrome_dmg_icon.icns', 965 'installer/mac/internal/chrome_dmg_icon.icns',
964 'installer/mac/internal/generate_dmgs', 966 'installer/mac/internal/generate_dmgs',
965 ], 967 ],
966 }], # branding=="Chrome" and buildtype=="Official" 968 }], # branding=="Chrome" and buildtype=="Official"
967 ], # conditions 969 ], # conditions
968 }, 970 },
969 ], # copies 971 ], # copies
970 }, # target: installer_packaging 972 }, # target: installer_packaging
973 {
974 'target_name': 'keychain_reauthorize',
975 'type': 'executable',
976 'sources': [
977 'installer/mac/keychain_reauthorize_main.cc',
978 ],
979 }, # target: keychain_reauthorize
971 ], # targets 980 ], # targets
972 }], # OS=="mac" 981 }], # OS=="mac"
973 [ 'branding == "Chrome"', { 982 [ 'branding == "Chrome"', {
974 'variables': { 983 'variables': {
975 'branding_dir': 'app/theme/google_chrome', 984 'branding_dir': 'app/theme/google_chrome',
976 }, 985 },
977 }, { # else branding!="Chrome" 986 }, { # else branding!="Chrome"
978 'variables': { 987 'variables': {
979 'branding_dir': 'app/theme/chromium', 988 'branding_dir': 'app/theme/chromium',
980 }, 989 },
981 }], 990 }],
982 ], 991 ],
983 } 992 }
OLDNEW
« no previous file with comments | « chrome/browser/mac/keychain_reauthorize.mm ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698