Changeset 886dde6b in sasview

Timestamp:

Jan 6, 2012 12:06:20 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:

1b758b3

Parents:

fd080830

Message:

cleanup

File:

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

sansmodels/setup.py

@@ -48 +48 @@
 
 # Build the module name
-srcdir  = os.path.join("src", "include")
+includedir  = os.path.join("src", "include")
 igordir = os.path.join("src", "libigor")
 c_model_dir = os.path.join("src", "c_models")
@@ -57 +57 @@
 sys.path.append(wrapper_dir)
 from wrapping import generate_wrappers
-generate_wrappers(header_dir=srcdir, 
+generate_wrappers(header_dir=includedir, 
                   output_dir=os.path.join("src", "sans", "models"), 
                   c_wrapper_dir=wrapper_dir)
@@ -87 +87 @@
         
 model_sources = []
-append_file(file_list=model_sources, dir_path=srcdir)
 append_file(file_list=model_sources, dir_path=igordir)
 append_file(file_list=model_sources, dir_path=c_model_dir)
@@ -114 +113 @@
     package_dir = {"sans":os.path.join("src", "sans"),
                    "sans.models":os.path.join("src", "sans", "models"),
-                   "sans.models.sans_extension":srcdir,
+                   "sans.models.sans_extension":includedir,
                   },
     package_data={'sans.models': [os.path.join('media', "*")]},
@@ -124 +123 @@
         Extension("sans.models.sans_extension.c_models",
                     sources=model_sources,                 
-                    include_dirs=[igordir, srcdir, c_model_dir, numpy_incl_path],   
+                    include_dirs=[igordir, includedir, c_model_dir, numpy_incl_path],   
                     ),