Refs #4024 fixes for windows nexus 4.3.0

mantidproject · Nov 18, 2011 · 03a5a4d · 03a5a4d
1 parent 502a7ec
commit 03a5a4d
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 22 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
@@ -7,7 +7,6 @@
 #include "MantidAPI/IDataFileChecker.h"
 #include "MantidDataObjects/EventWorkspace.h"
 
-//Copy of the NexusCpp API was placed in MantidNexus
 #include "nexus/NeXusFile.hpp"
 #include "nexus/NeXusException.hpp"
 #include "MantidDataObjects/Events.h"

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadLogsFromSNSNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadLogsFromSNSNexus.h
@@ -9,11 +9,8 @@
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/Sample.h"
 #include "MantidDataObjects/Workspace2D.h"
-
-//Copy of the NexusCpp API was placed in MantidNexus
 #include "nexus/NeXusFile.hpp"
 #include "nexus/NeXusException.hpp"
-
 #include "MantidAPI/DeprecatedAlgorithm.h"
 
 namespace Mantid

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h
@@ -4,7 +4,6 @@
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include <boost/scoped_array.hpp>
-//Copy of the NexusCpp API was placed in MantidNexus
 #include "nexus/NeXusFile.hpp"
 #include "nexus/NeXusException.hpp"
 

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SaveNXSPE.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SaveNXSPE.h
@@ -10,8 +10,6 @@
 #include "MantidAPI/Sample.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidDataObjects/EventWorkspace.h"
-
-//Copy of the NexusCpp API was placed in MantidNexus
 #include "nexus/NeXusFile.hpp"
 #include "nexus/NeXusException.hpp"
 

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h
@@ -12,8 +12,6 @@
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidGeometry/Instrument/RectangularDetector.h"
-
-//Copy of the NexusCpp API was placed in MantidNexus
 #include "nexus/NeXusFile.hpp"
 #include "nexus/NeXusException.hpp"
 

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadNXSPE.cpp b/Code/Mantid/Framework/DataHandling/src/LoadNXSPE.cpp
@@ -8,8 +8,6 @@ Algorithm to load an NXSPE file into a workspace2D. It will create a new instrum
 #include "MantidKernel/UnitFactory.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/LoadAlgorithmFactory.h"
-
-//Copy of the NexusCpp API was placed in MantidNexus
 #include "nexus/NeXusFile.hpp"
 #include "nexus/NeXusException.hpp"
 #include "MantidNexus/NexusClasses.h"

diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/NexusTestHelper.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/NexusTestHelper.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_NEXUSCPP_NEXUSTESTHELPER_H_
-#define MANTID_NEXUSCPP_NEXUSTESTHELPER_H_
+#ifndef MANTID_KERNEL_NEXUSTESTHELPER_H_
+#define MANTID_KERNEL_NEXUSTESTHELPER_H_
 
 #include "MantidKernel/System.h"
 #include "nexus/NeXusFile.hpp"
@@ -58,4 +58,4 @@ namespace Kernel
 } // namespace Kernel
 } // namespace Mantid
 
-#endif  /* MANTID_NEXUSCPP_NEXUSTESTHELPER_H_ */
+#endif  /* MANTID_KERNEL_NEXUSTESTHELPER_H_ */
diff --git a/Code/Mantid/Installers/WinInstaller/generateWxs.py b/Code/Mantid/Installers/WinInstaller/generateWxs.py
@@ -74,7 +74,6 @@
     comp_guid['IncludeFiles'] = '{e86d1741-bc2b-4a9f-a6a7-3f7905aaf3aa}'
     comp_guid['IncludeMantidAPI'] = '{4761DDF6-813C-4470-8852-98CB9A69EBC9}'
     comp_guid['IncludeMantidKernel'] = '{AF40472B-5822-4ff6-8E05-B4DA5224AA87}'
-    comp_guid['IncludeMantidNexusCPP'] = '{12cf277b-8224-420c-b54a-8425c0376fc3}'
     comp_guid['Temp'] = '{02D25B60-A114-4f2a-A211-DE88CF648C61}'
     comp_guid['Data'] = '{6D9A0A53-42D5-46a5-8E88-6BB4FB7A5FE1}'
     comp_guid['UserAlgorithms'] = '{A82B4540-3CDB-45fa-A7B3-42F392378D3F}'
@@ -90,7 +89,6 @@
     comp_guid['IncludeFiles'] = '{a291f307-477c-4169-9bdb-65f76eb413bf}'
     comp_guid['IncludeMantidAPI'] = '{878ff1f2-7d09-4817-972b-3590c45ea0c9}'
     comp_guid['IncludeMantidKernel'] = '{187317c0-cc23-4a21-bf19-0e347866620c}'
-    comp_guid['IncludeMantidNexusCPP'] = '{20327246-8f47-448b-ae2b-8d464c3a69c7}'
     comp_guid['Temp'] = '{212cc3fe-95fb-40d9-a3a7-8421791ac19f}'
     comp_guid['Data'] = '{c9577b5b-75e5-4a4a-b2d5-f4905174627c}'
     comp_guid['UserAlgorithms'] = '{496555f0-f719-4db7-bd8e-5bbcd9fe837d}'
@@ -523,7 +521,6 @@ def createPropertiesFile(filename):
 addFileV('MantidAPI','MAPI.dll','MantidAPI.dll',MANTIDRELEASE + '/MantidAPI.dll',MantidDlls)
 addFileV('MantidGeometry','MGeo.dll','MantidGeometry.dll',MANTIDRELEASE + '/MantidGeometry.dll',MantidDlls)
 addFileV('MantidKernel','MKern.dll','MantidKernel.dll',MANTIDRELEASE + '/MantidKernel.dll',MantidDlls)
-addFileV('MantidNexusCPP','MNxsCPP.dll','MantidNexusCPP.dll',MANTIDRELEASE + '/MantidNexusCPP.dll',MantidDlls)
 
 # Add qt API  library
 addFileV('MantidQtAPI','MQTAPI.dll','MantidQtAPI.dll',MANTIDRELEASE + '/MantidQtAPI.dll',MantidDlls)
@@ -670,10 +667,6 @@ def createPropertiesFile(filename):
 includeMantidKernelDir = addDirectory('IncludeMantidKernelDir','KER','MantidKernel',includeDir)
 IncludeMantidKernel = addComponent('IncludeMantidKernel',comp_guid['IncludeMantidKernel'],includeMantidKernelDir)
 addAllFiles(FRAMEWORKDIR + '/Kernel/inc/MantidKernel','ker',IncludeMantidKernel)
-# NexusCPP
-includeMantidNexusCPPDir = addDirectory('IncludeMantidNexusCPPDir','NEXCPP','MantidNexusCPP',includeDir)
-IncludeMantidNexusCPP = addComponent('IncludeMantidNexusCPP',comp_guid['IncludeMantidNexusCPP'],includeMantidNexusCPPDir)
-addAllFiles(FRAMEWORKDIR + '/NexusCPP/inc/MantidNexusCPP','nex',IncludeMantidNexusCPP)
 # Other includes
 # NeXus API header
 addFileV('NAPI', 'napi.h', 'napi.h', CODEDIR + '/Third_Party/include/napi.h', IncludeFilesComp)
@@ -770,7 +763,6 @@ def createPropertiesFile(filename):
 addCRef('IncludeMantidAPI',Includes)
 addCRefs(includeMantidGeometryDirList,Includes)
 addCRef('IncludeMantidKernel',Includes)
-addCRef('IncludeMantidNexusCPP',Includes)
 
 addCRefs(boostList,Includes)
 addCRefs(pocoList,Includes)