From d2d38923ec17dd012fc6d2c67aa86dee4c4bf168 Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Thu, 22 Nov 2007 11:34:48 +0000
Subject: [PATCH] re #62 create an API library. Move all non kernel classes
into it.
---
Code/Mantid/API/API.vcproj | 235 ++++++++++++++++++
Code/Mantid/{Kernel => API}/doc/Algorithm.txt | 0
.../{Kernel => API}/doc/AlgorithmFactory.txt | 0
.../Mantid/{Kernel => API}/doc/IAlgorithm.txt | 0
Code/Mantid/{Kernel => API}/inc/Algorithm.h | 0
.../{Kernel => API}/inc/AlgorithmFactory.h | 0
.../{Kernel => API}/inc/AlgorithmManager.h | 0
.../{Kernel => API}/inc/AnalysisDataService.h | 0
.../{Kernel => API}/inc/DeclareUserAlg.h | 0
.../{Kernel => API}/inc/FrameworkManager.h | 0
Code/Mantid/{Kernel => API}/inc/IAlgorithm.h | 0
Code/Mantid/{Kernel => API}/inc/Workspace.h | 0
.../{Kernel => API}/inc/WorkspaceFactory.h | 0
Code/Mantid/{Kernel => API}/src/Algorithm.cpp | 0
.../{Kernel => API}/src/AlgorithmFactory.cpp | 0
.../{Kernel => API}/src/AlgorithmManager.cpp | 0
.../src/AnalysisDataService.cpp | 0
.../src/BoostPythonWrapper.cpp | 0
.../{Kernel => API}/src/FrameworkManager.cpp | 0
Code/Mantid/{Kernel => API}/src/Workspace.cpp | 0
.../{Kernel => API}/src/WorkspaceFactory.cpp | 0
.../test/AlgorithmManagerTest.h | 0
.../{Kernel => API}/test/AlgorithmTest.h | 0
.../test/AnalysisDataServiceTest.h | 0
.../test/FrameworkManagerTest.h | 0
Code/Mantid/API/test/Mantid.properties | 11 +
.../test/WorkspaceFactoryTest.h | 0
Code/Mantid/API/test/runTests.bat | 41 +++
Code/Mantid/API/test/runTests.sh | 36 +++
Code/Mantid/Build/SConstruct | 14 +-
Code/Mantid/DataHandling/DataHandling.vcproj | 9 +-
Code/Mantid/DataHandling/inc/LoadRaw.h | 2 +-
Code/Mantid/DataHandling/inc/SaveCSV.h | 2 +-
Code/Mantid/Geometry/Geometry.vcproj | 80 +++++-
Code/Mantid/Kernel/Kernel.vcproj | 70 +-----
Code/Mantid/Kernel/inc/LibraryManager.h | 1 -
Code/Mantid/Kernel/src/LibraryManager.cpp | 14 --
Code/Mantid/Kernel/src/PropertyManager.cpp | 1 +
Code/Mantid/Main/Main.cpp | 13 +-
Code/Mantid/Main/Main.vcproj | 2 +-
Code/Mantid/Mantid.sln | 30 ++-
41 files changed, 463 insertions(+), 98 deletions(-)
create mode 100644 Code/Mantid/API/API.vcproj
rename Code/Mantid/{Kernel => API}/doc/Algorithm.txt (100%)
rename Code/Mantid/{Kernel => API}/doc/AlgorithmFactory.txt (100%)
rename Code/Mantid/{Kernel => API}/doc/IAlgorithm.txt (100%)
rename Code/Mantid/{Kernel => API}/inc/Algorithm.h (100%)
rename Code/Mantid/{Kernel => API}/inc/AlgorithmFactory.h (100%)
rename Code/Mantid/{Kernel => API}/inc/AlgorithmManager.h (100%)
rename Code/Mantid/{Kernel => API}/inc/AnalysisDataService.h (100%)
rename Code/Mantid/{Kernel => API}/inc/DeclareUserAlg.h (100%)
rename Code/Mantid/{Kernel => API}/inc/FrameworkManager.h (100%)
rename Code/Mantid/{Kernel => API}/inc/IAlgorithm.h (100%)
rename Code/Mantid/{Kernel => API}/inc/Workspace.h (100%)
rename Code/Mantid/{Kernel => API}/inc/WorkspaceFactory.h (100%)
rename Code/Mantid/{Kernel => API}/src/Algorithm.cpp (100%)
rename Code/Mantid/{Kernel => API}/src/AlgorithmFactory.cpp (100%)
rename Code/Mantid/{Kernel => API}/src/AlgorithmManager.cpp (100%)
rename Code/Mantid/{Kernel => API}/src/AnalysisDataService.cpp (100%)
rename Code/Mantid/{Kernel => API}/src/BoostPythonWrapper.cpp (100%)
rename Code/Mantid/{Kernel => API}/src/FrameworkManager.cpp (100%)
rename Code/Mantid/{Kernel => API}/src/Workspace.cpp (100%)
rename Code/Mantid/{Kernel => API}/src/WorkspaceFactory.cpp (100%)
rename Code/Mantid/{Kernel => API}/test/AlgorithmManagerTest.h (100%)
rename Code/Mantid/{Kernel => API}/test/AlgorithmTest.h (100%)
rename Code/Mantid/{Kernel => API}/test/AnalysisDataServiceTest.h (100%)
rename Code/Mantid/{Kernel => API}/test/FrameworkManagerTest.h (100%)
create mode 100644 Code/Mantid/API/test/Mantid.properties
rename Code/Mantid/{Kernel => API}/test/WorkspaceFactoryTest.h (100%)
create mode 100644 Code/Mantid/API/test/runTests.bat
create mode 100644 Code/Mantid/API/test/runTests.sh
diff --git a/Code/Mantid/API/API.vcproj b/Code/Mantid/API/API.vcproj
new file mode 100644
index 00000000000..38daef21862
--- /dev/null
+++ b/Code/Mantid/API/API.vcproj
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="API"
+ ProjectGUID="{AD0CD585-694E-4367-B7D0-2F16C4EF59F8}"
+ RootNamespace="API"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ UseOfATL="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="inc;../kernel/inc;../../Third_Party/include"
+ RuntimeLibrary="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="kernel.lib"
+ AdditionalLibraryDirectories="../debug;../../Third_Party/lib/win32"
+ GenerateDebugInformation="true"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\src\Algorithm.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\AlgorithmFactory.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\AlgorithmManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\AnalysisDataService.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\FrameworkManager.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Workspace.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\WorkspaceFactory.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath=".\inc\Algorithm.h"
+ >
+ </File>
+ <File
+ RelativePath=".\inc\AlgorithmFactory.h"
+ >
+ </File>
+ <File
+ RelativePath=".\inc\AlgorithmManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\inc\AnalysisDataService.h"
+ >
+ </File>
+ <File
+ RelativePath=".\inc\DeclareUserAlg.h"
+ >
+ </File>
+ <File
+ RelativePath=".\inc\FrameworkManager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\inc\IAlgorithm.h"
+ >
+ </File>
+ <File
+ RelativePath=".\inc\Workspace.h"
+ >
+ </File>
+ <File
+ RelativePath=".\inc\WorkspaceFactory.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/Code/Mantid/Kernel/doc/Algorithm.txt b/Code/Mantid/API/doc/Algorithm.txt
similarity index 100%
rename from Code/Mantid/Kernel/doc/Algorithm.txt
rename to Code/Mantid/API/doc/Algorithm.txt
diff --git a/Code/Mantid/Kernel/doc/AlgorithmFactory.txt b/Code/Mantid/API/doc/AlgorithmFactory.txt
similarity index 100%
rename from Code/Mantid/Kernel/doc/AlgorithmFactory.txt
rename to Code/Mantid/API/doc/AlgorithmFactory.txt
diff --git a/Code/Mantid/Kernel/doc/IAlgorithm.txt b/Code/Mantid/API/doc/IAlgorithm.txt
similarity index 100%
rename from Code/Mantid/Kernel/doc/IAlgorithm.txt
rename to Code/Mantid/API/doc/IAlgorithm.txt
diff --git a/Code/Mantid/Kernel/inc/Algorithm.h b/Code/Mantid/API/inc/Algorithm.h
similarity index 100%
rename from Code/Mantid/Kernel/inc/Algorithm.h
rename to Code/Mantid/API/inc/Algorithm.h
diff --git a/Code/Mantid/Kernel/inc/AlgorithmFactory.h b/Code/Mantid/API/inc/AlgorithmFactory.h
similarity index 100%
rename from Code/Mantid/Kernel/inc/AlgorithmFactory.h
rename to Code/Mantid/API/inc/AlgorithmFactory.h
diff --git a/Code/Mantid/Kernel/inc/AlgorithmManager.h b/Code/Mantid/API/inc/AlgorithmManager.h
similarity index 100%
rename from Code/Mantid/Kernel/inc/AlgorithmManager.h
rename to Code/Mantid/API/inc/AlgorithmManager.h
diff --git a/Code/Mantid/Kernel/inc/AnalysisDataService.h b/Code/Mantid/API/inc/AnalysisDataService.h
similarity index 100%
rename from Code/Mantid/Kernel/inc/AnalysisDataService.h
rename to Code/Mantid/API/inc/AnalysisDataService.h
diff --git a/Code/Mantid/Kernel/inc/DeclareUserAlg.h b/Code/Mantid/API/inc/DeclareUserAlg.h
similarity index 100%
rename from Code/Mantid/Kernel/inc/DeclareUserAlg.h
rename to Code/Mantid/API/inc/DeclareUserAlg.h
diff --git a/Code/Mantid/Kernel/inc/FrameworkManager.h b/Code/Mantid/API/inc/FrameworkManager.h
similarity index 100%
rename from Code/Mantid/Kernel/inc/FrameworkManager.h
rename to Code/Mantid/API/inc/FrameworkManager.h
diff --git a/Code/Mantid/Kernel/inc/IAlgorithm.h b/Code/Mantid/API/inc/IAlgorithm.h
similarity index 100%
rename from Code/Mantid/Kernel/inc/IAlgorithm.h
rename to Code/Mantid/API/inc/IAlgorithm.h
diff --git a/Code/Mantid/Kernel/inc/Workspace.h b/Code/Mantid/API/inc/Workspace.h
similarity index 100%
rename from Code/Mantid/Kernel/inc/Workspace.h
rename to Code/Mantid/API/inc/Workspace.h
diff --git a/Code/Mantid/Kernel/inc/WorkspaceFactory.h b/Code/Mantid/API/inc/WorkspaceFactory.h
similarity index 100%
rename from Code/Mantid/Kernel/inc/WorkspaceFactory.h
rename to Code/Mantid/API/inc/WorkspaceFactory.h
diff --git a/Code/Mantid/Kernel/src/Algorithm.cpp b/Code/Mantid/API/src/Algorithm.cpp
similarity index 100%
rename from Code/Mantid/Kernel/src/Algorithm.cpp
rename to Code/Mantid/API/src/Algorithm.cpp
diff --git a/Code/Mantid/Kernel/src/AlgorithmFactory.cpp b/Code/Mantid/API/src/AlgorithmFactory.cpp
similarity index 100%
rename from Code/Mantid/Kernel/src/AlgorithmFactory.cpp
rename to Code/Mantid/API/src/AlgorithmFactory.cpp
diff --git a/Code/Mantid/Kernel/src/AlgorithmManager.cpp b/Code/Mantid/API/src/AlgorithmManager.cpp
similarity index 100%
rename from Code/Mantid/Kernel/src/AlgorithmManager.cpp
rename to Code/Mantid/API/src/AlgorithmManager.cpp
diff --git a/Code/Mantid/Kernel/src/AnalysisDataService.cpp b/Code/Mantid/API/src/AnalysisDataService.cpp
similarity index 100%
rename from Code/Mantid/Kernel/src/AnalysisDataService.cpp
rename to Code/Mantid/API/src/AnalysisDataService.cpp
diff --git a/Code/Mantid/Kernel/src/BoostPythonWrapper.cpp b/Code/Mantid/API/src/BoostPythonWrapper.cpp
similarity index 100%
rename from Code/Mantid/Kernel/src/BoostPythonWrapper.cpp
rename to Code/Mantid/API/src/BoostPythonWrapper.cpp
diff --git a/Code/Mantid/Kernel/src/FrameworkManager.cpp b/Code/Mantid/API/src/FrameworkManager.cpp
similarity index 100%
rename from Code/Mantid/Kernel/src/FrameworkManager.cpp
rename to Code/Mantid/API/src/FrameworkManager.cpp
diff --git a/Code/Mantid/Kernel/src/Workspace.cpp b/Code/Mantid/API/src/Workspace.cpp
similarity index 100%
rename from Code/Mantid/Kernel/src/Workspace.cpp
rename to Code/Mantid/API/src/Workspace.cpp
diff --git a/Code/Mantid/Kernel/src/WorkspaceFactory.cpp b/Code/Mantid/API/src/WorkspaceFactory.cpp
similarity index 100%
rename from Code/Mantid/Kernel/src/WorkspaceFactory.cpp
rename to Code/Mantid/API/src/WorkspaceFactory.cpp
diff --git a/Code/Mantid/Kernel/test/AlgorithmManagerTest.h b/Code/Mantid/API/test/AlgorithmManagerTest.h
similarity index 100%
rename from Code/Mantid/Kernel/test/AlgorithmManagerTest.h
rename to Code/Mantid/API/test/AlgorithmManagerTest.h
diff --git a/Code/Mantid/Kernel/test/AlgorithmTest.h b/Code/Mantid/API/test/AlgorithmTest.h
similarity index 100%
rename from Code/Mantid/Kernel/test/AlgorithmTest.h
rename to Code/Mantid/API/test/AlgorithmTest.h
diff --git a/Code/Mantid/Kernel/test/AnalysisDataServiceTest.h b/Code/Mantid/API/test/AnalysisDataServiceTest.h
similarity index 100%
rename from Code/Mantid/Kernel/test/AnalysisDataServiceTest.h
rename to Code/Mantid/API/test/AnalysisDataServiceTest.h
diff --git a/Code/Mantid/Kernel/test/FrameworkManagerTest.h b/Code/Mantid/API/test/FrameworkManagerTest.h
similarity index 100%
rename from Code/Mantid/Kernel/test/FrameworkManagerTest.h
rename to Code/Mantid/API/test/FrameworkManagerTest.h
diff --git a/Code/Mantid/API/test/Mantid.properties b/Code/Mantid/API/test/Mantid.properties
new file mode 100644
index 00000000000..00ebe71fc16
--- /dev/null
+++ b/Code/Mantid/API/test/Mantid.properties
@@ -0,0 +1,11 @@
+#framework configuration
+mantid.legs = 6
+
+#logging configuartion
+logging.loggers.root.level = information
+logging.loggers.root.channel = fileChannel
+logging.channels.fileChannel.class = FileChannel
+logging.channels.fileChannel.path = KernelTest.log
+logging.channels.fileChannel.formatter.class = PatternFormatter
+logging.channels.fileChannel.formatter.pattern = %Y-%m-%d %H:%M:%S,%i [%I] %p %s - %t
+
diff --git a/Code/Mantid/Kernel/test/WorkspaceFactoryTest.h b/Code/Mantid/API/test/WorkspaceFactoryTest.h
similarity index 100%
rename from Code/Mantid/Kernel/test/WorkspaceFactoryTest.h
rename to Code/Mantid/API/test/WorkspaceFactoryTest.h
diff --git a/Code/Mantid/API/test/runTests.bat b/Code/Mantid/API/test/runTests.bat
new file mode 100644
index 00000000000..2b7f5fd26ee
--- /dev/null
+++ b/Code/Mantid/API/test/runTests.bat
@@ -0,0 +1,41 @@
+@echo off
+IF "%VCINSTALLDIR%"=="" SET PATH=%CD%\..\..\..\Third_Party\lib\win32;%CD%\..\..\Debug;%PATH%
+IF "%VCINSTALLDIR%"=="" CALL "C:\Program Files\Microsoft Visual Studio 8\VC\vcvarsall.bat"
+REM Simple script to build and run the tests.
+REM Have kept separate from the makefile since that's automatically generated
+REM by Eclipse.
+REM
+REM Author: Nick Draper, 19/10/07
+REM
+echo "Generating the source from the test header files..."
+IF "%1" == "" GOTO BUILD_ALL ELSE GOTO BUILD_ONE
+:BUILD_ONE
+ECHO Building only %1
+python ..\..\..\Third_Party\src\cxxtest\cxxtestgen.py --error-printer -o runner.cpp %1
+GOTO COMPILE
+
+:BUILD_ALL
+ECHO Building all .h files
+python ..\..\..\Third_Party\src\cxxtest\cxxtestgen.py --error-printer -o runner.cpp *.h
+GOTO COMPILE
+
+:COMPILE
+echo "Compiling the test executable..."
+cl runner.cpp /I "..\..\..\Third_Party\include" /I "..\..\kernel\inc" /I "..\.." /EHsc /MDd /W3 /nologo /c /ZI /TP
+
+link /OUT:"runner.exe" /NOLOGO /LIBPATH:"../../Debug" /LIBPATH:"../../../Third_Party/lib/win32" /DEBUG /PDB:".\runner.pdb" kernel.lib runner.obj api.lib
+
+echo "Running the tests..."
+runner.exe
+
+REM Remove the generated files to ensure that they're not inadvertently run
+REM when something in the chain has failed.
+echo "Cleaning up..."
+del runner.cpp
+del *.obj
+del *.pdb
+del runner.lib
+del runner.ilk
+del runner.exp
+del vc80.idb
+del runner.exe
\ No newline at end of file
diff --git a/Code/Mantid/API/test/runTests.sh b/Code/Mantid/API/test/runTests.sh
new file mode 100644
index 00000000000..f075e2021fc
--- /dev/null
+++ b/Code/Mantid/API/test/runTests.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# Simple script to build and run the tests.
+# Will run all tests in the directory if no arguments are supplied,
+# or alternatively just the test files given as arguments.
+#
+# This script is optimised for linuxs1 (i.e. it probably won't work anywhere else!)
+#
+# You will need to have the directories containing the Mantid and Third Party
+# .so libraries in your LD_LIBRARY_PATH environment variable
+#
+# Author: Russell Taylor, 07/11/07
+#
+
+echo "Generating the source file from the test header files..."
+# Chaining all tests together can have effects that you don't think of
+# - it's always a good idea to run your new/changed test on its own
+if [ $# -eq 0 ]; then
+ cxxtestgen.pl --error-printer -o runner.cpp *.h
+else
+ cxxtestgen.pl --error-printer -o runner.cpp $*
+fi
+echo
+
+echo "Compiling the test executable..."
+g++ -o runner.exe runner.cpp -L ../../Debug -L ../../Build -L ../../../Third_Party/lib/linux64 -lMantid -lGet -lg2c -lPocoFoundation -lPocoUtil -lPocoXML -lPocoNet -lboost_python -lpython2.3
+echo
+
+echo "Running the tests..."
+./runner.exe
+echo
+
+# Remove the generated files to ensure that they're not inadvertently run
+# when something in the chain has failed.
+echo "Cleaning up..."
+rm -rf runner.*
+echo "Done."
diff --git a/Code/Mantid/Build/SConstruct b/Code/Mantid/Build/SConstruct
index 11d2e9bb0ef..a3b3d684be8 100644
--- a/Code/Mantid/Build/SConstruct
+++ b/Code/Mantid/Build/SConstruct
@@ -8,7 +8,7 @@ from socket import gethostname
#get libraries and the library directories
libDirList = ['../', '.']
-libList = ['python' + sys.version[0:3]]
+libList = ['python25']
cflags = []
dirList = []
cppPaths = []
@@ -34,8 +34,12 @@ while(len(dirpath)):
if os.name == 'nt':
# assume this is Windows
libDirList.append('../../Third_Party/lib/win32/')
+ libDirList.append('C:/python25/libs')
libDir = '../../Third_Party/lib/win32/'
- cflags = ['-W3','/EHsc', '/MTd', '/ZI', '/TP', '/DWIN32', '/D_DEBUG', '/D_WINDOWS', '/DPOCO_DLL', '/DWINVER=0x0500']
+ cflags = ['-Wall']
+ #cflags = ['-W3','/EHsc', '/MDd', '/ZI', '/TP', '/DWIN32', '/D_DEBUG', '/D_WINDOWS', '/DPOCO_DLL', '/DWINVER=0x0500']
+
+ cppPaths.append('../../Third_Party/include/')
for file in os.listdir(libDir):
if file.endswith('.dll'):
@@ -84,9 +88,9 @@ for fname in dirList:
# set header include paths
-env = Environment(CPPPATH=cppPaths)
+env = Environment(tools=["mingw"])
+env.Append( CPPPATH=cppPaths )
env.Append( CCFLAGS = cflags)
#BUILD CODE
-env.SharedLibrary('Mantid', listCpps, LIBS=[ ], LIBPATH=[ ], RPATH=libDirList)
-
+env.SharedLibrary('Mantid', listCpps, LIBS=libList, LIBPATH=libDirList, RPATH=libDirList)
diff --git a/Code/Mantid/DataHandling/DataHandling.vcproj b/Code/Mantid/DataHandling/DataHandling.vcproj
index 56099538789..30d1695a9b0 100644
--- a/Code/Mantid/DataHandling/DataHandling.vcproj
+++ b/Code/Mantid/DataHandling/DataHandling.vcproj
@@ -39,7 +39,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../Third_Party/include"
+ AdditionalIncludeDirectories="inc;../DataObjects/inc;../../Third_Party/include;../Kernel/inc;../Geometry/inc"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
RuntimeLibrary="3"
DebugInformationFormat="3"
@@ -57,6 +57,7 @@
Name="VCLinkerTool"
AdditionalDependencies="PocoFoundationd.lib PocoUtild.lib kernel.lib DataObjects.lib"
AdditionalLibraryDirectories="../debug;../../Third_Party/lib/win32"
+ GenerateDebugInformation="true"
/>
<Tool
Name="VCALinkTool"
@@ -153,7 +154,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\src\LoadRaw.cpp"
+ RelativePath=".\src\LoadInstrument.cpp"
>
</File>
<File
@@ -170,6 +171,10 @@
RelativePath=".\inc\DataHandlingCommand.h"
>
</File>
+ <File
+ RelativePath=".\inc\LoadInstrument.h"
+ >
+ </File>
<File
RelativePath=".\inc\LoadRaw.h"
>
diff --git a/Code/Mantid/DataHandling/inc/LoadRaw.h b/Code/Mantid/DataHandling/inc/LoadRaw.h
index c0ebfd5b263..e2f42bc6fe2 100644
--- a/Code/Mantid/DataHandling/inc/LoadRaw.h
+++ b/Code/Mantid/DataHandling/inc/LoadRaw.h
@@ -46,7 +46,7 @@ namespace DataHandling
File change history is stored at: <https://svn.mantidproject.org/mantid/trunk/Code/Mantid>
*/
- class LoadRaw : public DataHandlingCommand
+ class DLLExport LoadRaw : public DataHandlingCommand
{
public:
/// Default constructor
diff --git a/Code/Mantid/DataHandling/inc/SaveCSV.h b/Code/Mantid/DataHandling/inc/SaveCSV.h
index d2ac076cb46..517271d03ec 100644
--- a/Code/Mantid/DataHandling/inc/SaveCSV.h
+++ b/Code/Mantid/DataHandling/inc/SaveCSV.h
@@ -80,7 +80,7 @@ namespace DataHandling
File change history is stored at: <https://svn.mantidproject.org/mantid/trunk/Code/Mantid>
*/
- class SaveCSV : public DataHandlingCommand
+ class DLLExport SaveCSV : public DataHandlingCommand
{
public:
/// Default constructor
diff --git a/Code/Mantid/Geometry/Geometry.vcproj b/Code/Mantid/Geometry/Geometry.vcproj
index 2766c5494d0..aa24f42da3c 100644
--- a/Code/Mantid/Geometry/Geometry.vcproj
+++ b/Code/Mantid/Geometry/Geometry.vcproj
@@ -39,7 +39,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="inc;auxinc;../Kernel/inc;../../Third_Party/include"
+ AdditionalIncludeDirectories="inc;Deprecated/inc;../Kernel/inc;../../Third_Party/include"
PreprocessorDefinitions="_USE_MATH_DEFINES"
RuntimeLibrary="3"
DebugInformationFormat="3"
@@ -189,6 +189,10 @@
RelativePath=".\inc\Algebra.h"
>
</File>
+ <File
+ RelativePath=".\Deprecated\inc\AuxException.h"
+ >
+ </File>
<File
RelativePath=".\auxinc\AuxException.h"
>
@@ -241,6 +245,10 @@
RelativePath=".\inc\General.h"
>
</File>
+ <File
+ RelativePath=".\Deprecated\inc\IndexIterator.h"
+ >
+ </File>
<File
RelativePath=".\auxinc\IndexIterator.h"
>
@@ -265,6 +273,14 @@
RelativePath=".\inc\Material.h"
>
</File>
+ <File
+ RelativePath=".\Deprecated\inc\mathSupport.h"
+ >
+ </File>
+ <File
+ RelativePath=".\Deprecated\inc\Matrix.h"
+ >
+ </File>
<File
RelativePath=".\auxinc\Matrix.h"
>
@@ -301,10 +317,18 @@
RelativePath=".\inc\RefCon.h"
>
</File>
+ <File
+ RelativePath=".\Deprecated\inc\RefControl.h"
+ >
+ </File>
<File
RelativePath=".\inc\regexSupport.h"
>
</File>
+ <File
+ RelativePath=".\Deprecated\inc\RotCounter.h"
+ >
+ </File>
<File
RelativePath=".\auxinc\RotCounter.h"
>
@@ -350,13 +374,17 @@
>
</File>
<File
- RelativePath=".\inc\Vec3D.h"
+ RelativePath=".\Deprecated\inc\Vec3D.h"
>
</File>
<File
RelativePath=".\inc\VisitBase.h"
>
</File>
+ <File
+ RelativePath=".\Deprecated\inc\XMLattribute.h"
+ >
+ </File>
<File
RelativePath=".\auxinc\XMLattribute.h"
>
@@ -365,6 +393,14 @@
RelativePath=".\auxinc\XMLcollect.h"
>
</File>
+ <File
+ RelativePath=".\Deprecated\inc\XMLcollect.h"
+ >
+ </File>
+ <File
+ RelativePath=".\Deprecated\inc\XMLcomment.h"
+ >
+ </File>
<File
RelativePath=".\auxinc\XMLcomment.h"
>
@@ -373,6 +409,14 @@
RelativePath=".\auxinc\XMLcomp.h"
>
</File>
+ <File
+ RelativePath=".\Deprecated\inc\XMLcomp.h"
+ >
+ </File>
+ <File
+ RelativePath=".\Deprecated\inc\XMLgrid.h"
+ >
+ </File>
<File
RelativePath=".\auxinc\XMLgrid.h"
>
@@ -381,6 +425,14 @@
RelativePath=".\auxinc\XMLgridSupport.h"
>
</File>
+ <File
+ RelativePath=".\Deprecated\inc\XMLgridSupport.h"
+ >
+ </File>
+ <File
+ RelativePath=".\Deprecated\inc\XMLgroup.h"
+ >
+ </File>
<File
RelativePath=".\auxinc\XMLgroup.h"
>
@@ -389,10 +441,22 @@
RelativePath=".\auxinc\XMLindex.h"
>
</File>
+ <File
+ RelativePath=".\Deprecated\inc\XMLindex.h"
+ >
+ </File>
<File
RelativePath=".\auxinc\XMLnamespace.h"
>
</File>
+ <File
+ RelativePath=".\Deprecated\inc\XMLnamespace.h"
+ >
+ </File>
+ <File
+ RelativePath=".\Deprecated\inc\XMLobject.h"
+ >
+ </File>
<File
RelativePath=".\auxinc\XMLobject.h"
>
@@ -401,6 +465,14 @@
RelativePath=".\auxinc\XMLpath.h"
>
</File>
+ <File
+ RelativePath=".\Deprecated\inc\XMLpath.h"
+ >
+ </File>
+ <File
+ RelativePath=".\Deprecated\inc\XMLread.h"
+ >
+ </File>
<File
RelativePath=".\auxinc\XMLread.h"
>
@@ -409,6 +481,10 @@
RelativePath=".\auxinc\XMLsupport.h"
>
</File>
+ <File
+ RelativePath=".\Deprecated\inc\XMLvector.h"
+ >
+ </File>
<File
RelativePath=".\auxinc\XMLvector.h"
>
diff --git a/Code/Mantid/Kernel/Kernel.vcproj b/Code/Mantid/Kernel/Kernel.vcproj
index 06a6523066c..b61677fdb1b 100644
--- a/Code/Mantid/Kernel/Kernel.vcproj
+++ b/Code/Mantid/Kernel/Kernel.vcproj
@@ -153,22 +153,6 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File
- RelativePath=".\src\Algorithm.cpp"
- >
- </File>
- <File
- RelativePath=".\src\AlgorithmFactory.cpp"
- >
- </File>
- <File
- RelativePath=".\src\AlgorithmManager.cpp"
- >
- </File>
- <File
- RelativePath=".\src\AnalysisDataService.cpp"
- >
- </File>
<File
RelativePath=".\src\ConfigService.cpp"
>
@@ -181,10 +165,6 @@
RelativePath=".\src\Exception.cpp"
>
</File>
- <File
- RelativePath=".\src\FrameworkManager.cpp"
- >
- </File>
<File
RelativePath=".\src\LibraryManager.cpp"
>
@@ -198,19 +178,15 @@
>
</File>
<File
- RelativePath=".\src\PropertyWithValue.cpp"
- >
- </File>
- <File
- RelativePath=".\src\Support.cpp"
+ RelativePath=".\src\PropertyManager.cpp"
>
</File>
<File
- RelativePath=".\src\Workspace.cpp"
+ RelativePath=".\src\PropertyWithValue.cpp"
>
</File>
<File
- RelativePath=".\src\WorkspaceFactory.cpp"
+ RelativePath=".\src\Support.cpp"
>
</File>
</Filter>
@@ -219,30 +195,10 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
- <File
- RelativePath=".\inc\Algorithm.h"
- >
- </File>
- <File
- RelativePath=".\inc\AlgorithmFactory.h"
- >
- </File>
- <File
- RelativePath=".\inc\AlgorithmManager.h"
- >
- </File>
- <File
- RelativePath=".\inc\AnalysisDataService.h"
- >
- </File>
<File
RelativePath=".\inc\ConfigService.h"
>
</File>
- <File
- RelativePath=".\inc\DeclareUserAlg.h"
- >
- </File>
<File
RelativePath=".\inc\DllOpen.h"
>
@@ -255,14 +211,6 @@
RelativePath=".\inc\Exception.h"
>
</File>
- <File
- RelativePath=".\inc\FrameworkManager.h"
- >
- </File>
- <File
- RelativePath=".\inc\IAlgorithm.h"
- >
- </File>
<File
RelativePath=".\inc\IInterface.h"
>
@@ -291,6 +239,10 @@
RelativePath=".\inc\Property.h"
>
</File>
+ <File
+ RelativePath=".\inc\PropertyManager.h"
+ >
+ </File>
<File
RelativePath=".\inc\PropertyWithValue.h"
>
@@ -307,14 +259,6 @@
RelativePath=".\inc\System.h"
>
</File>
- <File
- RelativePath=".\inc\Workspace.h"
- >
- </File>
- <File
- RelativePath=".\inc\WorkspaceFactory.h"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
diff --git a/Code/Mantid/Kernel/inc/LibraryManager.h b/Code/Mantid/Kernel/inc/LibraryManager.h
index 81a2b91fce5..5a24531c5f6 100644
--- a/Code/Mantid/Kernel/inc/LibraryManager.h
+++ b/Code/Mantid/Kernel/inc/LibraryManager.h
@@ -4,7 +4,6 @@
#include <iostream>
#include <string>
#include <map>
-#include "Algorithm.h"
namespace Mantid
{
diff --git a/Code/Mantid/Kernel/src/LibraryManager.cpp b/Code/Mantid/Kernel/src/LibraryManager.cpp
index 69c0146129d..2a3c2b32786 100644
--- a/Code/Mantid/Kernel/src/LibraryManager.cpp
+++ b/Code/Mantid/Kernel/src/LibraryManager.cpp
@@ -1,7 +1,6 @@
#include <iostream>
#include "DllOpen.h"
-#include "Algorithm.h"
#include "LibraryManager.h"
namespace Mantid
@@ -38,19 +37,6 @@ namespace Kernel
return true;
}
- /*Algorithm* LibraryManager::CreateAlgorithm(const std::string& algName)
- {
- create_alg* createMyAlg = (create_alg*) DllOpen::GetFunction(module, algName.c_str());
-
- return createMyAlg();
- }
-
- void LibraryManager::DestroyAlgorithm(const std::string& algName, Algorithm* obj)
- {
- destroy_alg* destroyMyAlg = (destroy_alg*) DllOpen::GetFunction(module, algName.c_str());
-
- destroyMyAlg(obj);
- }*/
} // namespace Kernel
} // namespace Mantid
diff --git a/Code/Mantid/Kernel/src/PropertyManager.cpp b/Code/Mantid/Kernel/src/PropertyManager.cpp
index 8ce78c887fe..64570706d76 100644
--- a/Code/Mantid/Kernel/src/PropertyManager.cpp
+++ b/Code/Mantid/Kernel/src/PropertyManager.cpp
@@ -1,6 +1,7 @@
#include "PropertyManager.h"
#include "PropertyWithValue.h"
#include "Exception.h"
+#include <algorithm>
namespace Mantid
{
diff --git a/Code/Mantid/Main/Main.cpp b/Code/Mantid/Main/Main.cpp
index b8e2d7db701..6b1aef925eb 100644
--- a/Code/Mantid/Main/Main.cpp
+++ b/Code/Mantid/Main/Main.cpp
@@ -1,9 +1,11 @@
#include <iostream>
#include <iomanip>
+#include "LoadInstrument.h"
#include "SimpleIntegration.h"
#include "Exception.h"
#include "FrameworkManager.h"
+#include "WorkspaceFactory.h"
#include "Algorithm.h"
@@ -15,18 +17,23 @@ main()
//NOTE: Any code in here is temporory for debugging purposes only, nothing is safe!
FrameworkManager manager;
manager.initialize();
-
try
{
- manager.createAlgorithm("NotThere");
+ IAlgorithm *loader = manager.createAlgorithm("LoadInstrument");
+ std::string inputFile("../../../Test/Instrument/HET_Definition.txt");
+ loader->setProperty("Filename",inputFile);
+ loader->execute();
+ delete loader;
}
catch (Exception::NotFoundError &ex)
{
std::cerr << ex.what() <<std::endl;
}
+
+ //char c[10];
+ //std::cin.getline( &c[0], 1, '2' );
manager.clear();
-
#endif
exit(0);
}
\ No newline at end of file
diff --git a/Code/Mantid/Main/Main.vcproj b/Code/Mantid/Main/Main.vcproj
index d918ba3c069..19fe352aa03 100644
--- a/Code/Mantid/Main/Main.vcproj
+++ b/Code/Mantid/Main/Main.vcproj
@@ -38,7 +38,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../Kernel/inc;../Algorithms/inc"
+ AdditionalIncludeDirectories="../Kernel/inc;../Algorithms/inc;../DataHandling/inc;../Geometry/inc"
PreprocessorDefinitions="_DEBUG"
RuntimeLibrary="3"
DebugInformationFormat="3"
diff --git a/Code/Mantid/Mantid.sln b/Code/Mantid/Mantid.sln
index 4f3f5218199..9f74644100d 100644
--- a/Code/Mantid/Mantid.sln
+++ b/Code/Mantid/Mantid.sln
@@ -5,31 +5,46 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Kernel", "Kernel\Kernel.vcp
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Algorithms", "Algorithms\Algorithms.vcproj", "{44AAB5BE-B672-4B26-A472-1FC3FFB896AF}"
ProjectSection(ProjectDependencies) = postProject
- {C38A9DC2-8320-49AA-909D-955CB37FD8F3} = {C38A9DC2-8320-49AA-909D-955CB37FD8F3}
{902CB04F-8893-4FE8-83B8-09F9DB20A82A} = {902CB04F-8893-4FE8-83B8-09F9DB20A82A}
+ {AD0CD585-694E-4367-B7D0-2F16C4EF59F8} = {AD0CD585-694E-4367-B7D0-2F16C4EF59F8}
+ {C38A9DC2-8320-49AA-909D-955CB37FD8F3} = {C38A9DC2-8320-49AA-909D-955CB37FD8F3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataObjects", "DataObjects\DataObjects.vcproj", "{C38A9DC2-8320-49AA-909D-955CB37FD8F3}"
ProjectSection(ProjectDependencies) = postProject
{902CB04F-8893-4FE8-83B8-09F9DB20A82A} = {902CB04F-8893-4FE8-83B8-09F9DB20A82A}
+ {F1EB475D-8936-49E5-AC28-3B3830483487} = {F1EB475D-8936-49E5-AC28-3B3830483487}
+ {AD0CD585-694E-4367-B7D0-2F16C4EF59F8} = {AD0CD585-694E-4367-B7D0-2F16C4EF59F8}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataHandling", "DataHandling\DataHandling.vcproj", "{296392B7-E931-4821-A68D-3412E7DD554A}"
ProjectSection(ProjectDependencies) = postProject
- {C38A9DC2-8320-49AA-909D-955CB37FD8F3} = {C38A9DC2-8320-49AA-909D-955CB37FD8F3}
{902CB04F-8893-4FE8-83B8-09F9DB20A82A} = {902CB04F-8893-4FE8-83B8-09F9DB20A82A}
+ {AD0CD585-694E-4367-B7D0-2F16C4EF59F8} = {AD0CD585-694E-4367-B7D0-2F16C4EF59F8}
+ {C38A9DC2-8320-49AA-909D-955CB37FD8F3} = {C38A9DC2-8320-49AA-909D-955CB37FD8F3}
+ {F1EB475D-8936-49E5-AC28-3B3830483487} = {F1EB475D-8936-49E5-AC28-3B3830483487}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Main", "Main\Main.vcproj", "{8214A04F-8650-49FC-8547-FD2716855980}"
ProjectSection(ProjectDependencies) = postProject
{902CB04F-8893-4FE8-83B8-09F9DB20A82A} = {902CB04F-8893-4FE8-83B8-09F9DB20A82A}
- {F1EB475D-8936-49E5-AC28-3B3830483487} = {F1EB475D-8936-49E5-AC28-3B3830483487}
- {296392B7-E931-4821-A68D-3412E7DD554A} = {296392B7-E931-4821-A68D-3412E7DD554A}
- {44AAB5BE-B672-4B26-A472-1FC3FFB896AF} = {44AAB5BE-B672-4B26-A472-1FC3FFB896AF}
+ {AD0CD585-694E-4367-B7D0-2F16C4EF59F8} = {AD0CD585-694E-4367-B7D0-2F16C4EF59F8}
{C38A9DC2-8320-49AA-909D-955CB37FD8F3} = {C38A9DC2-8320-49AA-909D-955CB37FD8F3}
+ {44AAB5BE-B672-4B26-A472-1FC3FFB896AF} = {44AAB5BE-B672-4B26-A472-1FC3FFB896AF}
+ {296392B7-E931-4821-A68D-3412E7DD554A} = {296392B7-E931-4821-A68D-3412E7DD554A}
+ {F1EB475D-8936-49E5-AC28-3B3830483487} = {F1EB475D-8936-49E5-AC28-3B3830483487}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "Geometry\Geometry.vcproj", "{F1EB475D-8936-49E5-AC28-3B3830483487}"
+ ProjectSection(ProjectDependencies) = postProject
+ {902CB04F-8893-4FE8-83B8-09F9DB20A82A} = {902CB04F-8893-4FE8-83B8-09F9DB20A82A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "API", "API\API.vcproj", "{AD0CD585-694E-4367-B7D0-2F16C4EF59F8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {902CB04F-8893-4FE8-83B8-09F9DB20A82A} = {902CB04F-8893-4FE8-83B8-09F9DB20A82A}
+ {F1EB475D-8936-49E5-AC28-3B3830483487} = {F1EB475D-8936-49E5-AC28-3B3830483487}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -50,6 +65,7 @@ Global
{C38A9DC2-8320-49AA-909D-955CB37FD8F3}.Release|Win32.ActiveCfg = Release|Win32
{C38A9DC2-8320-49AA-909D-955CB37FD8F3}.Release|Win32.Build.0 = Release|Win32
{296392B7-E931-4821-A68D-3412E7DD554A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {296392B7-E931-4821-A68D-3412E7DD554A}.Debug|Win32.Build.0 = Debug|Win32
{296392B7-E931-4821-A68D-3412E7DD554A}.Release|Win32.ActiveCfg = Release|Win32
{296392B7-E931-4821-A68D-3412E7DD554A}.Release|Win32.Build.0 = Release|Win32
{8214A04F-8650-49FC-8547-FD2716855980}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -60,6 +76,10 @@ Global
{F1EB475D-8936-49E5-AC28-3B3830483487}.Debug|Win32.Build.0 = Debug|Win32
{F1EB475D-8936-49E5-AC28-3B3830483487}.Release|Win32.ActiveCfg = Release|Win32
{F1EB475D-8936-49E5-AC28-3B3830483487}.Release|Win32.Build.0 = Release|Win32
+ {AD0CD585-694E-4367-B7D0-2F16C4EF59F8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AD0CD585-694E-4367-B7D0-2F16C4EF59F8}.Debug|Win32.Build.0 = Debug|Win32
+ {AD0CD585-694E-4367-B7D0-2F16C4EF59F8}.Release|Win32.ActiveCfg = Release|Win32
+ {AD0CD585-694E-4367-B7D0-2F16C4EF59F8}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
--
GitLab