From ad8693db1292d77f980ae5bef00f4006045fa86c Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Sat, 11 Apr 2020 16:03:13 +0200
Subject: [PATCH] Slightly modified scripts for Windows & Linux. New script for
macOs
---
buildConfig/RegionChooser.bat | 1 +
buildConfig/RegionChooser.command | 2 ++
buildConfig/RegionChooser.sh | 2 ++
buildConfig/assemblyDesc.xml | 10 ++++++----
buildConfig/start.bat | 1 -
buildConfig/start.sh | 2 --
6 files changed, 11 insertions(+), 7 deletions(-)
create mode 100644 buildConfig/RegionChooser.bat
create mode 100755 buildConfig/RegionChooser.command
create mode 100644 buildConfig/RegionChooser.sh
delete mode 100644 buildConfig/start.bat
delete mode 100644 buildConfig/start.sh
diff --git a/buildConfig/RegionChooser.bat b/buildConfig/RegionChooser.bat
new file mode 100644
index 0000000..f28ebee
--- /dev/null
+++ b/buildConfig/RegionChooser.bat
@@ -0,0 +1 @@
+java -classpath lib/* -Xms512m -Xmx2g -Djava.util.logging.config.file=logging.properties eu.simstadt.regionchooser.RegionChooserFX
\ No newline at end of file
diff --git a/buildConfig/RegionChooser.command b/buildConfig/RegionChooser.command
new file mode 100755
index 0000000..a4e92bb
--- /dev/null
+++ b/buildConfig/RegionChooser.command
@@ -0,0 +1,2 @@
+cd "$(dirname "$0")" # set the current working directory to the directory this script is in
+java -classpath lib/* -Xms512m -Xmx2g -Djava.util.logging.config.file=logging.properties eu.simstadt.regionchooser.RegionChooserFX
\ No newline at end of file
diff --git a/buildConfig/RegionChooser.sh b/buildConfig/RegionChooser.sh
new file mode 100644
index 0000000..2696b38
--- /dev/null
+++ b/buildConfig/RegionChooser.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+java -classpath 'lib/*' -Xms512m -Xmx2g -Djava.util.logging.config.file=logging.properties eu.simstadt.regionchooser.RegionChooserFX
\ No newline at end of file
diff --git a/buildConfig/assemblyDesc.xml b/buildConfig/assemblyDesc.xml
index c628176..525c30d 100644
--- a/buildConfig/assemblyDesc.xml
+++ b/buildConfig/assemblyDesc.xml
@@ -12,9 +12,11 @@
<outputDirectory></outputDirectory>
<filtered>true</filtered>
<includes>
- <include>start.bat</include>
- <include>start.sh</include>
+ <include>RegionChooser.bat</include>
+ <include>RegionChooser.command</include>
+ <include>RegionChooser.sh</include>
</includes>
+ <fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>${project.basedir}</directory>
@@ -27,14 +29,14 @@
</fileSet>
<fileSet>
<directory>${project.build.directory}</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>./lib</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/libs</directory>
- <outputDirectory>./libs</outputDirectory>
+ <outputDirectory>./lib</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
diff --git a/buildConfig/start.bat b/buildConfig/start.bat
deleted file mode 100644
index f3b813d..0000000
--- a/buildConfig/start.bat
+++ /dev/null
@@ -1 +0,0 @@
-java -jar ${project.artifactId}-${project.version}.jar
\ No newline at end of file
diff --git a/buildConfig/start.sh b/buildConfig/start.sh
deleted file mode 100644
index 6d5986c..0000000
--- a/buildConfig/start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-java -jar ${project.artifactId}-${project.version}.jar
\ No newline at end of file
--
GitLab