Changeset bf47f2d in sasview

Timestamp:

Aug 10, 2011 4:41:03 PM (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:

e0459a0

Parents:

5182a89

Message:

updATE SETUP.PU

File:

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

sansrealspace_modeling/setup.py

@@ -29 +29 @@
 #pck_top = "sansModeling"
 pck_top = "sans.simulation"
-
+pck_dir = os.path.join("src","sans", "simulation")
 # The temp directory that the compiled files will be put in
 tempdir = "build/temp."+util.get_platform()+'-'+sysconfig.get_python_version()
@@ -39 +39 @@
 
 # Define package directors, will be extended below
-pck_dirs = {pck_top:os.path.join('sans', 'simulation')}
+pck_dirs = {pck_top:pck_dir}
 
 # List of modules to install, will be extende below
@@ -64 +64 @@
 
 for module in mod_list:
-    temp_path = os.path.join('sans', 'simulation', module, module)
+    temp_path = os.path.join(pck_dir, module, module)
     pck_dirs["%s.%s" % (pck_top, module)] = temp_path
     pck_list.append("%s.%s" % (pck_top, module))
 
-    src_m = "sans/simulation/%s/%smodule" % (module, module)
-    src_l = "sans/simulation/%s/lib%s" % (module, module)
+    src_m = os.path.join(pck_dir, module, "%smodule" %(module))
+    src_l = os.path.join(pck_dir, module, "lib%s" % (module))
 
     files = get_c_files(src_m)
@@ -77 +77 @@
     for dep in deps[module]:
         
-        for f in get_c_files("sans/simulation/%s/lib%s" % (dep, dep)):
+        for f in get_c_files(os.path.join(pck_dir, dep, "lib%s" % dep)):
             index = f.rindex('.')
             if os.name=='nt':
@@ -83 +83 @@
             else:
                 fo = f[:index]+'.o'
-            libs[module].append("%s/%s" %(tempdir,fo))
+            libs[module].append("%s/%s" %(tempdir, fo))
         
     files.extend(list_lib)