Merge branch 'feature/10015_settings_reset_mechanism' into develop

Conflicts:
	Code/Mantid/MantidPlot/CMakeLists.txt

Refs #10015

Code/Mantid/Build/CMake/MantidUtils.cmake

@@ -61,29 +61,29 @@ endfunction( SET_TARGET_OUTPUT_DIRECTORY )
 #######################################################################
 
 #
-# NAME: COPY_PYTHON_FILES_TO_DIR
-# Adds a set of custom commands for each python file to copy
+# NAME: COPY_FILES_TO_DIR
+# Adds a set of custom commands for each file to copy
 # the given file to the destination directory
-#   - PY_FILES :: A list of python files to copy. Note you will have
+#   - FILES :: A list of files to copy. Note you will have
 #                 to quote an expanded list
 #   - SRC_DIR :: The src directory of the files to be copied
 #   - DEST_DIR :: The final directory for the copied files
 #   - INSTALLED_FILES :: An output variable containing the list of copied
 #                        files including their full paths
-function( COPY_PYTHON_FILES_TO_DIR PY_FILES SRC_DIR DEST_DIR INSTALLED_FILES )
+function( COPY_FILES_TO_DIR FILES SRC_DIR DEST_DIR INSTALLED_FILES )
     set ( COPIED_FILES ${${INSTALLED_FILES}} )
-    foreach ( PYFILE ${PY_FILES} )
-        get_filename_component( _basefilename ${PYFILE} NAME_WE )
-        set( _py_src ${SRC_DIR}/${PYFILE} )
-        set( _py_bin ${DEST_DIR}/${PYFILE} )
-        add_custom_command ( OUTPUT ${_py_bin}
-                             DEPENDS ${_py_src}
+    foreach ( _FILE ${FILES} )
+        get_filename_component( _basefilename ${_FILE} NAME_WE )
+        set( _src ${SRC_DIR}/${_FILE} )
+        set( _bin ${DEST_DIR}/${_FILE} )
+        add_custom_command ( OUTPUT ${_bin}
+                             DEPENDS ${_src}
                              COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
-                               ${_py_src} ${_py_bin} )
-    set ( COPIED_FILES ${COPIED_FILES} ${_py_bin} )
-    endforeach ( PYFILE )
+                               ${_src} ${_bin} )
+    set ( COPIED_FILES ${COPIED_FILES} ${_bin} )
+    endforeach ( _FILE )
     set ( ${INSTALLED_FILES} ${COPIED_FILES} PARENT_SCOPE )
-endfunction( COPY_PYTHON_FILES_TO_DIR )
+endfunction( COPY_FILES_TO_DIR )
 
 #######################################################################
 

Code/Mantid/Framework/PythonInterface/mantid/CMakeLists.txt

@@ -17,15 +17,15 @@ set ( PY_FILES
   simpleapi.py
 )
 
-copy_python_files_to_dir ( "${PY_FILES}" ${CMAKE_CURRENT_SOURCE_DIR} ${OUTPUT_DIR} 
-                           PYTHON_PKGROOT_INSTALL_FILES )
+copy_files_to_dir ( "${PY_FILES}" ${CMAKE_CURRENT_SOURCE_DIR} ${OUTPUT_DIR} 
+                     PYTHON_PKGROOT_INSTALL_FILES )
 # Generate the version module
 set ( VERSION_PY pyversion )
 # Build version
 configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/${VERSION_PY}.py.in ${CMAKE_CURRENT_BINARY_DIR}/${VERSION_PY}.py )
 # Copy py to build directory, taking care of multi-config (MSVC) builds
-copy_python_files_to_dir ( ${VERSION_PY}.py ${CMAKE_CURRENT_BINARY_DIR} ${OUTPUT_DIR}
-                           PYTHON_PKGROOT_INSTALL_FILES )
+copy_files_to_dir ( ${VERSION_PY}.py ${CMAKE_CURRENT_BINARY_DIR} ${OUTPUT_DIR}
+                    PYTHON_PKGROOT_INSTALL_FILES )
 # Package version
 configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/${VERSION_PY}.py.in ${CMAKE_CURRENT_BINARY_DIR}/${VERSION_PY}.install.py )
 

Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt

