Changeset 3d24489 in sasview


Ignore:
Timestamp:
Aug 28, 2013 3:38:20 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:
06148e8
Parents:
a61b4b9
Message:

Make sure it builds (not tested)

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • setup.py

    rb8a8e4e r3d24489  
    108108 
    109109# sans.invariant 
    110 #package_dir["sans.invariant"] = "sansinvariant/src/sans/invariant" 
    111 #packages.extend(["sans.invariant"]) 
     110package_dir["sans.invariant"] = os.path.join("src", "sans", "invariant") 
     111packages.extend(["sans.invariant"]) 
    112112 
    113113# sans.guiframe 
    114 #guiframe_path = os.path.join("sansguiframe", "src", "sans", "guiframe") 
    115 #package_dir["sans.guiframe"] = guiframe_path 
    116 #package_dir["sans.guiframe.local_perspectives"] = os.path.join(guiframe_path,  
    117 #                                                        "local_perspectives") 
    118 #package_data["sans.guiframe"] = ['images/*', 'media/*'] 
    119 #packages.extend(["sans.guiframe", "sans.guiframe.local_perspectives"]) 
     114guiframe_path = os.path.join("src", "sans", "guiframe") 
     115package_dir["sans.guiframe"] = guiframe_path 
     116package_dir["sans.guiframe.local_perspectives"] = os.path.join(os.path.join(guiframe_path, "local_perspectives")) 
     117package_data["sans.guiframe"] = ['images/*', 'media/*'] 
     118packages.extend(["sans.guiframe", "sans.guiframe.local_perspectives"]) 
    120119# build local plugin 
    121 #for dir in os.listdir(os.path.join(guiframe_path, "local_perspectives")): 
    122 #    if dir not in ['.svn','__init__.py', '__init__.pyc']: 
    123 #        package_name = "sans.guiframe.local_perspectives." + dir 
    124 #        packages.append(package_name) 
    125 #        package_dir[package_name] = os.path.join(guiframe_path,  
    126 #                                                 "local_perspectives", dir) 
     120for dir in os.listdir(os.path.join(guiframe_path, "local_perspectives")): 
     121    if dir not in ['.svn','__init__.py', '__init__.pyc']: 
     122        package_name = "sans.guiframe.local_perspectives." + dir 
     123        packages.append(package_name) 
     124        package_dir[package_name] = os.path.join(guiframe_path, "local_perspectives", dir) 
    127125 
    128126# sans.dataloader 
    129 #package_dir["sans.dataloader"] = os.path.join("sansdataloader",  
    130 #                                              "src", "sans", "dataloader") 
    131 #package_data["sans.dataloader.readers"] = ['defaults.xml'] 
    132 #packages.extend(["sans.dataloader","sans.dataloader.readers"]) 
     127package_dir["sans.dataloader"] = os.path.join("src", "sans", "dataloader") 
     128package_data["sans.dataloader.readers"] = ['defaults.xml'] 
     129packages.extend(["sans.dataloader","sans.dataloader.readers"]) 
    133130 
    134131# sans.calculator 
    135 #package_dir["sans.calculator"] = "sanscalculator/src/sans/calculator" 
    136 #packages.extend(["sans.calculator"]) 
     132package_dir["sans.calculator"] =os.path.join("src", "sans", "calculator") 
     133packages.extend(["sans.calculator"]) 
    137134     
    138135# sans.pr 
    139136numpy_incl_path = os.path.join(NUMPY_INC, "numpy") 
    140137srcdir  = os.path.join("src", "sans", "pr", "c_extensions") 
    141  
    142  
    143      
    144 #package_dir["sans.pr.core"] = srcdir 
    145 #package_dir["sans.pr"] = os.path.join("pr_inversion", "src","sans", "pr") 
    146 #packages.extend(["sans.pr","sans.pr.core"]) 
     138package_dir["sans.pr.core"] = srcdir 
     139package_dir["sans.pr"] = os.path.join("src","sans", "pr") 
     140packages.extend(["sans.pr","sans.pr.core"]) 
    147141ext_modules.append( Extension("sans.pr.core.pr_inversion", 
    148                               sources = [ os.path.join(srcdir, "Cinvertor.c"), 
     142                              sources = [os.path.join(srcdir, "Cinvertor.c"), 
    149143                                         os.path.join(srcdir, "invertor.c"), 
    150144                                         ], 
    … …  
    153147         
    154148# sans.fit (park integration) 
    155 #package_dir["sans.fit"] = "park_integration/src/sans/fit" 
    156 #packages.append("sans.fit") 
    157  
    158 # inversion view 
    159 #package_dir["sans.perspectives"] = "inversionview/src/sans/perspectives" 
    160 #package_dir["sans.perspectives.pr"] = "inversionview/src/sans/perspectives/pr" 
    161 #packages.extend(["sans.perspectives","sans.perspectives.pr"]) 
    162 #package_data["sans.perspectives.pr"] = ['images/*'] 
    163  
    164 # Invariant view 
    165 #package_dir["sans.perspectives"] = os.path.join("invariantview", "src",  
    166 #                                                "sans", "perspectives") 
    167 #package_dir["sans.perspectives.invariant"] = os.path.join("invariantview",  
    168 #                                    "src", "sans", "perspectives", "invariant") 
    169                  
    170 #package_data['sans.perspectives.invariant'] = [os.path.join("media",'*')] 
    171 #packages.extend(["sans.perspectives","sans.perspectives.invariant"])  
    172  
    173 # Fitting view 
    174 #fitting_path = os.path.join("fittingview", "src", "sans",  
    175 #                            "perspectives", "fitting") 
    176 #package_dir["sans.perspectives"] = os.path.join("fittingview",  
    177 #                                            "src", "sans", "perspectives"), 
    178 #package_dir["sans.perspectives.fitting"] = fitting_path 
    179 #package_dir["sans.perspectives.fitting.plugin_models"] = \ 
    180 #                                os.path.join(fitting_path, "plugin_models") 
     149package_dir["sans.fit"] = os.path.join("src", "sans", "fit") 
     150packages.append("sans.fit") 
     151 
     152# Perspectives 
     153package_dir["sans.perspectives"] = os.path.join("src", "sans", "perspectives") 
     154package_dir["sans.perspectives.pr"] = os.path.join("src", "sans", "perspectives", "pr") 
     155packages.extend(["sans.perspectives","sans.perspectives.pr"]) 
     156package_data["sans.perspectives.pr"] = ['images/*'] 
     157 
     158package_dir["sans.perspectives.invariant"] = os.path.join("src", "sans", "perspectives", "invariant") 
     159packages.extend(["sans.perspectives.invariant"]) 
     160package_data['sans.perspectives.invariant'] = [os.path.join("media",'*')] 
     161 
     162package_dir["sans.perspectives.fitting"] = os.path.join("src", "sans", "perspectives", "fitting") 
     163package_dir["sans.perspectives.fitting.plugin_models"] = os.path.join("src", "sans", "perspectives", "fitting", "plugin_models") 
     164packages.extend(["sans.perspectives.fitting",  
     165                 "sans.perspectives.fitting.plugin_models"]) 
    181166package_data['sans.perspectives.fitting'] = ['media/*','plugin_models/*'] 
    182 #packages.extend(["sans.perspectives", "sans.perspectives.fitting",  
    183 #                 "sans.perspectives.fitting.plugin_models"]) 
    184  
    185 # Calculator view 
    186 #package_dir["sans.perspectives"] = "calculatorview/src/sans/perspectives" 
    187 #package_dir["sans.perspectives.calculator"] = os.path.join("calculatorview",  
    188 #                                "src", "sans", "perspectives", "calculator") 
    189 #package_data['sans.perspectives.calculator'] = ['images/*', 'media/*'] 
    190 #packages.extend(["sans.perspectives", "sans.perspectives.calculator"])     
    191       
     167 
     168package_dir["sans.perspectives.calculator"] = os.path.join("src", "sans", "perspectives", "calculator") 
     169packages.extend(["sans.perspectives", "sans.perspectives.calculator"])     
     170package_data['sans.perspectives.calculator'] = ['images/*', 'media/*'] 
     171     
    192172# Data util 
    193173package_dir["data_util"] = os.path.join("src", "sansutil") 
    … …  
    229209    os.makedirs(wrapper_dir) 
    230210sys.path.append(os.path.join("src", "sans", "models", "src", "python_wrapper")) 
    231 #from wrapping import generate_wrappers 
    232 #generate_wrappers(header_dir = includedir,  
    233 #                  output_dir = model_dir, 
    234 #                  c_wrapper_dir = wrapper_dir) 
     211from wrapping import generate_wrappers 
     212generate_wrappers(header_dir = includedir,  
     213                  output_dir = model_dir, 
     214                  c_wrapper_dir = wrapper_dir) 
    235215 
    236216IGNORED_FILES = [".svn"] 

  • src/sans/models/src/python_wrapper/wrapping.py

    rb8a8e4e r3d24489  
    2828     
    2929 
    30     template_file = open(os.path.join("sansmodels","src","c_models","c_models.cpp.template"),"r") 
    31     write_file = open(os.path.join("sansmodels","src","c_models","c_models.cpp"),"w") 
     30    template_file = open(os.path.join("src", "sans", "models","src","c_models","c_models.cpp.template"),"r") 
     31    write_file = open(os.path.join("src", "sans",  "models","src","c_models","c_models.cpp"),"w") 
    3232    buf = template_file.read() 
    3333    lines = buf.split('\n') 
Note: See TracChangeset for help on using the changeset viewer.