[Mobies-commit] [commit] r4268 - in UDM/trunk/src/UdmPython: . udm

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu Mar  6 10:51:44 2014
New Revision: 4268

Log:
Fix setup.py

Modified:
   UDM/trunk/src/UdmPython/setup.py
   UDM/trunk/src/UdmPython/udm/__init__.py

Modified: UDM/trunk/src/UdmPython/setup.py
==============================================================================
--- UDM/trunk/src/UdmPython/setup.py	Thu Mar  6 10:51:34 2014	(r4267)
+++ UDM/trunk/src/UdmPython/setup.py	Thu Mar  6 10:51:44 2014	(r4268)
@@ -4,8 +4,10 @@
 import os
 import os.path
 import platform
-from distutils.core import setup, Extension
-from distutils.command.build_ext import build_ext
+#from distutils.core import setup, Extension
+#from distutils.command.build_ext import build_ext
+from setuptools import setup, Extension
+from setuptools.command.build_ext import build_ext
 
 this_dir = os.path.dirname(os.path.abspath(__file__))
 
@@ -22,7 +24,7 @@
 )
 
 setup_args['ext_modules'] = [
-  Extension('udm',
+  Extension('udm.udm',
     ['UdmPython.cpp'],
     libraries=['boost_python', 'udm'], # TODO: udm?
     library_dirs = [os.path.join(this_dir, '../../lib/.libs')],

Modified: UDM/trunk/src/UdmPython/udm/__init__.py
==============================================================================
--- UDM/trunk/src/UdmPython/udm/__init__.py	Thu Mar  6 10:51:34 2014	(r4267)
+++ UDM/trunk/src/UdmPython/udm/__init__.py	Thu Mar  6 10:51:44 2014	(r4268)
@@ -6,4 +6,4 @@
 http://repo.isis.vanderbilt.edu/tools/get_tool?UDM
 '''
 
-from udm import *
+from .udm import *