[or-cvs] r23035: {arm} Finishing distutil changes to make arm installable. fix: add (arm/trunk)

[Damian Johnson]

Author: atagar
Date: 2010-08-24 16:49:42 +0000 (Tue, 24 Aug 2010)
New Revision: 23035

Modified:
   arm/trunk/arm
   arm/trunk/setup.cfg
   arm/trunk/setup.py
Log:
Finishing distutil changes to make arm installable.
fix: adding '/usr/local/bin/arm' entry for the arm installation
fix: directing build to /tmp to avoid cluttering the local arm directory
fix: missing graphing moduile from install
fix: deleting autogenerated egg metadata after setup



Modified: arm/trunk/arm
===================================================================
--- arm/trunk/arm	2010-08-24 06:53:14 UTC (rev 23034)
+++ arm/trunk/arm	2010-08-24 16:49:42 UTC (rev 23035)
@@ -1,8 +1,15 @@
 #!/bin/sh
-python src/prereq.py
+if [ $0 = /usr/local/bin/arm ]
+then
+  arm_base=/usr/local/arm/
+else
+  arm_base=src/
+fi
 
+python ${arm_base}prereq.py
+
 if [ $? = 0 ]
 then
-  python -W ignore::DeprecationWarning src/starter.py $*
+  python -W ignore::DeprecationWarning ${arm_base}starter.py $*
 fi
 

Modified: arm/trunk/setup.cfg
===================================================================
--- arm/trunk/setup.cfg	2010-08-24 06:53:14 UTC (rev 23034)
+++ arm/trunk/setup.cfg	2010-08-24 16:49:42 UTC (rev 23035)
@@ -1,2 +1,6 @@
 [install]
 install-purelib=/usr/local
+install-scripts=/usr/local/bin
+
+[build]
+build-base=/tmp

Modified: arm/trunk/setup.py
===================================================================
--- arm/trunk/setup.py	2010-08-24 06:53:14 UTC (rev 23034)
+++ arm/trunk/setup.py	2010-08-24 16:49:42 UTC (rev 23035)
@@ -1,15 +1,24 @@
 #!/usr/bin/env python
-
+import os
 from distutils.core import setup
 
+VERSION = '1.3.6_dev'
+
 setup(name='arm',
-      version='1.3.6_dev',
+      version=VERSION,
       description='Terminal tor status monitor',
       license='GPL v3',
       author='Damian Johnson',
       author_email='atagar at torproject.org',
       url='http://www.atagar.com/arm/',
-      packages=['arm', 'arm.interface', 'arm.util', 'arm.TorCtl'],
+      packages=['arm', 'arm.interface', 'arm.interface.graphing', 'arm.util', 'arm.TorCtl'],
       package_dir={'arm': 'src'},
+      scripts=["arm"],
      )
 
+# Removes the egg_info file. Apparently it is not optional during setup
+# (hardcoded in distutils/command/install.py), nor are there any arguments to
+# bypass its creation.
+eggPath = '/usr/local/arm-%s.egg-info' % VERSION
+if os.path.isfile(eggPath): os.remove(eggPath)
+