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

Side by Side Diff: chrome/installer/mini_installer.gypi

Issue 10440037: Remove the enable_metro GYP flag, effectively making it on by default. (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
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 'dependencies': [ 5 'dependencies': [
6 '<(chrome_dll_project)', 6 '<(chrome_dll_project)',
7 '../chrome.gyp:chrome', 7 '../chrome.gyp:chrome',
8 '../chrome.gyp:chrome_nacl_win64', 8 '../chrome.gyp:chrome_nacl_win64',
9 '../chrome.gyp:default_extensions', 9 '../chrome.gyp:default_extensions',
10 '../chrome.gyp:setup', 10 '../chrome.gyp:setup',
(...skipping 28 matching lines...) Expand all
39 'msvs_precompiled_header': '', 39 'msvs_precompiled_header': '',
40 'msvs_precompiled_source': '', 40 'msvs_precompiled_source': '',
41 'msvs_settings': { 41 'msvs_settings': {
42 'VCCLCompilerTool': { 42 'VCCLCompilerTool': {
43 'EnableIntrinsicFunctions': 'true', 43 'EnableIntrinsicFunctions': 'true',
44 'BufferSecurityCheck': 'false', 44 'BufferSecurityCheck': 'false',
45 'BasicRuntimeChecks': '0', 45 'BasicRuntimeChecks': '0',
46 'ExceptionHandling': '0', 46 'ExceptionHandling': '0',
47 }, 47 },
48 'VCLinkerTool': { 48 'VCLinkerTool': {
49 'OutputFile': '<(output_dir)/mini_installer.exe', 49 'OutputFile': '<(output_dir)/mini_installer.exe',
50 'ProgramDatabaseFile': '<(output_dir)/mini_installer.pdb', 50 'ProgramDatabaseFile': '<(output_dir)/mini_installer.pdb',
51 'MapFileName': '<(output_dir)/mini_installer.map', 51 'MapFileName': '<(output_dir)/mini_installer.map',
52 'RandomizedBaseAddress': '1', 52 'RandomizedBaseAddress': '1',
53 'DataExecutionPrevention': '0', 53 'DataExecutionPrevention': '0',
54 'AdditionalLibraryDirectories': [ 54 'AdditionalLibraryDirectories': [
55 '<(DEPTH)/third_party/platformsdk_win7/files/Lib', 55 '<(DEPTH)/third_party/platformsdk_win7/files/Lib',
56 '<(PRODUCT_DIR)/lib' 56 '<(PRODUCT_DIR)/lib'
57 ], 57 ],
58 'DelayLoadDLLs': [], 58 'DelayLoadDLLs': [],
59 'EntryPointSymbol': 'MainEntryPoint', 59 'EntryPointSymbol': 'MainEntryPoint',
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 'conditions': [ 160 'conditions': [
161 ['enable_hidpi == 1', { 161 ['enable_hidpi == 1', {
162 'variables': { 162 'variables': {
163 'enable_hidpi_flag': '--enable_hidpi=1', 163 'enable_hidpi_flag': '--enable_hidpi=1',
164 }, 164 },
165 }, { 165 }, {
166 'variables': { 166 'variables': {
167 'enable_hidpi_flag': '', 167 'enable_hidpi_flag': '',
168 }, 168 },
169 }], 169 }],
170 ['enable_metro == 1', { 170 ['enable_touch_ui == 1', {
171 'variables': { 171 'variables': {
172 'enable_metro_flag': '--enable_metro=1', 172 'enable_touch_ui_flag': '--enable_touch_ui=1',
173 }, 173 },
174 }, { 174 }, {
175 'variables': { 175 'variables': {
176 'enable_metro_flag': '', 176 'enable_touch_ui_flag': '',
177 }, 177 },
178 }], 178 }],
179 ], 179 ],
180 'inputs': [ 180 'inputs': [
181 '<(create_installer_archive_py_path)', 181 '<(create_installer_archive_py_path)',
182 '<(PRODUCT_DIR)/chrome.exe', 182 '<(PRODUCT_DIR)/chrome.exe',
183 '<(chrome_dll_path)', 183 '<(chrome_dll_path)',
184 '<(PRODUCT_DIR)/nacl64.exe', 184 '<(PRODUCT_DIR)/nacl64.exe',
185 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 185 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
186 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 186 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
(...skipping 10 matching lines...) Expand all
197 ], 197 ],
198 'action': [ 198 'action': [
199 'python', 199 'python',
200 '<(create_installer_archive_py_path)', 200 '<(create_installer_archive_py_path)',
201 '--build_dir=<(PRODUCT_DIR)', 201 '--build_dir=<(PRODUCT_DIR)',
202 '--output_dir=<(output_dir)', 202 '--output_dir=<(output_dir)',
203 '--staging_dir=<(INTERMEDIATE_DIR)', 203 '--staging_dir=<(INTERMEDIATE_DIR)',
204 '--input_file=<(RULE_INPUT_PATH)', 204 '--input_file=<(RULE_INPUT_PATH)',
205 '--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc', 205 '--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc',
206 '<(enable_hidpi_flag)', 206 '<(enable_hidpi_flag)',
207 '<(enable_metro_flag)', 207 '<(enable_touch_ui_flag)',
208 # TODO(sgk): may just use environment variables 208 # TODO(sgk): may just use environment variables
209 #'--distribution=$(CHROMIUM_BUILD)', 209 #'--distribution=$(CHROMIUM_BUILD)',
210 '--distribution=_google_chrome', 210 '--distribution=_google_chrome',
211 # Optional arguments to generate diff installer 211 # Optional arguments to generate diff installer
212 #'--last_chrome_installer=C:/Temp/base', 212 #'--last_chrome_installer=C:/Temp/base',
213 #'--setup_exe_format=DIFF', 213 #'--setup_exe_format=DIFF',
214 #'--diff_algorithm=COURGETTE', 214 #'--diff_algorithm=COURGETTE',
215 ], 215 ],
216 'message': 'Create installer archive' 216 'message': 'Create installer archive'
217 }, 217 },
218 ], 218 ],
219 # TODO(mark): <(branding_dir) should be defined by the 219 # TODO(mark): <(branding_dir) should be defined by the
220 # global condition block at the bottom of the file, but 220 # global condition block at the bottom of the file, but
221 # this doesn't work due to the following issue: 221 # this doesn't work due to the following issue:
222 # 222 #
223 # http://code.google.com/p/gyp/issues/detail?id=22 223 # http://code.google.com/p/gyp/issues/detail?id=22
224 # 224 #
225 # Remove this block once the above issue is fixed. 225 # Remove this block once the above issue is fixed.
226 'conditions': [ 226 'conditions': [
227 [ 'branding == "Chrome"', { 227 [ 'branding == "Chrome"', {
228 'variables': { 228 'variables': {
229 'branding_dir': '../app/theme/google_chrome', 229 'branding_dir': '../app/theme/google_chrome',
230 }, 230 },
231 }, { # else branding!="Chrome" 231 }, { # else branding!="Chrome"
232 'variables': { 232 'variables': {
233 'branding_dir': '../app/theme/chromium', 233 'branding_dir': '../app/theme/chromium',
234 }, 234 },
235 }], 235 }],
236 ], 236 ],
237 } 237 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698