mx/Jungfraujoch
2
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 54 Wiki Activity

Minor enhancements to make the plugin nice (print more information, add library version, upload RHEL8 compiled version to the repository)

Browse Source
This commit is contained in:
leonarski_f
2026-04-04 21:47:20 +02:00
parent c5605f5b0b
commit f8ef814ee3
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/build_and_test.yml
+1 -1
View File
@@ -110,7 +110,7 @@ jobs:
cd ..
if [ "${{ matrix.distro }}" = "rocky8_nocuda" ]; then
for file in build/jfjoch-viewer*.rpm build/jfjoch-writer*rpm; do
for file in build/jfjoch-viewer*.rpm build/jfjoch-writer*rpm build/xds-plugin/libjfjoch_xds_plugin.so.*; do
python3 gitea_upload_file.py "$file"
done
elif [ "${{ matrix.distro }}" = "rocky9_nocuda" ]; then
common/print_license.h
+1 -1
View File
@@ -7,7 +7,7 @@
#include <iostream>
inline void print_license(const std::string &component_name) {
std::cout << component_name << " Copyright (C) 2024 Paul Scherrer Institute" << std::endl;
std::cout << component_name << " Copyright (C) 2019-2026 Paul Scherrer Institute" << std::endl;
std::cout << "This program comes with ABSOLUTELY NO WARRANTY" << std::endl;
std::cout << "This is free software, and you are welcome to redistribute it" << std::endl;
std::cout << "under certain conditions (GPLv3)" << std::endl;
xds-plugin/CMakeLists.txt
+1
View File
@@ -11,6 +11,7 @@ set_target_properties(jfjoch_xds_plugin PROPERTIES
CXX_VISIBILITY_PRESET hidden
C_VISIBILITY_PRESET hidden
VISIBILITY_INLINES_HIDDEN YES
VERSION 1.0.0
)
if(UNIX AND NOT APPLE)
xds-plugin/plugin.cpp
+9 -2
View File
@@ -169,8 +169,15 @@ extern "C" {
void plugin_open(const char *filename, int info[1024], int *error_flag) {
std::unique_lock sl(plugin_mutex);
std::cout << "Jungfraujoch XDS plugin" << std::endl;
std::cout << "Version " << jfjoch_version() << std::endl;
std::cout << "********** Jungfraujoch XDS plugin **********" << std::endl;
std::cout << "Jungfraujoch version " << jfjoch_version() << std::endl;
std::cout << "Plugin version " << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_PATCH << std::endl << std::endl;
std::cout << "Copyright (C) 2024-2026 Paul Scherrer Institute" << std::endl;
std::cout << "This program comes with ABSOLUTELY NO WARRANTY" << std::endl;
std::cout << "This is free software, and you are welcome to redistribute it" << std::endl;
std::cout << "under certain conditions (GPLv3)" << std::endl << std::endl;
std::cout << "Based on durin plugin from Diamond Light Source Ltd. with modification from the Global Phasing Ltd." << std::endl;
std::cout << "(BSD-3 license)" << std::endl << std::endl;
try {
FillInfoArray(info);
xds-plugin/plugin.h
+1 -1
View File
@@ -26,7 +26,7 @@
extern "C" {
#endif
#define VERSION_MAJOR 0
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_PATCH 0
#define VERSION_TIMESTAMP -1 /* good enough for Dectris apparantely */