From 7c8bed68f914cbfa31b14626bfccd7bc4573afff Mon Sep 17 00:00:00 2001
From: gobbo_a <alexandre.gobbo@psi.ch>
Date: Thu, 14 Aug 2025 16:28:25 +0200
Subject: [PATCH] Aditional Options

---
 build.gradle                        | 7 +++++--
 screenpanel-sls/build.gradle        | 3 ++-
 screenpanel-sls/scripts/app_startup | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 316d0d5..ac7cef7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,6 +74,7 @@ subprojects {
                 debug = (taskName == 'debug')
                 executable = project.java_exec_jdk
                 jvmArgs = project.run_jvargs
+                environment 'PSHELL_EX_OPTIONS', project.exOptions
             }
         }           
     
@@ -83,6 +84,7 @@ subprojects {
         def app_description = project.ext.desc.toString()
         def app_release = project.ext.release.toString()
         def jar_suffix = project.ext.jar_suffix.toString()
+        def ex_options = project.exOptions
         def package_name = project.name   
         def app_path = '/opt/' + package_name + "/" + app_version
         def jar_file_name = app_name + "-" + app_version + "-" + jar_suffix + ".jar";
@@ -130,7 +132,7 @@ subprojects {
             into app_path  
 
             from ('src/main/java') {
-                print(java_file_name )
+                //print(java_file_name )
                 include java_file_name 
                 into 'lib'
                 fileMode 0644
@@ -146,7 +148,8 @@ subprojects {
                     "app_name": app_name,
                     "app_version": app_version,
                     "jar_file": jar_file_path,
-                    "java_file": app_path + '/lib/' + main_class + ".java"
+                    "java_file": app_path + '/lib/' + main_class + ".java",
+                    "ex_options" :ex_options
                 ])
                 fileMode 0755
             }
diff --git a/screenpanel-sls/build.gradle b/screenpanel-sls/build.gradle
index 7dbd480..66f976f 100644
--- a/screenpanel-sls/build.gradle
+++ b/screenpanel-sls/build.gradle
@@ -1,7 +1,8 @@
 description = 'screenpanel-sls'
-ext.mainClass = hasProperty('mainClass') ? mainClass : 'ScreenPanelSLS'
+ext.mainClass = hasProperty('mainClass') ? mainClass : 'ch.psi.pshell.workbench.App' //ScreenPanelSLS'
 ext.title = 'ScreenPanel'
 ext.desc = 'ScreenPanel customization for SLS cameras'
+ext.exOptions = 'ch.psi.pshell.screenpanel.Options'
 
 dependencies {
     implementation 'ch.psi:workbench:' + version          
diff --git a/screenpanel-sls/scripts/app_startup b/screenpanel-sls/scripts/app_startup
index 1d776ce..0bbdf06 100644
--- a/screenpanel-sls/scripts/app_startup
+++ b/screenpanel-sls/scripts/app_startup
@@ -1,7 +1,7 @@
 #!/bin/sh
+export PSHELL_EX_OPTIONS=${ex_options} 
 APP_ARGS_NAME=\$(echo "APP_${app_name}" | tr '[:lower:]' '[:upper:]')_ARGS
 APP_ARGS_NAME=\${APP_ARGS_NAME//-/_}
 
 # Run the JAR with all passed arguments
-#exec pshell-workbench -b -d -l -k -n -q -console_log=SEVERE -buffer_size=10 -size=1000x800 -p ${java_file} \${!APP_ARGS_NAME} "\$@"
-exec pshell-workbench -b -d -l -k -n -q -console_log=SEVERE -size=1000x800 -p ${java_file} \${!APP_ARGS_NAME} "\$@"
+exec pshell-workbench -b -d -l -k -n -q -console_log=SEVERE -buffer_size=10 -size=1000x800 -p ${java_file} \${!APP_ARGS_NAME} "\$@"