Skip to content

Commit

Permalink
Refs #4399. Further structural changes to Python code layout.
Browse files Browse the repository at this point in the history
Makes it easier to see what is what when looking at the directories.
  • Loading branch information
martyngigg committed Feb 16, 2012
1 parent 06126c3 commit dfec631
Show file tree
Hide file tree
Showing 61 changed files with 61 additions and 58 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/Build/python_export_maker.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def get_exportfile(headerfile):
# We need to find the submodule from the Mantid package
submodule = get_submodule(headerfile)
frameworkdir = get_frameworkdir(headerfile)
exportpath = os.path.join(frameworkdir, 'PythonInterface', 'mantid', submodule, 'src')
exportpath = os.path.join(frameworkdir, 'PythonInterface', 'mantid', submodule, 'src', 'Exports')
exportfile = os.path.join(exportpath, os.path.basename(headerfile).replace('.h','.cpp'))
return exportfile

Expand Down
54 changes: 27 additions & 27 deletions Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,33 @@ set ( MODULE_TEMPLATE src/api.cpp.in )
# -- Do NOT sort this list. The order defines the order in which the export
# definitions occur and some depend on their base classes being exported first --
set ( EXPORT_FILES
src/Algorithm.cpp
src/AlgorithmFactory.cpp
src/AlgorithmManager.cpp
src/AnalysisDataService.cpp
src/FileProperty.cpp
src/FrameworkManager.cpp
src/IEventList.cpp
src/ISpectrum.cpp
src/WorkspaceHistory.cpp
src/ExperimentInfo.cpp
src/MultipleExperimentInfos.cpp
src/Workspace.cpp
src/ITableWorkspace.cpp
src/IMDWorkspace.cpp
src/IMDHistoWorkspace.cpp
src/IMDEventWorkspace.cpp
src/MatrixWorkspace.cpp
src/IEventWorkspace.cpp
src/IPeaksWorkspace.cpp
src/BinaryOperations.cpp
src/WorkspaceGroup.cpp
src/Axis.cpp
src/IPeak.cpp
src/BoxController.cpp
src/FileFinder.cpp
src/Sample.cpp
src/Run.cpp
src/Exports/Algorithm.cpp
src/Exports/AlgorithmFactory.cpp
src/Exports/AlgorithmManager.cpp
src/Exports/AnalysisDataService.cpp
src/Exports/FileProperty.cpp
src/Exports/FrameworkManager.cpp
src/Exports/IEventList.cpp
src/Exports/ISpectrum.cpp
src/Exports/WorkspaceHistory.cpp
src/Exports/ExperimentInfo.cpp
src/Exports/MultipleExperimentInfos.cpp
src/Exports/Workspace.cpp
src/Exports/ITableWorkspace.cpp
src/Exports/IMDWorkspace.cpp
src/Exports/IMDHistoWorkspace.cpp
src/Exports/IMDEventWorkspace.cpp
src/Exports/MatrixWorkspace.cpp
src/Exports/IEventWorkspace.cpp
src/Exports/IPeaksWorkspace.cpp
src/Exports/BinaryOperations.cpp
src/Exports/WorkspaceGroup.cpp
src/Exports/Axis.cpp
src/Exports/IPeak.cpp
src/Exports/BoxController.cpp
src/Exports/FileFinder.cpp
src/Exports/Sample.cpp
src/Exports/Run.cpp
)

# Files containing additional helper code that are not related to exporting class/functions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
set ( MODULE_TEMPLATE src/geometry.cpp.in )

set ( EXPORT_FILES
src/IComponent.cpp
src/ICompAssembly.cpp
src/IObjComponent.cpp
src/IDetector.cpp
src/IMDDimension.cpp
src/Component.cpp
src/CompAssembly.cpp
src/ObjComponent.cpp
src/ObjCompAssembly.cpp
src/Detector.cpp
src/DetectorGroup.cpp
src/Instrument.cpp
src/UnitCell.cpp
src/OrientedLattice.cpp
src/ReferenceFrame.cpp
src/Exports/IComponent.cpp
src/Exports/ICompAssembly.cpp
src/Exports/IObjComponent.cpp
src/Exports/IDetector.cpp
src/Exports/IMDDimension.cpp
src/Exports/Component.cpp
src/Exports/CompAssembly.cpp
src/Exports/ObjComponent.cpp
src/Exports/ObjCompAssembly.cpp
src/Exports/Detector.cpp
src/Exports/DetectorGroup.cpp
src/Exports/Instrument.cpp
src/Exports/UnitCell.cpp
src/Exports/OrientedLattice.cpp
src/Exports/ReferenceFrame.cpp
)

set ( SRC_FILES
Expand Down
33 changes: 18 additions & 15 deletions Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,25 @@

set ( MODULE_TEMPLATE src/kernel.cpp.in )

# Files containing export definitions, these are automatically processed
# -- Do NOT sort this list. The order defines the order in which the export
# definitions occur and some depend on their base classes being exported first --
set ( EXPORT_FILES
src/ConfigService.cpp
src/DataItem.cpp
src/IPropertyManager.cpp
src/Property.cpp
src/PropertyWithValue.cpp
src/ArrayProperty.cpp
src/Quat.cpp
src/V3D.cpp
src/StlContainers.cpp
src/Logger.cpp
src/Unit.cpp
src/IValidator.cpp
src/BoundedValidator.cpp
src/TimeSeriesProperty.cpp
src/DateAndTime.cpp
src/Exports/ConfigService.cpp
src/Exports/DataItem.cpp
src/Exports/IPropertyManager.cpp
src/Exports/Property.cpp
src/Exports/PropertyWithValue.cpp
src/Exports/ArrayProperty.cpp
src/Exports/Quat.cpp
src/Exports/V3D.cpp
src/Exports/StlContainers.cpp
src/Exports/Logger.cpp
src/Exports/Unit.cpp
src/Exports/IValidator.cpp
src/Exports/BoundedValidator.cpp
src/Exports/TimeSeriesProperty.cpp
src/Exports/DateAndTime.cpp
)

set ( SRC_FILES
Expand Down

0 comments on commit dfec631

Please sign in to comment.