Changeset 22bb59b in sasview

Timestamp:

Aug 9, 2011 11:49:16 AM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

a91dda9

Parents:

804dd60

Message:

modify setup.py to include change of directories

File:

• sansrealspace_modeling/src/setup.py (modified) (5 diffs)

sansrealspace_modeling/src/setup.py

@@ -8 +8 @@
 
 """
-import sys, os
-from distutils.core import setup, Extension
+import sys
+import os
+from distutils.core import setup
+from distutils.core import Extension
 from distutils import util
 from distutils import sysconfig
@@ -37 +39 @@
 
 # Define package directors, will be extended below
-pck_dirs = {pck_top:"."}
+pck_dirs = {pck_top:os.path.join('sans', 'simulation')}
 
 # List of modules to install, will be extende below
@@ -62 +64 @@
 
 for module in mod_list:
-    pck_dirs["%s.%s" % (pck_top, module)] = "%s/%s" % (module, module)
+    temp_path = os.path.join('sans', 'simulation', module, module)
+    pck_dirs["%s.%s" % (pck_top, module)] = temp_path
     pck_list.append("%s.%s" % (pck_top, module))
 
-    src_m = "%s/%smodule" % (module, module)
-    src_l = "%s/lib%s" % (module, module)
+    src_m = "sans/simulation/%s/%smodule" % (module, module)
+    src_l = "sans/simulation/%s/lib%s" % (module, module)
 
     files = get_c_files(src_m)
@@ -74 +77 @@
     for dep in deps[module]:
         
-        for f in get_c_files("%s/lib%s" % (dep, dep)):
+        for f in get_c_files("sans/simulation/%s/lib%s" % (dep, dep)):
             index = f.rindex('.')
             if os.name=='nt':
@@ -95 +98 @@
 
 setup(
-    name="realspacesimulation",
+    name="sans.simulation",
     version = "0.2",
     description = "Python module for SANS simulation",
     author = "University of Tennessee",
     url = "http://danse.us/trac/sans",
-    
     package_dir = pck_dirs,
     packages    = pck_list,
-    
     ext_modules = exts)