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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 8774018: Add psutil build step to fix pyauto media issues. Upgrade psutil to 0.4.0. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add OSX, WIN support. Created 9 years 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
« no previous file with comments | « no previous file | third_party/psutil/HISTORY » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables' : { 5 'variables' : {
6 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 'dependencies': [ 436 'dependencies': [
437 # Needed for the following #include chain: 437 # Needed for the following #include chain:
438 # test/base/run_all_unittests.cc 438 # test/base/run_all_unittests.cc
439 # test/base/chrome_test_suite.h 439 # test/base/chrome_test_suite.h
440 # gtk/gtk.h 440 # gtk/gtk.h
441 '../build/linux/system.gyp:gtk', 441 '../build/linux/system.gyp:gtk',
442 ], 442 ],
443 }], 443 }],
444 ], 444 ],
445 }, 445 },
446 { 446 {
Nirnimesh 2011/12/08 00:23:41 I forgot to point out earlier: the gyp rule for ps
DaleCurtis 2011/12/08 22:04:38 Hurm. So I'm having trouble getting this working w
Nirnimesh 2011/12/08 22:40:56 Can you upload your latest CL? You could take othe
DaleCurtis 2011/12/08 23:03:36 Done. I looked there, but psutil is a unique in th
447 'target_name': 'test_support_psutil',
448 'type': 'static_library',
449 'actions': [
450 {
451 'action_name': 'psutil_build',
452 'inputs': [
453 '../third_party/psutil/psutil/_psutil_bsd.c',
454 '../third_party/psutil/psutil/_psutil_common.c',
455 '../third_party/psutil/psutil/_psutil_linux.c',
456 '../third_party/psutil/psutil/_psutil_mswindows.c',
457 '../third_party/psutil/psutil/_psutil_osx.c',
458 '../third_party/psutil/psutil/_psutil_posix.c',
459 '../third_party/psutil/psutil/_psutil_bsd.h',
460 '../third_party/psutil/psutil/_psutil_common.h',
461 '../third_party/psutil/psutil/_psutil_linux.h',
462 '../third_party/psutil/psutil/_psutil_mswindows.h',
463 '../third_party/psutil/psutil/_psutil_osx.h',
464 '../third_party/psutil/psutil/_psutil_posix.h',
Nirnimesh 2011/12/08 00:23:41 please include setup.py as well, since we want to
DaleCurtis 2011/12/08 22:04:38 Done.
465 ],
466 'outputs': [
467 '<(PRODUCT_DIR)/psutil',
468 '<(PRODUCT_DIR)/psutil/_compat.py',
469 '<(PRODUCT_DIR)/psutil/_psosx.py',
470 '<(PRODUCT_DIR)/psutil/__init__.py',
471 '<(PRODUCT_DIR)/psutil/_pslinux.py',
472 '<(PRODUCT_DIR)/psutil/_common.py',
473 '<(PRODUCT_DIR)/psutil/error.py',
474 '<(PRODUCT_DIR)/psutil/_psmswindows.py',
475 '<(PRODUCT_DIR)/psutil/_psbsd.py',
476 '<(PRODUCT_DIR)/psutil/_psposix.py',
477 ],
478 'conditions': [
479 ['OS=="linux"', {
480 'outputs': [
481 '<(PRODUCT_DIR)/_psutil_linux.so',
482 '<(PRODUCT_DIR)/_psutil_posix.so',
483 ],
484 },],
Nirnimesh 2011/12/08 00:23:41 nit: first , not necessary
DaleCurtis 2011/12/08 22:04:38 Done.
485 ['OS=="mac"', {
486 'outputs': [
487 '<(PRODUCT_DIR)/_psutil_osx.so',
488 '<(PRODUCT_DIR)/_psutil_posix.so',
489 ],
490 },],
491 ['OS=="win"', {
492 'outputs': [
493 '<(PRODUCT_DIR)/_psutil_mswindows.pyd',
494 ],
495 },],
496 ],
497 'action': ['python',
498 '../third_party/psutil/build.py',
499 '<(PRODUCT_DIR)'
500 ],
501 'message': 'Generating psutil binary',
Nirnimesh 2011/12/08 00:23:41 s/binary/binaries/
DaleCurtis 2011/12/08 22:04:38 Done.
502 },
503 ], # actions
504 },
505 {
447 'target_name': 'automated_ui_tests', 506 'target_name': 'automated_ui_tests',
448 'type': 'executable', 507 'type': 'executable',
449 'dependencies': [ 508 'dependencies': [
450 'browser', 509 'browser',
451 'chrome_resources.gyp:theme_resources', 510 'chrome_resources.gyp:theme_resources',
452 'renderer', 511 'renderer',
453 'test_support_common', 512 'test_support_common',
454 'test_support_ui', 513 'test_support_ui',
455 '../base/base.gyp:base', 514 '../base/base.gyp:base',
456 '../skia/skia.gyp:skia', 515 '../skia/skia.gyp:skia',
(...skipping 3565 matching lines...) Expand 10 before | Expand all | Expand 10 after
4022 'type': 'loadable_module', 4081 'type': 'loadable_module',
4023 'product_prefix': '_', 4082 'product_prefix': '_',
4024 'dependencies': [ 4083 'dependencies': [
4025 'chrome', 4084 'chrome',
4026 'chrome_resources.gyp:chrome_resources', 4085 'chrome_resources.gyp:chrome_resources',
4027 'chrome_resources.gyp:chrome_strings', 4086 'chrome_resources.gyp:chrome_strings',
4028 'chrome_resources.gyp:theme_resources', 4087 'chrome_resources.gyp:theme_resources',
4029 'debugger', 4088 'debugger',
4030 'syncapi_core', 4089 'syncapi_core',
4031 'test_support_common', 4090 'test_support_common',
4091 'test_support_psutil',
4032 '../skia/skia.gyp:skia', 4092 '../skia/skia.gyp:skia',
4033 '../testing/gtest.gyp:gtest', 4093 '../testing/gtest.gyp:gtest',
4034 ], 4094 ],
4035 'export_dependent_settings': [ 4095 'export_dependent_settings': [
4036 'test_support_common', 4096 'test_support_common',
4037 ], 4097 ],
4038 'include_dirs': [ 4098 'include_dirs': [
4039 '..', 4099 '..',
4040 ], 4100 ],
4041 'cflags': [ 4101 'cflags': [
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
4311 # Use outputs of this action as inputs for the main target build. 4371 # Use outputs of this action as inputs for the main target build.
4312 # Seems as a misnomer but makes this happy on Linux (scons). 4372 # Seems as a misnomer but makes this happy on Linux (scons).
4313 'process_outputs_as_sources': 1, 4373 'process_outputs_as_sources': 1,
4314 }, 4374 },
4315 ], # 'actions' 4375 ], # 'actions'
4316 }, 4376 },
4317 ] 4377 ]
4318 }], # 'coverage!=0' 4378 }], # 'coverage!=0'
4319 ], # 'conditions' 4379 ], # 'conditions'
4320 } 4380 }
OLDNEW
« no previous file with comments | « no previous file | third_party/psutil/HISTORY » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698