Changeset b8a8e4e in sasview


Ignore:
Timestamp:
Aug 27, 2013 3:06:15 PM (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:
75c44dc
Parents:
5777106
Message:

Checkpoint

Files:
1 edited
225 moved

Legend:

Unmodified
Added
Removed

  • setup.py

    re2271c5 rb8a8e4e  
    108108 
    109109# sans.invariant 
    110 package_dir["sans.invariant"] = "sansinvariant/src/sans/invariant" 
    111 packages.extend(["sans.invariant"]) 
     110#package_dir["sans.invariant"] = "sansinvariant/src/sans/invariant" 
     111#packages.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"]) 
     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"]) 
    120120# 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) 
     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) 
    127127 
    128128# 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"]) 
     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"]) 
    133133 
    134134# sans.calculator 
    135 package_dir["sans.calculator"] = "sanscalculator/src/sans/calculator" 
    136 packages.extend(["sans.calculator"]) 
     135#package_dir["sans.calculator"] = "sanscalculator/src/sans/calculator" 
     136#packages.extend(["sans.calculator"]) 
    137137     
    138138# sans.pr 
    139139numpy_incl_path = os.path.join(NUMPY_INC, "numpy") 
    140 srcdir  = os.path.join("pr_inversion", "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"]) 
     140srcdir  = 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"]) 
    147147ext_modules.append( Extension("sans.pr.core.pr_inversion", 
    148148                              sources = [ os.path.join(srcdir, "Cinvertor.c"), 
    … …  
    153153         
    154154# sans.fit (park integration) 
    155 package_dir["sans.fit"] = "park_integration/src/sans/fit" 
    156 packages.append("sans.fit") 
     155#package_dir["sans.fit"] = "park_integration/src/sans/fit" 
     156#packages.append("sans.fit") 
    157157 
    158158# 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/*'] 
     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/*'] 
    163163 
    164164# 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") 
     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") 
    169169                 
    170 package_data['sans.perspectives.invariant'] = [os.path.join("media",'*')] 
    171 packages.extend(["sans.perspectives","sans.perspectives.invariant"])  
     170#package_data['sans.perspectives.invariant'] = [os.path.join("media",'*')] 
     171#packages.extend(["sans.perspectives","sans.perspectives.invariant"])  
    172172 
    173173# 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") 
     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") 
    181181package_data['sans.perspectives.fitting'] = ['media/*','plugin_models/*'] 
    182 packages.extend(["sans.perspectives", "sans.perspectives.fitting",  
    183                  "sans.perspectives.fitting.plugin_models"]) 
     182#packages.extend(["sans.perspectives", "sans.perspectives.fitting",  
     183#                 "sans.perspectives.fitting.plugin_models"]) 
    184184 
    185185# 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"])     
     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"])     
    191191      
    192192# Data util 
    193 package_dir["data_util"] = "sansutil" 
     193package_dir["data_util"] = os.path.join("src", "sansutil") 
    194194packages.extend(["data_util"]) 
    195195 
    196196# Plottools 
    197 package_dir["danse"] = os.path.join("plottools", "src", "danse") 
    198 package_dir["danse.common"] = os.path.join("plottools", "src",  
    199                                            "danse", "common") 
    200 package_dir["danse.common.plottools"] = os.path.join("plottools",  
    201                                     "src", "danse", "common", "plottools") 
     197package_dir["danse"] = os.path.join("src", "danse") 
     198package_dir["danse.common"] = os.path.join("src", "danse", "common") 
     199package_dir["danse.common.plottools"] = os.path.join("src", "danse", "common", "plottools") 
    202200packages.extend(["danse", "danse.common", "danse.common.plottools"]) 
    203201 
    … …  
    215213 
    216214# Sans models 
    217 includedir  = os.path.join("sansmodels", "include") 
    218 igordir = os.path.join("sansmodels", "src", "libigor") 
    219 cephes_dir = os.path.join("sansmodels", "src", "cephes") 
    220 c_model_dir = os.path.join("sansmodels", "src", "c_models") 
    221 smear_dir  = os.path.join("sansmodels", "src", "c_smearer") 
    222 gen_dir  = os.path.join("sansmodels", "src", "c_gen") 
    223 wrapper_dir  = os.path.join("sansmodels", "src", "python_wrapper", "generated") 
    224 model_dir = os.path.join("sansmodels", "src", "sans","models") 
     215includedir  = os.path.join("src", "sans", "models", "include") 
     216igordir = os.path.join("src", "sans", "models", "src", "libigor") 
     217cephes_dir = os.path.join("src", "sans", "models", "src", "cephes") 
     218c_model_dir = os.path.join("src", "sans", "models", "src", "c_models") 
     219smear_dir  = os.path.join("src", "sans", "models", "src", "c_smearer") 
     220gen_dir  = os.path.join("src", "sans", "models", "src", "c_gen") 
     221wrapper_dir  = os.path.join("src", "sans", "models", "src", "python_wrapper", "generated") 
     222model_dir = os.path.join("src", "sans","models") 
    225223 
    226224if os.path.isdir(wrapper_dir): 
    … …  
    230228else: 
    231229    os.makedirs(wrapper_dir) 
    232 sys.path.append(os.path.join("sansmodels", "src", "python_wrapper")) 
    233 from wrapping import generate_wrappers 
    234 generate_wrappers(header_dir = includedir,  
    235                   output_dir = model_dir, 
    236                   c_wrapper_dir = wrapper_dir) 
     230sys.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) 
    237235 
    238236IGNORED_FILES = [".svn"] 
    … …  
    271269 
    272270 
    273 package_dir["sans"] = os.path.join("sansmodels", "src", "sans") 
     271package_dir["sans"] = os.path.join("src", "sans") 
    274272package_dir["sans.models"] = model_dir 
    275  
    276 package_dir["sans.models.sans_extension"] = os.path.join("sansmodels", "src",  
    277                                             "sans", "models", "sans_extension") 
    278              
     273package_dir["sans.models.sans_extension"] = os.path.join("src", "sans", "models", "sans_extension") 
    279274package_data['sans.models'] = [os.path.join('media', "*.*")] 
    280275package_data['sans.models'] += [os.path.join('media','img', "*.*")] 
    281  
    282276packages.extend(["sans","sans.models","sans.models.sans_extension"]) 
    283277     
Note: See TracChangeset for help on using the changeset viewer.