Skip to content
Snippets Groups Projects
Unverified Commit 1bb9b709 authored by Martyn Gigg's avatar Martyn Gigg Committed by GitHub
Browse files

Merge pull request #22272 from mantidproject/compression_formats

Force higher compression xz format
parents ae520fb3 6d2f890b
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@
string ( TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME )
# define the source generators
set ( CPACK_SOURCE_GENERATOR TGZ )
set ( CPACK_SOURCE_GENERATOR "TGZ;TXZ" )
set ( CPACK_SOURCE_IGNORE_FILES "/\\\\.git*")
if (CMAKE_BINARY_DIR MATCHES "^${CMAKE_SOURCE_DIR}/.+")
# In-source build add the binary directory to files to ignore for the tarball
......@@ -21,6 +21,7 @@ if ( "${UNIX_DIST}" MATCHES "Ubuntu" )
find_program (DPKG_CMD dpkg)
if ( DPKG_CMD )
set ( CPACK_GENERATOR "DEB" )
set ( CPACK_DEBIAN_COMPRESSION_TYPE "xz" )
execute_process( COMMAND ${DPKG_CMD} --print-architecture
OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
OUTPUT_STRIP_TRAILING_WHITESPACE )
......@@ -38,6 +39,7 @@ if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" OR "${UNIX_DIST}" MATCHES "Fedora
set ( CPACK_GENERATOR "RPM" )
set ( CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}" )
set ( CPACK_RPM_PACKAGE_URL "http://www.mantidproject.org" )
set ( CPACK_RPM_COMPRESSION_TYPE "xz" )
# determine the distribution number
if(NOT CPACK_RPM_DIST)
......
......@@ -79,6 +79,7 @@ New
Improved
########
- DEB and RPM package sizes reduced by 17% and 6% respectively.
- :class:`mantid.kernel.FloatTimeSeriesProperty` now returns :class:`numpy.datetime64` for the log times.
- The duration reported by a running algorithm now includes time spent for validation of properties and inputs. This fixes a discrepancy between observed and reported timings if validation is expensive, e.g., when checking if a file exists. More detailed timing information is now available when setting the log level to ``debug``.
- The status of a fit in the fit window is now at the top of the of the dialog instead of the bottom.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment