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

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

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, 6 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 | « build/common.gypi ('k') | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py', 3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION', 4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', 5 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom. 6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 'msvs_use_common_release': 0, 7 'msvs_use_common_release': 0,
8 'msvs_use_common_linker_extras': 0, 8 'msvs_use_common_linker_extras': 0,
9 'mini_installer_internal_deps%': 0, 9 'mini_installer_internal_deps%': 0,
10 }, 10 },
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 'conditions': [ 197 'conditions': [
198 ['enable_hidpi == 1', { 198 ['enable_hidpi == 1', {
199 'variables': { 199 'variables': {
200 'enable_hidpi_flag': '--enable_hidpi=1', 200 'enable_hidpi_flag': '--enable_hidpi=1',
201 }, 201 },
202 }, { 202 }, {
203 'variables': { 203 'variables': {
204 'enable_hidpi_flag': '', 204 'enable_hidpi_flag': '',
205 }, 205 },
206 }], 206 }],
207 ['enable_metro == 1', { 207 ['enable_touch_ui == 1', {
208 'variables': { 208 'variables': {
209 'enable_metro_flag': '--enable_metro=1', 209 'enable_touch_ui_flag': '--enable_touch_ui=1',
sky 2012/05/24 23:45:34 I'm not familiar with the mini installer. Will thi
Jói 2012/05/25 10:30:18 This will cause the assets needed for the touch la
210 }, 210 },
211 }, { 211 }, {
212 'variables': { 212 'variables': {
213 'enable_metro_flag': '', 213 'enable_touch_ui_flag': '',
214 }, 214 },
215 }], 215 }],
216 ['component == "shared_library"', { 216 ['component == "shared_library"', {
217 'variables': { 217 'variables': {
218 'component_build_flag': '--component_build=1', 218 'component_build_flag': '--component_build=1',
219 }, 219 },
220 }, { 220 }, {
221 'variables': { 221 'variables': {
222 'component_build_flag': '', 222 'component_build_flag': '',
223 }, 223 },
(...skipping 18 matching lines...) Expand all
242 '<(INTERMEDIATE_DIR)/packed_files.rc', 242 '<(INTERMEDIATE_DIR)/packed_files.rc',
243 ], 243 ],
244 'action': [ 244 'action': [
245 'python', 245 'python',
246 '<(create_installer_archive_py_path)', 246 '<(create_installer_archive_py_path)',
247 '--build_dir', '<(PRODUCT_DIR)', 247 '--build_dir', '<(PRODUCT_DIR)',
248 '--staging_dir', '<(INTERMEDIATE_DIR)', 248 '--staging_dir', '<(INTERMEDIATE_DIR)',
249 '--input_file', '<(RULE_INPUT_PATH)', 249 '--input_file', '<(RULE_INPUT_PATH)',
250 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', 250 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc',
251 '<(enable_hidpi_flag)', 251 '<(enable_hidpi_flag)',
252 '<(enable_metro_flag)', 252 '<(enable_touch_ui_flag)',
253 '<(component_build_flag)', 253 '<(component_build_flag)',
254 # TODO(sgk): may just use environment variables 254 # TODO(sgk): may just use environment variables
255 #'--distribution=$(CHROMIUM_BUILD)', 255 #'--distribution=$(CHROMIUM_BUILD)',
256 '--distribution=_google_chrome', 256 '--distribution=_google_chrome',
257 # Optional arguments to generate diff installer 257 # Optional arguments to generate diff installer
258 #'--last_chrome_installer=C:/Temp/base', 258 #'--last_chrome_installer=C:/Temp/base',
259 #'--setup_exe_format=DIFF', 259 #'--setup_exe_format=DIFF',
260 #'--diff_algorithm=COURGETTE', 260 #'--diff_algorithm=COURGETTE',
261 ], 261 ],
262 'message': 'Create installer archive' 262 'message': 'Create installer archive'
(...skipping 13 matching lines...) Expand all
276 'variables': { 276 'variables': {
277 'branding_dir': '../app/theme/google_chrome', 277 'branding_dir': '../app/theme/google_chrome',
278 }, 278 },
279 }, { # else branding!="Chrome" 279 }, { # else branding!="Chrome"
280 'variables': { 280 'variables': {
281 'branding_dir': '../app/theme/chromium', 281 'branding_dir': '../app/theme/chromium',
282 }, 282 },
283 }], 283 }],
284 ], 284 ],
285 } 285 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/installer/mini_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698