- Timestamp:
- Feb 19, 2016 8:07:22 AM (8 years ago)
- 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:
- d7bb526
- Parents:
- 792e6be
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
setup.py
r038ccfe6 rb699768 165 165 166 166 # sas.invariant 167 package_dir["sas.invariant"] = os.path.join("src", "sas", " invariant")167 package_dir["sas.invariant"] = os.path.join("src", "sas", "sascalc", "invariant") 168 168 packages.extend(["sas.invariant"]) 169 169 … … 182 182 183 183 # sas.dataloader 184 package_dir["sas.dataloader"] = os.path.join("src", "sas", " dataloader")184 package_dir["sas.dataloader"] = os.path.join("src", "sas", "sascalc", "dataloader") 185 185 package_data["sas.dataloader.readers"] = ['defaults.json','schema/*.xsd'] 186 186 packages.extend(["sas.dataloader","sas.dataloader.readers","sas.dataloader.readers.schema"]) 187 187 188 188 # sas.calculator 189 package_dir["sas.calculator"] =os.path.join("src", "sas", " calculator")190 packages.extend(["sas. calculator"])189 package_dir["sas.calculator"] =os.path.join("src", "sas", "sascalc", "calculator") 190 packages.extend(["sas.sascalc.calculator"]) 191 191 192 # sas. pr192 # sas.sascalc.pr 193 193 numpy_incl_path = os.path.join(NUMPY_INC, "numpy") 194 srcdir = os.path.join("src", "sas", " pr", "c_extensions")195 package_dir["sas. pr.core"] = srcdir196 package_dir["sas. pr"] = os.path.join("src","sas", "pr")197 packages.extend(["sas. pr","sas.pr.core"])198 ext_modules.append( Extension("sas. pr.core.pr_inversion",194 srcdir = os.path.join("src", "sas", "sascalc", "pr", "c_extensions") 195 package_dir["sas.sascalc.pr.core"] = srcdir 196 package_dir["sas.sascalc.pr"] = os.path.join("src","sas", "sascalc", "pr") 197 packages.extend(["sas.sascalc.pr","sas.sascalc.pr.core"]) 198 ext_modules.append( Extension("sas.sascalc.pr.core.pr_inversion", 199 199 sources = [os.path.join(srcdir, "Cinvertor.c"), 200 200 os.path.join(srcdir, "invertor.c"), … … 203 203 ) ) 204 204 205 # sas. fit206 package_dir["sas. fit"] = os.path.join("src", "sas", "fit")207 packages.append("sas. fit")205 # sas.sascalc.fit 206 package_dir["sas.sascalc.fit"] = os.path.join("src", "sas", "sascalc", "fit") 207 packages.append("sas.sascalc.fit") 208 208 209 209 # Perspectives … … 227 227 228 228 # Data util 229 package_dir["data_util"] = os.path.join("src", "sas", " data_util")230 packages.append("sas. data_util")229 package_dir["data_util"] = os.path.join("src", "sas", "sascalc", "data_util") 230 packages.append("sas.sascalc.data_util") 231 231 232 232 # Plottools
Note: See TracChangeset
for help on using the changeset viewer.