Changeset 67424cd in sasview for sansmodels/setup.py

Timestamp:

Jan 4, 2012 3:17:10 PM (13 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:

31af069

Parents:

8bea12dd

Message:

Reorganizing models in preparation of cpp cleanup

File:

• sansmodels/setup.py (modified) (3 diffs)

sansmodels/setup.py

@@ -48 +48 @@
 
 # Build the module name
-srcdir  = os.path.join("src", "sans", "models", "c_extensions")
-igordir = os.path.join("src","sans", "models", "libigor")
-c_model_dir = os.path.join("src", "sans", "models", "c_models")
-smear_dir  = os.path.join("src", "sans", "models", "c_smearer")
+srcdir  = os.path.join("src", "c_extensions")
+igordir = os.path.join("src", "libigor")
+c_model_dir = os.path.join("src", "c_models")
+smear_dir  = os.path.join("src", "c_smearer")
+wrapper_dir  = os.path.join("src", "python_wrapper")
 print "Installing SANS models"
 
@@ -95 +96 @@
 append_file(file_list=model_sources, dir_path=igordir)
 append_file(file_list=model_sources, dir_path=c_model_dir)
+append_file(file_list=model_sources, dir_path=wrapper_dir)
 smear_sources = []
 append_file(file_list=smear_sources, dir_path=smear_dir)
@@ -124 +126 @@
                 "sans.models.sans_extension",],
     
-    ext_modules = [ Extension("sans.models.sans_extension.c_models",
-                              sources=model_sources,                 
-                              include_dirs=[igordir, srcdir, c_model_dir, numpy_incl_path],   
-                              ),
-    
+    ext_modules = [ 
+                   
+        Extension("sans.models.sans_extension.c_models",
+                    sources=model_sources,                 
+                    include_dirs=[igordir, srcdir, c_model_dir, numpy_incl_path],   
+                    ),
+
         # Smearer extension
         Extension("sans.models.sans_extension.smearer",