* Add pmodules build files for PSI

* Modified gitignore to accept build-file

* Fix error of not building virtual servers

* make everything stable
This commit is contained in:
brueckner_m 2023-07-14 16:11:14 +02:00 committed by GitHub
parent d74661a375
commit a56be25500
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 46 additions and 1 deletions

2
.gitignore vendored
View File

@ -9,7 +9,7 @@ bin/
*.o
*.so
.*
build
build/
RELEASE.txt
Testing/

View File

@ -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:

View File

@ -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()

View File

@ -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

View File

@ -0,0 +1,3 @@
slsDetectorPackage/6.1.1:
- relstage: unstable
build_requires: cmake/3.15.5 zeromq/4.3.4

View File

@ -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 <erik.froejdh@psi.ch>"
module-help "
"