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

Unified Diff: third_party/psutil/setup.py

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: Disable Mac builds. 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 side-by-side diff with in-line comments
Download patch
Index: third_party/psutil/setup.py
diff --git a/third_party/psutil/setup.py b/third_party/psutil/setup.py
index d7383cb80a26e003d9fe6b28546eea2ee4ee909b..a6489b29c4579f93e061801d2cd55214489faf75 100644
--- a/third_party/psutil/setup.py
+++ b/third_party/psutil/setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# $Id: setup.py 1142 2011-10-05 18:45:49Z g.rodola $
+# $Id: setup.py 1189 2011-10-22 16:44:17Z g.rodola $
#
# Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
@@ -13,7 +13,7 @@ try:
except ImportError:
from distutils.core import setup, Extension
-__ver__ = "0.3.1"
+__ver__ = "0.4.0"
# Hack for Python 3 to tell distutils to run 2to3 against the files
# copied in the build directory before installing.
@@ -44,8 +44,8 @@ if sys.platform.lower().startswith("win"):
'psutil/arch/mswindows/security.c'],
define_macros=[('_WIN32_WINNT', get_winver()),
('_AVAIL_WINVER_', get_winver())],
- libraries=["psapi", "kernel32", "advapi32", "shell32",
- "netapi32"]
+ libraries=["psapi", "kernel32", "advapi32",
+ "shell32", "netapi32", "iphlpapi"]
)]
# OS X
elif sys.platform.lower().startswith("darwin"):
@@ -53,7 +53,8 @@ elif sys.platform.lower().startswith("darwin"):
sources = ['psutil/_psutil_osx.c',
'psutil/_psutil_common.c',
'psutil/arch/osx/process_info.c'],
- extra_link_args=['-framework', 'CoreFoundation', '-framework', 'IOKit']
+ extra_link_args=['-framework', 'CoreFoundation',
+ '-framework', 'IOKit']
),
posix_extension]
# FreeBSD
@@ -61,7 +62,8 @@ elif sys.platform.lower().startswith("freebsd"):
extensions = [Extension('_psutil_bsd',
sources = ['psutil/_psutil_bsd.c',
'psutil/_psutil_common.c',
- 'psutil/arch/bsd/process_info.c']
+ 'psutil/arch/bsd/process_info.c'],
+ libraries=["devstat"],
),
posix_extension]
# Linux
@@ -86,7 +88,7 @@ psutil is a module providing convenience functions for monitoring
system and processes in a portable way by using Python.""",
keywords=['ps', 'top', 'kill', 'free', 'lsof', 'netstat', 'nice',
'tty', 'ionice', 'uptime', 'taskmgr', 'process', 'df',
- 'monitoring'],
+ 'iotop', 'iostat', 'monitoring',],
author='Giampaolo Rodola, Jay Loden',
author_email='psutil@googlegroups.com',
url='http://code.google.com/p/psutil/',

Powered by Google App Engine
This is Rietveld 408576698