Changeset 5980b1a in sasview

Timestamp:

Oct 9, 2013 1:43:43 PM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

17b1873

Parents:

cc3066a

Message:

Clean up setup.py

File:

• setup.py (modified) (9 diffs)

setup.py

@@ -5 +5 @@
 import sys
 import os
-import platform
-import shutil
-from setuptools import setup, Extension, find_packages
+from setuptools import setup, Extension
 from distutils.command.build_ext import build_ext
 
@@ -56 +54 @@
     f_path = os.path.join(sans_dir, 'plugin_models')
     if os.path.isdir(f_path):
-        for file in os.listdir(f_path): 
-            if file in plugin_model_list:
-                file_path =  os.path.join(f_path, file)
+        for f in os.listdir(f_path): 
+            if f in plugin_model_list:
+                file_path =  os.path.join(f_path, f)
                 os.remove(file_path)
                     
@@ -93 +91 @@
         if enable_openmp:
             if copt.has_key(c):
-               for e in self.extensions:
-                   e.extra_compile_args = copt[ c ]
+                for e in self.extensions:
+                    e.extra_compile_args = copt[ c ]
             if lopt.has_key(c):
                 for e in self.extensions:
@@ -106 +104 @@
         build_ext.build_extensions(self)
 
+# sans module
+package_dir["sans"] = os.path.join("src", "sans")
+packages.append("sans")
 
 # sans.invariant
@@ -118 +119 @@
 packages.extend(["sans.guiframe", "sans.guiframe.local_perspectives"])
 # build local plugin
-for dir in os.listdir(os.path.join(guiframe_path, "local_perspectives")):
-    if dir not in ['.svn','__init__.py', '__init__.pyc']:
-        package_name = "sans.guiframe.local_perspectives." + dir
+for d in os.listdir(os.path.join(guiframe_path, "local_perspectives")):
+    if d not in ['.svn','__init__.py', '__init__.pyc']:
+        package_name = "sans.guiframe.local_perspectives." + d
         packages.append(package_name)
-        package_dir[package_name] = os.path.join(guiframe_path, "local_perspectives", dir)
+        package_dir[package_name] = os.path.join(guiframe_path, "local_perspectives", d)
 
 # sans.dataloader
@@ -216 +217 @@
 if not os.name=='nt':
     IGNORED_FILES.extend(["gamma_win.c","winFuncs.c"])
-
 
 EXTENSIONS = [".c", ".cpp"]
@@ -247 +247 @@
 append_file(file_list=smear_sources, dir_path=smear_dir)
         
+package_dir["sans.models"] = model_dir
+package_dir["sans.models.sans_extension"] = os.path.join("src", "sans", "models", "sans_extension")
+package_data['sans.models'] = [os.path.join('media', "*.*")]
+package_data['sans.models'] += [os.path.join('media','img', "*.*")]
+packages.extend(["sans.models","sans.models.sans_extension"])
+    
+smearer_sources = [os.path.join(smear_dir, "smearer.cpp"),
+                  os.path.join(smear_dir, "smearer_module.cpp")]
+geni_sources = [os.path.join(gen_dir, "sld2i_module.cpp")]
+if os.name=='nt':
+    smearer_sources.append(os.path.join(igordir, "winFuncs.c"))
+    geni_sources.append(os.path.join(igordir, "winFuncs.c"))
+ext_modules.extend( [ Extension("sans.models.sans_extension.c_models",
+                                sources=model_sources,                 
+                                include_dirs=[igordir, includedir, 
+                                              c_model_dir, numpy_incl_path, cephes_dir],
+                                ),       
+                    # Smearer extension
+                    Extension("sans.models.sans_extension.smearer",
+                              sources = smearer_sources,
+                              include_dirs=[igordir, 
+                                            smear_dir, numpy_incl_path],
+                              ),
+                    
+                    Extension("sans.models.sans_extension.smearer2d_helper",
+                              sources = [os.path.join(smear_dir, 
+                                                "smearer2d_helper_module.cpp"),
+                                         os.path.join(smear_dir, 
+                                                "smearer2d_helper.cpp"),],
+                              include_dirs=[smear_dir, numpy_incl_path],
+                              ),
+                    
+                    Extension("sans.models.sans_extension.sld2i",
+                              sources = [os.path.join(gen_dir, 
+                                                "sld2i_module.cpp"),
+                                         os.path.join(gen_dir, 
+                                                "sld2i.cpp"),
+                                         os.path.join(c_model_dir, 
+                                                "libfunc.c"),
+                                         os.path.join(c_model_dir, 
+                                                "librefl.c"),],
+                              include_dirs=[gen_dir, includedir, 
+                                            c_model_dir, numpy_incl_path],
+                              )
+                    ] )
+        
 # SasView
 
@@ -264 +310 @@
     required.extend(['pil'])
    
- # Set up SasView    
+# Set up SasView    
 setup(
     name="sasview",
@@ -271 +317 @@
     author = "University of Tennessee",
     author_email = "sansdanse@gmail.com",
-    url = "http://danse.chem.utk.edu",
+    url = "http://sasview.org",
     license = "PSF",
     keywords = "small-angle x-ray and neutron scattering analysis",