Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into bugfix/8492_fix_unreleased_poco_xml_object…
…s_sinqhmlistener Conflicts: Code/Mantid/Framework/SINQ/src/SINQHMListener.cpp Merging master after the clang reformatting, there were no real conflicts
- Loading branch information
Showing
3,322 changed files
with
622,999 additions
and
495,799 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| ########################################################################### | ||
| # Define scripts for the Linux packages | ||
| # | ||
| # It provides: | ||
| # - launch_mantidplot.sh | ||
| # | ||
| ########################################################################### | ||
|
|
||
| ########################################################################### | ||
| # Set installation variables | ||
| ########################################################################### | ||
| set ( BIN_DIR bin ) | ||
| set ( ETC_DIR etc ) | ||
| set ( LIB_DIR lib ) | ||
| set ( PLUGINS_DIR plugins ) | ||
| set ( PVPLUGINS_DIR pvplugins ) | ||
| set ( PVPLUGINS_SUBDIR pvplugins ) # Need to tidy these things up! | ||
|
|
||
| if ( CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT ) | ||
| set ( CMAKE_INSTALL_PREFIX /opt/Mantid CACHE PATH "Install path" FORCE ) | ||
| endif() | ||
|
|
||
| set ( CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${LIB_DIR};${CMAKE_INSTALL_PREFIX}/${PLUGINS_DIR};${CMAKE_INSTALL_PREFIX}/${PVPLUGINS_DIR} ) | ||
|
|
||
| ########################################################################### | ||
| # LD_PRELOAD libraries | ||
| ########################################################################### | ||
| set ( EXTRA_LDPRELOAD_LIBS "${TCMALLOC_LIBRARIES}" ) | ||
|
|
||
| ########################################################################### | ||
| # Environment scripts (profile.d) | ||
| ########################################################################### | ||
| # default shell (bash-like) | ||
| file ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/mantid.sh | ||
| "#!/bin/sh\n" | ||
| "MANTIDPATH=${CMAKE_INSTALL_PREFIX}/${BIN_DIR}\n" | ||
| "PV_PLUGIN_PATH=${CMAKE_INSTALL_PREFIX}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR}\n" | ||
| "PATH=$PATH:$MANTIDPATH\n" | ||
| "PYTHONPATH=$MANTIDPATH:$PYTHONPATH\n" | ||
|
|
||
| "export MANTIDPATH PV_PLUGIN_PATH PATH PYTHONPATH\n" | ||
| ) | ||
|
|
||
| # c-shell | ||
| file ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/mantid.csh | ||
| "#!/bin/csh\n" | ||
| "setenv MANTIDPATH \"${CMAKE_INSTALL_PREFIX}/${BIN_DIR}\"\n" | ||
| "setenv PV_PLUGIN_PATH \"${CMAKE_INSTALL_PREFIX}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR}\"\n" | ||
| "setenv PATH \"\${PATH}:\${MANTIDPATH}\"\n" | ||
|
|
||
| "if ($?PYTHONPATH) then\n" | ||
| " setenv PYTHONPATH \"\${MANTIDPATH}:\${PYTHONPATH}\"\n" | ||
| "else\n" | ||
| " setenv PYTHONPATH \"\${MANTIDPATH}\"\n" | ||
| "endif\n" | ||
| ) | ||
|
|
||
| install ( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mantid.sh | ||
| ${CMAKE_CURRENT_BINARY_DIR}/mantid.csh | ||
| DESTINATION ${ETC_DIR} | ||
| ) | ||
|
|
||
| ############################################################################ | ||
| # Setup file variables for pre/post installation | ||
| # These are very different depending on the distribution so are contained | ||
| # in the Packaging/*/scripts directory as CMake templates | ||
| ############################################################################ | ||
| if ( NOT MPI_BUILD ) | ||
| set ( ENVVARS_ON_INSTALL ON CACHE BOOL | ||
| "Whether to include the scripts in /etc/profile.d to set the MANTIDPATH variable and add it to PATH. Turning this off allows installing locally without being root." ) | ||
| endif() | ||
| # for shell maintainer scripts as ENVVARS_ON_INSTALL could have ON, OFF, True, False etc | ||
| if ( ENVVARS_ON_INSTALL ) | ||
| set ( ENVVARS_ON_INSTALL_INT 1 ) | ||
| else () | ||
| set ( ENVVARS_ON_INSTALL_INT 0 ) | ||
| endif() | ||
|
|
||
| # Common filenames to hold maintainer scripts | ||
| set ( PRE_INSTALL_FILE ${CMAKE_CURRENT_BINARY_DIR}/preinst ) | ||
| set ( POST_INSTALL_FILE ${CMAKE_CURRENT_BINARY_DIR}/postinst ) | ||
| set ( PRE_UNINSTALL_FILE ${CMAKE_CURRENT_BINARY_DIR}/prerm ) | ||
| set ( POST_UNINSTALL_FILE ${CMAKE_CURRENT_BINARY_DIR}/postrm ) | ||
|
|
||
| if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" OR "${UNIX_DIST}" MATCHES "^Fedora" ) # RHEL/Fedora | ||
| if ( "${UNIX_CODENAME}" MATCHES "Santiago" ) # el6 | ||
| set ( WRAPPER_COMMAND "scl enable mantidlibs" ) | ||
| set ( EXTRA_LDPATH "/usr/lib64/paraview" ) | ||
| else() | ||
| set ( WRAPPER_COMMAND "eval" ) | ||
| endif() | ||
|
|
||
| if ( NOT MPI_BUILD ) | ||
| configure_file ( ${CMAKE_MODULE_PATH}/Packaging/rpm/scripts/rpm_pre_install.sh.in | ||
| ${PRE_INSTALL_FILE} @ONLY ) | ||
| configure_file ( ${CMAKE_MODULE_PATH}/Packaging/rpm/scripts/rpm_post_install.sh.in | ||
| ${POST_INSTALL_FILE} @ONLY ) | ||
| configure_file ( ${CMAKE_MODULE_PATH}/Packaging/rpm/scripts/rpm_pre_uninstall.sh.in | ||
| ${PRE_UNINSTALL_FILE} @ONLY ) | ||
| configure_file ( ${CMAKE_MODULE_PATH}/Packaging/rpm/scripts/rpm_post_uninstall.sh.in | ||
| ${POST_UNINSTALL_FILE} @ONLY ) | ||
| # CPack variables | ||
| set ( CPACK_RPM_PRE_INSTALL_SCRIPT_FILE ${PRE_INSTALL_FILE} ) | ||
| set ( CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${POST_INSTALL_FILE} ) | ||
| set ( CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${PRE_UNINSTALL_FILE} ) | ||
| set ( CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${POST_UNINSTALL_FILE} ) | ||
| endif() | ||
| elseif ( "${UNIX_DIST}" MATCHES "Ubuntu" ) | ||
| set ( WRAPPER_COMMAND "eval" ) | ||
|
|
||
| if ( NOT MPI_BUILD ) | ||
| configure_file ( ${CMAKE_MODULE_PATH}/Packaging/deb/scripts/deb_pre_inst.in | ||
| ${PRE_INSTALL_FILE} @ONLY ) | ||
| configure_file ( ${CMAKE_MODULE_PATH}/Packaging/deb/scripts/deb_post_inst.in | ||
| ${POST_INSTALL_FILE} @ONLY ) | ||
| configure_file ( ${CMAKE_MODULE_PATH}/Packaging/deb/scripts/deb_pre_rm.in | ||
| ${PRE_UNINSTALL_FILE} @ONLY ) | ||
| # No postrm script as dpkg removes empty directories if everything else is tidied away. | ||
|
|
||
| # CPack variables | ||
| set ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA | ||
| "${PRE_INSTALL_FILE};${POST_INSTALL_FILE};${PRE_UNINSTALL_FILE}" ) | ||
| endif() | ||
| endif() | ||
|
|
||
| ############################################################################ | ||
| # MantidPlot launcher script | ||
| ############################################################################ | ||
| # Local dev version | ||
| set ( MANTIDPLOT_EXEC MantidPlot ) | ||
| configure_file ( ${CMAKE_MODULE_PATH}/Packaging/launch_mantidplot.sh.in | ||
| ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/launch_mantidplot.sh @ONLY ) | ||
| # Needs to be executable | ||
| execute_process ( COMMAND "chmod" "+x" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/launch_mantidplot.sh" | ||
| OUTPUT_QUIET ERROR_QUIET ) | ||
| # Package version | ||
| set ( MANTIDPLOT_EXEC MantidPlot_exe ) | ||
| configure_file ( ${CMAKE_MODULE_PATH}/Packaging/launch_mantidplot.sh.in | ||
| ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh.install @ONLY ) | ||
| install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh.install | ||
| DESTINATION ${BIN_DIR} RENAME launch_mantidplot.sh | ||
| PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ | ||
| GROUP_EXECUTE GROUP_READ | ||
| WORLD_EXECUTE WORLD_READ | ||
| ) |
Oops, something went wrong.