pshell/pshell-apps
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aditional Options

Browse Source
This commit is contained in:
gobbo_a
2025-08-14 16:28:25 +02:00
parent 78fcef565e
commit 7c8bed68f9
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+5 -2
View File
@@ -74,6 +74,7 @@ subprojects {
debug = (taskName == 'debug') debug = (taskName == 'debug')
executable = project.java_exec_jdk executable = project.java_exec_jdk
jvmArgs = project.run_jvargs jvmArgs = project.run_jvargs
environment 'PSHELL_EX_OPTIONS', project.exOptions
} }
} }
@@ -83,6 +84,7 @@ subprojects {
def app_description = project.ext.desc.toString() def app_description = project.ext.desc.toString()
def app_release = project.ext.release.toString() def app_release = project.ext.release.toString()
def jar_suffix = project.ext.jar_suffix.toString() def jar_suffix = project.ext.jar_suffix.toString()
def ex_options = project.exOptions
def package_name = project.name def package_name = project.name
def app_path = '/opt/' + package_name + "/" + app_version def app_path = '/opt/' + package_name + "/" + app_version
def jar_file_name = app_name + "-" + app_version + "-" + jar_suffix + ".jar"; def jar_file_name = app_name + "-" + app_version + "-" + jar_suffix + ".jar";
@@ -130,7 +132,7 @@ subprojects {
into app_path into app_path
from ('src/main/java') { from ('src/main/java') {
print(java_file_name ) //print(java_file_name )
include java_file_name include java_file_name
into 'lib' into 'lib'
fileMode 0644 fileMode 0644
@@ -146,7 +148,8 @@ subprojects {
"app_name": app_name, "app_name": app_name,
"app_version": app_version, "app_version": app_version,
"jar_file": jar_file_path, "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 fileMode 0755
} }
screenpanel-sls/build.gradle
+2 -1
View File
@@ -1,7 +1,8 @@
description = 'screenpanel-sls' description = 'screenpanel-sls'
ext.mainClass = hasProperty('mainClass') ? mainClass : 'ScreenPanelSLS' ext.mainClass = hasProperty('mainClass') ? mainClass : 'ch.psi.pshell.workbench.App' //ScreenPanelSLS'
ext.title = 'ScreenPanel' ext.title = 'ScreenPanel'
ext.desc = 'ScreenPanel customization for SLS cameras' ext.desc = 'ScreenPanel customization for SLS cameras'
ext.exOptions = 'ch.psi.pshell.screenpanel.Options'
dependencies { dependencies {
implementation 'ch.psi:workbench:' + version implementation 'ch.psi:workbench:' + version
screenpanel-sls/scripts/app_startup
+2 -2
View File
@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
export PSHELL_EX_OPTIONS=${ex_options}
APP_ARGS_NAME=\$(echo "APP_${app_name}" | tr '[:lower:]' '[:upper:]')_ARGS APP_ARGS_NAME=\$(echo "APP_${app_name}" | tr '[:lower:]' '[:upper:]')_ARGS
APP_ARGS_NAME=\${APP_ARGS_NAME//-/_} APP_ARGS_NAME=\${APP_ARGS_NAME//-/_}
# Run the JAR with all passed arguments # 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 -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} "\$@"