Commit 68295820 authored by Damian Johnson's avatar Damian Johnson
Browse files

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. :)
parent ad8741d5

install

+1 −1
Original line number Diff line number Diff line 
#!/bin/sh

python src/prereq.py --both

python src/prereq.py



if [ $? = 0 ]; then

  python setup.py -q install

setup.py

+4 −1
Original line number Diff line number Diff line
@@ -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,