[Rivet-svn] r2604 - in trunk/pyext: . rivet

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Jul 22 13:08:02 2010
New Revision: 2604

Log:
Improvements to Python extension building

Modified:
   trunk/pyext/Makefile.am
   trunk/pyext/rivet/rivetwrap.i
   trunk/pyext/setup.py.in

Modified: trunk/pyext/Makefile.am
==============================================================================
--- trunk/pyext/Makefile.am	Wed Jul 21 15:59:45 2010	(r2603)
+++ trunk/pyext/Makefile.am	Thu Jul 22 13:08:02 2010	(r2604)
@@ -10,10 +10,11 @@
 install-exec-local:
 	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
 
+## TODO: Really want DESTDIR here?
 uninstall-local:
-	rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/rivet
-	rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/lighthisto.py*
-	rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/spiresbib.py*
+	rm -rf $(DESTDIR)$(RIVET_PYTHONPATH)/rivet
+	rm -rf $(DESTDIR)$(RIVET_PYTHONPATH)/lighthisto.py*
+	rm -rf $(DESTDIR)$(RIVET_PYTHONPATH)/spiresbib.py*
 
 clean-local:
 	$(PYTHON) setup.py clean --all

Modified: trunk/pyext/rivet/rivetwrap.i
==============================================================================
--- trunk/pyext/rivet/rivetwrap.i	Wed Jul 21 15:59:45 2010	(r2603)
+++ trunk/pyext/rivet/rivetwrap.i	Thu Jul 22 13:08:02 2010	(r2604)
@@ -41,7 +41,7 @@
   class Log {
   public:
     enum Level {
-      TRACE = 0, DEBUG = 10, INFO = 20, WARN = 30, WARNING = 30, ERROR = 40
+      TRACE = 0, DEBUG = 10, INFO = 20, WARN = 30, WARNING = 30, ERROR = 40, CRITICAL = 50, ALWAYS = 50
     };
     static void setLevel(const std::string& name, int level);
   protected:

Modified: trunk/pyext/setup.py.in
==============================================================================
--- trunk/pyext/setup.py.in	Wed Jul 21 15:59:45 2010	(r2603)
+++ trunk/pyext/setup.py.in	Thu Jul 22 13:08:02 2010	(r2604)
@@ -1,13 +1,13 @@
 #! /usr/bin/env python
 
-from distutils.core import setup, Extension
-
-longdesc = """This is a simple SWIG wrapper on the main steering interface of
+"""This is a simple SWIG wrapper on the main steering interface of
 the Rivet event simulation analysis library. It is used to create, query and
 use the Rivet C++ analysis classes from a Python program, of which the prime
 example is Rivet's own command line interface.
 """
 
+from distutils.core import setup, Extension
+
 ## Extension definition
 import os
 incdir = os.path.abspath('@top_srcdir@/include')
@@ -24,14 +24,14 @@
 ## Setup definition
 setup(name = 'Rivet',
       version = '@PACKAGE_VERSION@',
-      ext_package='rivet',
-      ext_modules=[ext],
+      ext_package = 'rivet',
+      ext_modules = [ext],
       py_modules = ['lighthisto', 'spiresbib', 'rivet.__init__', 'rivet.rivetwrap'],
       author = ['Andy Buckley'],
-      author_email = 'andy at insectnation.org',
+      author_email = 'andy.buckley at cern.ch',
       url = 'http://projects.hepforge.org/rivet/',
       description = 'Rivet: a Python interface to the Rivet high-energy physics analysis library.',
-      long_description = longdesc,
+      long_description = __doc__,
       keywords = 'generator montecarlo simulation data hep physics particle validation analysis tuning',
       license = 'GPL'
       )