refs #3641 fix cmake error

mantidproject · Oct 24, 2011 · 2dc29d9 · 2dc29d9
2 parents 775f90e + e8eebf7
commit 2dc29d9
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 183 deletions.
diff --git a/Code/.gitignore b/Code/.gitignore
@@ -1,2 +1,4 @@
 # Make sure Third_Party doesn't get checked into the main repository
-Third_Party/
+Third_Party/
+# For an out-of-source build: make sure it doesn't get checked in either.
+dbg/
diff --git a/Code/Mantid/Build/cmakelists_utils.py b/Code/Mantid/Build/cmakelists_utils.py
@@ -21,7 +21,9 @@ def find_basedir(project, subproject):
     """
     header_folder = "Mantid" + subproject
     if project == "MantidQt": header_folder = "MantidQt" + subproject
-    basedir = os.path.join(os.path.curdir, project, subproject)
+    scriptdir = os.path.split(__file__)[0] #Folder of Code/Build
+    codedir = os.path.split(scriptdir)[0] #Folder of Code/
+    basedir = os.path.join(codedir, project, subproject)
     return (basedir, header_folder)
 
 

diff --git a/Code/Mantid/Build/delete_class.py b/Code/Mantid/Build/delete_class.py
@@ -12,7 +12,7 @@
 
 #======================================================================
 def delete_one(oldfilename):
-    cmd = "svn remove " + oldfilename
+    cmd = "git rm " + oldfilename
     print "Running:", cmd
     os.system(cmd)
 
@@ -65,6 +65,10 @@ def delete_all(subproject, classname, args):
                         const=False, default=True,
                         help="Don't delete the cpp file")
 
+    parser.add_argument('--project', dest='project', 
+                    default="Framework",
+                    help='The project in which this goes. Default: Framework. Can be MantidQt, Vates')
+
     args = parser.parse_args()
     subproject = args.subproject
     classname = args.classname

diff --git a/Code/Mantid/Build/move_class.py b/Code/Mantid/Build/move_class.py
@@ -15,7 +15,7 @@ def move_one(subproject, classname, newproject, newclassname, oldfilename, newfi
     """Move one file """
 
     # Do an SVN move
-    cmd = "svn mv " + oldfilename + " " + newfilename
+    cmd = "git mv " + oldfilename + " " + newfilename
     print "Running:", cmd
     os.system(cmd)
 

diff --git a/Code/Mantid/Framework/Algorithms/CMakeLists.txt b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
@@ -55,7 +55,6 @@ set ( SRC_FILES
 	src/DiffractionFocussing2.cpp
 	src/Divide.cpp
 	src/DspacemaptoCal.cpp
-	src/Dummy.cpp
 	src/EQSANSResolution.cpp
 	src/EQSANSTofStructure.cpp
 	src/EditTOFPowderDiffractomerGeometry.cpp
@@ -224,7 +223,6 @@ set ( INC_FILES
 	inc/MantidAlgorithms/DiffractionFocussing2.h
 	inc/MantidAlgorithms/Divide.h
 	inc/MantidAlgorithms/DspacemaptoCal.h
-	inc/MantidAlgorithms/Dummy.h
 	inc/MantidAlgorithms/EQSANSResolution.h
 	inc/MantidAlgorithms/EQSANSTofStructure.h
 	inc/MantidAlgorithms/EditTOFPowderDiffractomerGeometry.h
@@ -391,7 +389,6 @@ set ( TEST_FILES
 	test/DiffractionFocussingTest.h
 	test/DivideTest.h
 	test/DspacemaptoCalTest.h
-	test/DummyTest.h
 	test/EditTOFPowderDiffractomerGeometryTest.h
 	test/ExponentialCorrectionTest.h
 	test/ExponentialTest.h

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/Dummy.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/Dummy.h
diff --git a/Code/Mantid/Framework/Algorithms/src/Dummy.cpp b/Code/Mantid/Framework/Algorithms/src/Dummy.cpp
diff --git a/Code/Mantid/Framework/Algorithms/test/DummyTest.h b/Code/Mantid/Framework/Algorithms/test/DummyTest.h
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -85,7 +85,7 @@ set ( MOC_FILES inc/MantidQtCustomInterfaces/ApproachDialog.h
                 inc/MantidQtCustomInterfaces/SANSPlotSpecial.h
                 inc/MantidQtCustomInterfaces/SANSRunWindow.h
                 inc/MantidQtCustomInterfaces/SANSDiagnostics.h
-				        #inc/MantidQtCustomInterfaces/StandardLogView.h
+				#inc/MantidQtCustomInterfaces/StandardLogView.h
 )
 
 set ( UI_FILES inc/MantidQtCustomInterfaces/ConvertToEnergy.ui

diff --git a/Code/Mantid/scripts/Vates/Diffraction_Workflow.py b/Code/Mantid/scripts/Vates/Diffraction_Workflow.py
@@ -63,3 +63,7 @@
 					PeaksWorkspace=ws+'_peaks_predicted', OutputWorkspace=ws+'_peaks_predicted_integ')
 
 	BinToMDHistoWorkspace(InputWorkspace='TOPAZ_3131_HKL',AlignedDimX='H,-20,0,200',AlignedDimY='K,-5,15,200',AlignedDimZ='L,-5,15,200',OutputWorkspace='hkl')
+
+	BinToMDHistoWorkspace(InputWorkspace='TOPAZ_3131_HKL',AlignedDimX='H,-20,0,500',AlignedDimY='K,-5,15,500',AlignedDimZ='L,-5,15,100',OutputWorkspace='hkl_2')
+
+