Changeset 101065a in sasview for setup.py

Timestamp:

Jan 6, 2012 11:38:28 AM (12 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:

cd127d2

Parents:

2b878d74

Message:

keep only header files in c_extensions and rename it 'include'

File:

• setup.py (modified) (5 diffs)

setup.py

@@ -212 +212 @@
 
 # Sans models
-srcdir  = os.path.join("sansmodels", "src", "c_extensions")
+includedir  = os.path.join("sansmodels", "src", "include")
 igordir = os.path.join("sansmodels", "src", "libigor")
 c_model_dir = os.path.join("sansmodels", "src", "c_models")
@@ -222 +222 @@
 sys.path.append(os.path.join("sansmodels", "src", "python_wrapper"))
 from wrapping import generate_wrappers
-generate_wrappers(header_dir=srcdir, 
+generate_wrappers(header_dir=includedir, 
                   output_dir=os.path.join("sansmodels", "src", "sans", "models"), 
                   c_wrapper_dir=wrapper_dir)
 
-IGNORED_FILES = ["a.exe",
-                 "__init__.py"
-                 ".svn",
-                   "lineparser.py",
-                   "run.py",
-                   "CGaussian.cpp",
-                   "CLogNormal.cpp",
-                   "WrapperGenerator.py",
-                   "wrapping.py"
-                   ]
-
+IGNORED_FILES = [".svn"]
 if not os.name=='nt':
     IGNORED_FILES.extend(["gamma_win.c","winFuncs.c"])
@@ -263 +253 @@
         
 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)
@@ -274 +263 @@
 package_dir["sans"] = os.path.join("sansmodels", "src", "sans")
 package_dir["sans.models"] = os.path.join("sansmodels", "src", "sans", "models")
-package_dir["sans.models.sans_extension"] = srcdir
+package_dir["sans.models.sans_extension"] = includedir
             
 package_data['sans.models'] = [os.path.join('media', "*")]
@@ -287 +276 @@
 ext_modules.extend( [ Extension("sans.models.sans_extension.c_models",
                                 sources=model_sources,                 
-                                include_dirs=[igordir, srcdir, 
+                                include_dirs=[igordir, includedir, 
                                               c_model_dir, numpy_incl_path],
                                 ),