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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 10160011: Create VisualElementsManifest.xml from template -- install VisualElements in the version directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add comment 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 { 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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 '<(DEPTH)/testing/gtest.gyp:gtest', 357 '<(DEPTH)/testing/gtest.gyp:gtest',
358 ], 358 ],
359 'include_dirs': [ 359 'include_dirs': [
360 '<(DEPTH)', 360 '<(DEPTH)',
361 '<(INTERMEDIATE_DIR)', 361 '<(INTERMEDIATE_DIR)',
362 ], 362 ],
363 # TODO(robertshield): Move the items marked with "Move to lib" 363 # TODO(robertshield): Move the items marked with "Move to lib"
364 # below into a separate lib and then link both setup.exe and 364 # below into a separate lib and then link both setup.exe and
365 # setup_unittests.exe against that. 365 # setup_unittests.exe against that.
366 'sources': [ 366 'sources': [
367 'installer/mini_installer/chrome.release', # Move to lib
367 'installer/mini_installer/appid.h', 368 'installer/mini_installer/appid.h',
368 'installer/mini_installer/chrome_appid.cc', 369 'installer/mini_installer/chrome_appid.cc',
369 'installer/mini_installer/configuration.cc', 370 'installer/mini_installer/configuration.cc',
370 'installer/mini_installer/configuration.h', 371 'installer/mini_installer/configuration.h',
371 'installer/mini_installer/configuration_test.cc', 372 'installer/mini_installer/configuration_test.cc',
372 'installer/mini_installer/decompress.cc', 373 'installer/mini_installer/decompress.cc',
373 'installer/mini_installer/decompress.h', 374 'installer/mini_installer/decompress.h',
374 'installer/mini_installer/decompress_test.cc', 375 'installer/mini_installer/decompress_test.cc',
375 'installer/mini_installer/mini_string.cc', 376 'installer/mini_installer/mini_string.cc',
376 'installer/mini_installer/mini_string.h', 377 'installer/mini_installer/mini_string.h',
377 'installer/mini_installer/mini_string_test.cc', 378 'installer/mini_installer/mini_string_test.cc',
378 'installer/setup/install_worker.cc', # Move to lib 379 'installer/setup/install.cc', # Move to lib
379 'installer/setup/install_worker.h', # Move to lib 380 'installer/setup/install.h', # Move to lib
381 'installer/setup/install_unittest.cc',
382 'installer/setup/install_worker.cc', # Move to lib
383 'installer/setup/install_worker.h', # Move to lib
380 'installer/setup/install_worker_unittest.cc', 384 'installer/setup/install_worker_unittest.cc',
381 'installer/setup/run_all_unittests.cc', 385 'installer/setup/run_all_unittests.cc',
382 'installer/setup/setup_constants.cc', # Move to lib 386 'installer/setup/setup_constants.cc', # Move to lib
383 'installer/setup/setup_constants.h', # Move to lib 387 'installer/setup/setup_constants.h', # Move to lib
384 'installer/setup/setup_unittests.rc', 388 'installer/setup/setup_unittests.rc',
385 'installer/setup/setup_unittests_resource.h', 389 'installer/setup/setup_unittests_resource.h',
386 'installer/setup/setup_util.cc', 390 'installer/setup/setup_util.cc',
387 'installer/setup/setup_util_unittest.cc', 391 'installer/setup/setup_util_unittest.cc',
388 ], 392 ],
393 'rules': [
394 {
395 'rule_name': 'server_dlls', # Move to lib
396 'extension': 'release',
397 'variables': {
398 'scan_server_dlls_py' : 'tools/build/win/scan_server_dlls.py',
399 'template_file': 'mini_installer/chrome.release',
400 },
401 'inputs': [
402 '<(scan_server_dlls_py)',
403 '<(template_file)'
404 ],
405 'outputs': [
406 '<(INTERMEDIATE_DIR)/registered_dlls.h',
407 ],
408 'action': [
409 'python',
410 '<(scan_server_dlls_py)',
411 '--output_dir=<(PRODUCT_DIR)',
412 '--input_file=<(RULE_INPUT_PATH)',
413 '--header_output_dir=<(INTERMEDIATE_DIR)',
414 # TODO(sgk): may just use environment variables
415 #'--distribution=$(CHROMIUM_BUILD)',
416 '--distribution=_google_chrome',
417 ],
418 },
419 ],
389 }, 420 },
390 ], 421 ],
391 }], 422 }],
392 ['OS=="linux" and branding=="Chrome"', { 423 ['OS=="linux" and branding=="Chrome"', {
393 'variables': { 424 'variables': {
394 # Always google_chrome since this only applies to branding==Chrome. 425 # Always google_chrome since this only applies to branding==Chrome.
395 'branding_dir': 'app/theme/google_chrome', 426 'branding_dir': 'app/theme/google_chrome',
396 'version' : '<!(python <(version_py_path) -f <(DEPTH)/chrome/VERSION -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")', 427 'version' : '<!(python <(version_py_path) -f <(DEPTH)/chrome/VERSION -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
397 'revision' : '<!(python <(DEPTH)/build/util/lastchange.py --revision-onl y)', 428 'revision' : '<!(python <(DEPTH)/build/util/lastchange.py --revision-onl y)',
398 'packaging_files_common': [ 429 'packaging_files_common': [
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 'variables': { 974 'variables': {
944 'branding_dir': 'app/theme/google_chrome', 975 'branding_dir': 'app/theme/google_chrome',
945 }, 976 },
946 }, { # else branding!="Chrome" 977 }, { # else branding!="Chrome"
947 'variables': { 978 'variables': {
948 'branding_dir': 'app/theme/chromium', 979 'branding_dir': 'app/theme/chromium',
949 }, 980 },
950 }], 981 }],
951 ], 982 ],
952 } 983 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/mini_installer/chrome.release » ('j') | chrome/installer/setup/install.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698