Changeset 101065a in sasview for setup.py


Ignore:
Timestamp:
Jan 6, 2012 11:38:28 AM (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • setup.py

    r20d91bd r101065a  
    212212 
    213213# Sans models 
    214 srcdir  = os.path.join("sansmodels", "src", "c_extensions") 
     214includedir  = os.path.join("sansmodels", "src", "include") 
    215215igordir = os.path.join("sansmodels", "src", "libigor") 
    216216c_model_dir = os.path.join("sansmodels", "src", "c_models") 
     
    222222sys.path.append(os.path.join("sansmodels", "src", "python_wrapper")) 
    223223from wrapping import generate_wrappers 
    224 generate_wrappers(header_dir=srcdir,  
     224generate_wrappers(header_dir=includedir,  
    225225                  output_dir=os.path.join("sansmodels", "src", "sans", "models"),  
    226226                  c_wrapper_dir=wrapper_dir) 
    227227 
    228 IGNORED_FILES = ["a.exe", 
    229                  "__init__.py" 
    230                  ".svn", 
    231                    "lineparser.py", 
    232                    "run.py", 
    233                    "CGaussian.cpp", 
    234                    "CLogNormal.cpp", 
    235                    "WrapperGenerator.py", 
    236                    "wrapping.py" 
    237                    ] 
    238  
     228IGNORED_FILES = [".svn"] 
    239229if not os.name=='nt': 
    240230    IGNORED_FILES.extend(["gamma_win.c","winFuncs.c"]) 
     
    263253         
    264254model_sources = [] 
    265 append_file(file_list=model_sources, dir_path=srcdir) 
    266255append_file(file_list=model_sources, dir_path=igordir) 
    267256append_file(file_list=model_sources, dir_path=c_model_dir) 
     
    274263package_dir["sans"] = os.path.join("sansmodels", "src", "sans") 
    275264package_dir["sans.models"] = os.path.join("sansmodels", "src", "sans", "models") 
    276 package_dir["sans.models.sans_extension"] = srcdir 
     265package_dir["sans.models.sans_extension"] = includedir 
    277266             
    278267package_data['sans.models'] = [os.path.join('media', "*")] 
     
    287276ext_modules.extend( [ Extension("sans.models.sans_extension.c_models", 
    288277                                sources=model_sources,                  
    289                                 include_dirs=[igordir, srcdir,  
     278                                include_dirs=[igordir, includedir,  
    290279                                              c_model_dir, numpy_incl_path], 
    291280                                ),        
Note: See TracChangeset for help on using the changeset viewer.