commit 6829582006173469595a7690e3e2c71a61ce208c Author: Damian Johnson atagar@torproject.org Date: Thu Sep 29 08:20:40 2011 -0700
Dropping gtk/cagraph requirements
The arm gui is still a prototype and shouldn't introduce requrements for end users, or even be packaged yet. This properly does dependency checks when the user *requsts* the gui (fetching cagraph if unavailable) so this should make everyone happy. :) --- install | 2 +- setup.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/install b/install index 605f724..fead85c 100755 --- a/install +++ b/install @@ -1,5 +1,5 @@ #!/bin/sh -python src/prereq.py --both +python src/prereq.py
if [ $? = 0 ]; then python setup.py -q install diff --git a/setup.py b/setup.py index 4513dee..bc97d00 100644 --- a/setup.py +++ b/setup.py @@ -6,6 +6,8 @@ import tempfile from src.version import VERSION from distutils.core import setup
+INCLUDE_CAGRAPH = False + def getResources(dst, sourceDir): """ Provides a list of tuples of the form... @@ -93,8 +95,9 @@ if "install" in sys.argv: # When installing we include a bundled copy of TorCtl. However, when creating # a deb we have a dependency on the python-torctl package instead: # http://packages.debian.org/unstable/main/python-torctl -installPackages = ['arm', 'arm.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.gui', 'arm.gui.connections', 'arm.gui.graphing', 'arm.util', 'arm.cagraph', 'arm.cagraph.axis', 'arm.cagraph.series'] +installPackages = ['arm', 'arm.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.gui', 'arm.gui.connections', 'arm.gui.graphing', 'arm.util'] if not isDebInstall: installPackages.append('arm.TorCtl') +if INCLUDE_CAGRAPH: installPackages += ['arm.cagraph', 'arm.cagraph.axis', 'arm.cagraph.series']
setup(name='arm', version=VERSION,