diff --git a/.gitignore b/.gitignore index e627f185f..2214ff6b0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ bin/ *.o *.so .* -build +build/ RELEASE.txt Testing/ diff --git a/psi-pmodules/DetectorSoftware/slsDetectorPackage/build b/psi-pmodules/DetectorSoftware/slsDetectorPackage/build new file mode 100755 index 000000000..3657b1f60 --- /dev/null +++ b/psi-pmodules/DetectorSoftware/slsDetectorPackage/build @@ -0,0 +1,17 @@ +#!/usr/bin/env modbuild + +pbuild::set_download_url "https://github.com/slsdetectorgroup/$P/archive/refs/tags/${V_PKG}.tar.gz" + +pbuild::add_to_group 'DetectorSoftware' +pbuild::add_configure_args '-DSLS_USE_SIMULATOR=ON' +pbuild::add_configure_args '-DSLS_USE_GUI=ON' + +if (( V_MAJOR < 7 )); then + pbuild::add_patch 'files/fname-fix.patch' +fi + +# Local Variables: +# mode: sh +# sh-basic-offset: 8 +# tab-width: 8 +# End: diff --git a/psi-pmodules/DetectorSoftware/slsDetectorPackage/files/fname-fix.patch b/psi-pmodules/DetectorSoftware/slsDetectorPackage/files/fname-fix.patch new file mode 100644 index 000000000..f773eb937 --- /dev/null +++ b/psi-pmodules/DetectorSoftware/slsDetectorPackage/files/fname-fix.patch @@ -0,0 +1,13 @@ +diff --git a/slsSupportLib/CMakeLists.txt b/slsSupportLib/CMakeLists.txt +index efa8010..e842b3d 100755 +--- a/slsSupportLib/CMakeLists.txt ++++ b/slsSupportLib/CMakeLists.txt +@@ -46,7 +46,7 @@ if(SLS_DEVEL_HEADERS) + include/sls/versionAPI.h + include/sls/ZmqSocket.h + include/sls/bit_utils.h +- include/sls/mdf5.h ++ include/sls/md5.h + include/sls/md5_helper.h + ) + endif() diff --git a/psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants b/psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants new file mode 100644 index 000000000..e339cf8dc --- /dev/null +++ b/psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants @@ -0,0 +1,3 @@ +slsDetectorPackage/6.1.1 stable cmake/3.15.5 zeromq/4.3.4 +slsDetectorPackage/7.0.1_rh7 stable cmake/3.15.5 zeromq/4.3.4 Qt/5.12.10 +slsDetectorPackage/7.0.1_rh8 stable cmake/3.15.5 zeromq/4.3.4 Qt/5.12.10 diff --git a/psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants.yaml b/psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants.yaml new file mode 100644 index 000000000..8725ca71b --- /dev/null +++ b/psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants.yaml @@ -0,0 +1,3 @@ +slsDetectorPackage/6.1.1: + - relstage: unstable + build_requires: cmake/3.15.5 zeromq/4.3.4 diff --git a/psi-pmodules/DetectorSoftware/slsDetectorPackage/modulefile b/psi-pmodules/DetectorSoftware/slsDetectorPackage/modulefile new file mode 100644 index 000000000..0008cc87a --- /dev/null +++ b/psi-pmodules/DetectorSoftware/slsDetectorPackage/modulefile @@ -0,0 +1,9 @@ +#%Module1.0 + +module-whatis "SLS detector package" +module-url "https://www.psi.ch/en/lxn/software-releases" +module-license "GNU LGPL 3.0" +module-maintainer "Lars Erik Froejdh " + +module-help " +"