Last attempt for now.... Re #1037.

mantidproject · Dec 31, 2011 · 78c6444 · 78c6444
1 parent 147436f
commit 78c6444
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/Code/Mantid/Installers/WinInstaller/generateWxs.py b/Code/Mantid/Installers/WinInstaller/generateWxs.py
@@ -598,7 +598,7 @@ def createPropertiesFile(filename):
 addFileV('qtiplotutil', 'qtiUtil.py', 'qtiUtil.py', CODEDIR + '/Mantid/MantidPlot/qtiUtil.py', MantidDlls)
 addFileV('mantidplotrc', 'mtdrc.py', 'mantidplotrc.py', CODEDIR + '/Mantid/MantidPlot/mantidplotrc.py', MantidDlls)
 #addFileV('mantidplot', 'mtdplot.py', 'mantidplot.py', CODEDIR + '/Mantid/MantidPlot/mantidplot.py', MantidDlls)
-mantidplot = addCompList('mtdpltmod',CODEDIR + '/Mantid/MantidPlot/mantidplot','mantidplot',binDir)[0]
+mantidplot = addCompList('mtdpltmod',CODEDIR + '/Mantid/MantidPlot/mantidplotpy','mantidplotpy',binDir)[0]
 
 # Remove files that may have been created
 files_to_remove = ['qtiplotrc.pyc','qtiUtil.pyc','mantidplotrc.pyc','mantidplot.pyc','MantidFramework.pyc','MantidHeader.pyc',\

diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt
@@ -807,8 +807,8 @@ endforeach ( PYFILE ${PYTHON_INSTALL_FILES} )
 
 add_custom_command ( TARGET MantidPlot POST_BUILD
                      COMMAND ${CMAKE_COMMAND} ARGS -E copy_directory
-                       ${CMAKE_CURRENT_SOURCE_DIR}/mantidplot
-                       ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/mantidplot
+                       ${CMAKE_CURRENT_SOURCE_DIR}/mantidplotpy
+                       ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/mantidplotpy
 )
 
 ###########################################################################
@@ -874,7 +874,7 @@ install ( TARGETS MantidPlot RUNTIME DESTINATION ${BIN_DIR}
                              BUNDLE DESTINATION .
 )
 install ( FILES ${PYTHON_INSTALL_FILES} DESTINATION ${BIN_DIR} )
-install ( DIRECTORY mantidplot DESTINATION ${BIN_DIR} )
+install ( DIRECTORY mantidplotpy DESTINATION ${BIN_DIR} )
 
 if ( APPLE )
   configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/FixBundle.cmake.in

diff --git a/.../Mantid/MantidPlot/mantidplot/__init__.py → ...antid/MantidPlot/mantidplotpy/__init__.py b/.../Mantid/MantidPlot/mantidplot/__init__.py → ...antid/MantidPlot/mantidplotpy/__init__.py
diff --git a/...antid/MantidPlot/mantidplot/mantidplot.py → ...tid/MantidPlot/mantidplotpy/mantidplot.py b/...antid/MantidPlot/mantidplot/mantidplot.py → ...tid/MantidPlot/mantidplotpy/mantidplot.py
diff --git a/Code/Mantid/MantidPlot/mantidplot/proxies.py → ...Mantid/MantidPlot/mantidplotpy/proxies.py b/Code/Mantid/MantidPlot/mantidplot/proxies.py → ...Mantid/MantidPlot/mantidplotpy/proxies.py
diff --git a/Code/Mantid/MantidPlot/mantidplotrc.py b/Code/Mantid/MantidPlot/mantidplotrc.py
@@ -18,7 +18,7 @@
 
     # Make MantidPlot Python API available to main user scripts.
     # For modules imported into a main script users will need to do this too
-    from mantidplot import *
+    from mantidplotpy import *
 
 
     # Define a helper class for the autocomplete