From 741c785ac3a1393eec6316963cffa406fd6fd75a Mon Sep 17 00:00:00 2001 From: Dan Nixon <dan@dan-nixon.com> Date: Fri, 1 Aug 2014 11:28:05 +0100 Subject: [PATCH] Install reset scripts alongside executable Refs #10015 --- Code/Mantid/MantidPlot/CMakeLists.txt | 16 +++++++++++++- .../MantidPlot}/qt_settings_editor.py | 0 .../MantidPlot/reset_settings_unix.sh} | 0 .../MantidPlot/reset_settings_windows.bat | 21 +++++++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) rename Code/{Tools/ResetSettings => Mantid/MantidPlot}/qt_settings_editor.py (100%) rename Code/{Tools/ResetSettings/reset_unix.sh => Mantid/MantidPlot/reset_settings_unix.sh} (100%) create mode 100755 Code/Mantid/MantidPlot/reset_settings_windows.bat diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt index 8a3b45f4a3d..4573acf7f5f 100644 --- a/Code/Mantid/MantidPlot/CMakeLists.txt +++ b/Code/Mantid/MantidPlot/CMakeLists.txt @@ -817,12 +817,26 @@ if ( APPLE ) set_source_files_properties(MANTID_RC_FILE PROPERTIES MACOSX_PACKAGE_LOCATION Resources) endif () +########################################################################### +# Config reset scripts +########################################################################### + +if( WIN32 ) + file( COPY + ${CMAKE_CURRENT_SOURCE_DIR}/reset_settings_windows.bat + DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ) +else () + file( COPY + ${CMAKE_CURRENT_SOURCE_DIR}/reset_settings_unix.sh + DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ) +endif () + ########################################################################### # Required Python config files ########################################################################### # Top-level python scripts -set( PY_FILES mantidplotrc.py mantidplot.py ) +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} diff --git a/Code/Tools/ResetSettings/qt_settings_editor.py b/Code/Mantid/MantidPlot/qt_settings_editor.py similarity index 100% rename from Code/Tools/ResetSettings/qt_settings_editor.py rename to Code/Mantid/MantidPlot/qt_settings_editor.py diff --git a/Code/Tools/ResetSettings/reset_unix.sh b/Code/Mantid/MantidPlot/reset_settings_unix.sh similarity index 100% rename from Code/Tools/ResetSettings/reset_unix.sh rename to Code/Mantid/MantidPlot/reset_settings_unix.sh diff --git a/Code/Mantid/MantidPlot/reset_settings_windows.bat b/Code/Mantid/MantidPlot/reset_settings_windows.bat new file mode 100755 index 00000000000..7c875f089ef --- /dev/null +++ b/Code/Mantid/MantidPlot/reset_settings_windows.bat @@ -0,0 +1,21 @@ +:: Copyright © 2007-2014 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory + +:: This file is part of Mantid. + +:: Mantid is free software; you can redistribute it and/or modify +:: it under the terms of the GNU General Public License as published by +:: the Free Software Foundation; either version 3 of the License, or +:: (at your option) any later version. + +:: Mantid is distributed in the hope that it will be useful, +:: but WITHOUT ANY WARRANTY; without even the implied warranty of +:: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +:: GNU General Public License for more details. + +:: You should have received a copy of the GNU General Public License +:: along with this program. If not, see <http://www.gnu.org/licenses/>. + +:: File change history is stored at: <https://github.com/mantidproject/mantid>. +:: Code Documentation is available at: <http://doxygen.mantidproject.org> + +::TODO -- GitLab