@@ -115,8 +115,8 @@ if(CMAKE_GENERATOR STREQUAL Xcode)
   set ( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PYTHON_PKG_ROOT}/api )
 endif()
 
-copy_python_files_to_dir ( "${PY_FILES}" ${CMAKE_CURRENT_SOURCE_DIR} ${OUTPUT_DIR} 
-                           PYTHON_INSTALL_FILES )
+copy_files_to_dir ( "${PY_FILES}" ${CMAKE_CURRENT_SOURCE_DIR} ${OUTPUT_DIR} 
+                     PYTHON_INSTALL_FILES )
 
 #############################################################################################
 # Create the target for this directory

Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt

@@ -57,8 +57,8 @@ if(CMAKE_GENERATOR STREQUAL Xcode)
   set ( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PYTHON_PKG_ROOT}/geometry )
 endif()
 
-copy_python_files_to_dir ( "${PY_FILES}" ${CMAKE_CURRENT_SOURCE_DIR} ${OUTPUT_DIR} 
-                           PYTHON_INSTALL_FILES )
+copy_files_to_dir ( "${PY_FILES}" ${CMAKE_CURRENT_SOURCE_DIR} ${OUTPUT_DIR} 
+                     PYTHON_INSTALL_FILES )
 
 #############################################################################################
 # Create the target for this directory

Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt

@@ -124,8 +124,8 @@ if(CMAKE_GENERATOR STREQUAL Xcode)
   set ( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PYTHON_PKG_ROOT}/kernel )
 endif()
 
-copy_python_files_to_dir ( "${PY_FILES}" ${CMAKE_CURRENT_SOURCE_DIR} ${OUTPUT_DIR} 
-                           PYTHON_INSTALL_FILES )
+copy_files_to_dir ( "${PY_FILES}" ${CMAKE_CURRENT_SOURCE_DIR} ${OUTPUT_DIR} 
+                     PYTHON_INSTALL_FILES )
 
 #############################################################################################
 # Generate the packagesetup module for the build & install package
@@ -139,8 +139,8 @@ endif()
 # Build version
 configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGESETUP_PY}.py.in ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGESETUP_PY}.py )
 # Copy py to build directory, taking care of multi-config (MSVC) builds
-copy_python_files_to_dir ( ${PACKAGESETUP_PY}.py ${CMAKE_CURRENT_BINARY_DIR} ${OUTPUT_DIR}
-                           PYTHON_INSTALL_FILES )
+copy_files_to_dir ( ${PACKAGESETUP_PY}.py ${CMAKE_CURRENT_BINARY_DIR} ${OUTPUT_DIR}
+                    PYTHON_INSTALL_FILES )
 
 # Package version
 if ( WIN32 OR APPLE )

Code/Mantid/Framework/PythonInterface/test/testhelpers/CMakeLists.txt

@@ -9,8 +9,8 @@ set ( PY_FILES
 
 # Copy python files to output directory
 set ( OUTPUT_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/testhelpers )
-copy_python_files_to_dir ( "${PY_FILES}" ${CMAKE_CURRENT_SOURCE_DIR} ${OUTPUT_DIR} 
-                           PYTHON_INSTALL_FILES )
+copy_files_to_dir ( "${PY_FILES}" ${CMAKE_CURRENT_SOURCE_DIR} ${OUTPUT_DIR} 
+                     PYTHON_INSTALL_FILES )
 
 #############################################################################################
 # Create the targets for this directory

Code/Mantid/MantidPlot/CMakeLists.txt

@@ -824,45 +824,46 @@ endif ()
 # Config reset scripts
 ###########################################################################
 
-if( WIN32 )
-  file( COPY
-        ${CMAKE_CURRENT_SOURCE_DIR}/reset_settings.bat
-        DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR} )
+if ( WIN32 )
+  set ( CONFIG_RESET_SCRIPT reset_settings.bat )
 else ()
-  file( COPY
-        ${CMAKE_CURRENT_SOURCE_DIR}/reset_settings.sh
-        DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR} )
+  set ( CONFIG_RESET_SCRIPT reset_settings.sh )
 endif ()
 
+copy_files_to_dir ( "${CONFIG_RESET_SCRIPT}"
+                     ${CMAKE_CURRENT_SOURCE_DIR}
+                     ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}
+                     CONFIG_RESET_SCRIPT_FILE )
+
 ###########################################################################
 # Required Python config files
 ###########################################################################
 
 # Top-level python scripts
 set( PY_FILES mantidplotrc.py mantidplot.py qt_settings_editor.py )
-copy_python_files_to_dir ( "${PY_FILES}"
-                            ${CMAKE_CURRENT_SOURCE_DIR}
-                            ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}
-                            PYTHON_INSTALL_FILES )
+copy_files_to_dir ( "${PY_FILES}"
+                     ${CMAKE_CURRENT_SOURCE_DIR}
+                     ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}
+                     PYTHON_INSTALL_FILES )
 # mantidplot.py package
 set( MTDPLOTPY_FILES
   __init__.py
   proxies.py
 )
-copy_python_files_to_dir ( "${MTDPLOTPY_FILES}"
-                            ${CMAKE_CURRENT_SOURCE_DIR}/mantidplotpy
-                            ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/mantidplotpy
-                            MTDPLOT_INSTALL_FILES )
+copy_files_to_dir ( "${MTDPLOTPY_FILES}"
+                     ${CMAKE_CURRENT_SOURCE_DIR}/mantidplotpy
+                     ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/mantidplotpy
+                     MTDPLOT_INSTALL_FILES )
 
 # IPython scripts
 set( IPY_FILES
   __init__.py
   mantid_ipython_widget.py
 )
-copy_python_files_to_dir ( "${IPY_FILES}"
-                            ${CMAKE_CURRENT_SOURCE_DIR}/ipython_widget
-                            ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/ipython_widget
-                            IPYTHON_INSTALL_FILES )
+copy_files_to_dir ( "${IPY_FILES}"
+                     ${CMAKE_CURRENT_SOURCE_DIR}/ipython_widget
+                     ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/ipython_widget
+                     IPYTHON_INSTALL_FILES )
 
 # SysMon scripts
 set( SYSMON_FILES
@@ -885,7 +886,7 @@ copy_python_files_to_dir ( "${SYSMON_FILES}"
 add_executable ( MantidPlot ${WIN_CONSOLE} MACOSX_BUNDLE ${ALL_SRC} src/main.cpp
 							${INC_FILES} ${QTIPLOT_C_SRC} ${UI_HDRS}
 							${RES_FILES} ${MANTID_RC_FILE}
-							${PYTHON_INSTALL_FILES} ${MTDPLOT_INSTALL_FILES} ${IPYTHON_INSTALL_FILES} ${SYSMON_INSTALL_FILES}
+              ${PYTHON_INSTALL_FILES} ${MTDPLOT_INSTALL_FILES} ${IPYTHON_INSTALL_FILES} ${SYSMON_INSTALL_FILES} ${CONFIG_RESET_SCRIPT_FILE}
 )
 
 # Library dependencies
@@ -1025,6 +1026,7 @@ endforeach()
 foreach(PY_FILE ${SYSMON_FILES} )
   install ( FILES SysMon/${PY_FILE} DESTINATION ${BIN_DIR}/SysMon )
 endforeach()
+install ( FILES ${CONFIG_RESET_SCRIPT} DESTINATION ${BIN_DIR} )
 
 if ( APPLE )
   configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/FixBundle.cmake.in
@@ -1035,8 +1037,3 @@ if ( APPLE )
   install ( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake )
 endif ()
 
-if( WIN32 )
-  install( PROGRAMS reset_settings.bat DESTINATION ${BIN_DIR} )
-else ()
-  install( PROGRAMS reset_settings.sh DESTINATION ${BIN_DIR} )
-endif ()