From 0c0e9dfb3ae65f4299392fb08bb1e3abe784493a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Mora?= <ealrann@gmail.com>
Date: Tue, 14 Jul 2020 17:59:43 +0200
Subject: [PATCH] Fix launch scripts

---
 org.sheepy.vsand/build.gradle                                 | 2 +-
 org.sheepy.vsand/releng/linux/VSand                           | 4 +++-
 org.sheepy.vsand/releng/linux/benchmark/VSand_Benchmark.sh    | 3 ++-
 .../releng/linux/benchmark/VSand_Benchmark_Headless.sh        | 3 ++-
 org.sheepy.vsand/releng/windows/VSand.bat                     | 3 ++-
 org.sheepy.vsand/releng/windows/benchmark/VSand_Benchmark.bat | 3 ++-
 .../releng/windows/benchmark/VSand_Benchmark_Headless.bat     | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/org.sheepy.vsand/build.gradle b/org.sheepy.vsand/build.gradle
index 2b54c4f5..d6001cfe 100644
--- a/org.sheepy.vsand/build.gradle
+++ b/org.sheepy.vsand/build.gradle
@@ -27,7 +27,7 @@ task jlink(type: Exec, dependsOn: ['installDist']) {
 		'--no-man-pages',
 		'--exclude-files', '**java_*.properties',
 		'--compress', '2',
-		'--add-modules', "java.base,java.xml,jdk.unsupported,openj9.sharedclasses",
+		'--add-modules', "java.base,java.xml,jdk.unsupported",
 		'--output', 'image'
 }
 
diff --git a/org.sheepy.vsand/releng/linux/VSand b/org.sheepy.vsand/releng/linux/VSand
index f10b6420..ea37eb42 100755
--- a/org.sheepy.vsand/releng/linux/VSand
+++ b/org.sheepy.vsand/releng/linux/VSand
@@ -1,3 +1,5 @@
 #!/bin/sh
 DIR=${0%/*}/bin
-(cd $DIR && ./java -Xms32M -Xmx64M -p ../modules -Xscmx32M -Xshareclasses:cacheDir=sharedClasses,name=VSand,nonfatal -m org.sheepy.vsand/org.sheepy.vsand.VSandApplicationLauncher  $@)
+ARGS="-Xms32M -Xmx64M --enable-preview"
+#ARGS="-Xms32M -Xmx64M -Xscmx32M -Xshareclasses:cacheDir=sharedClasses,name=VSand,nonfatal" #OpenJ9
+(cd $DIR && ./java $ARGS -p ../modules -m org.sheepy.vsand/org.sheepy.vsand.VSandApplicationLauncher $@)
diff --git a/org.sheepy.vsand/releng/linux/benchmark/VSand_Benchmark.sh b/org.sheepy.vsand/releng/linux/benchmark/VSand_Benchmark.sh
index 57a97302..eda68b8f 100755
--- a/org.sheepy.vsand/releng/linux/benchmark/VSand_Benchmark.sh
+++ b/org.sheepy.vsand/releng/linux/benchmark/VSand_Benchmark.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 DIR=${0%/*}/../bin
-(cd $DIR && ./java -Xms64M -Xmx128M -p ../modules -m org.sheepy.vsand/org.sheepy.vsand.VSandBenchmarkLauncher  $@)
+ARGS="-Xms64M -Xmx128M --enable-preview"
+(cd $DIR && ./java $ARGS -p ../modules -m org.sheepy.vsand/org.sheepy.vsand.VSandBenchmarkLauncher  $@)
diff --git a/org.sheepy.vsand/releng/linux/benchmark/VSand_Benchmark_Headless.sh b/org.sheepy.vsand/releng/linux/benchmark/VSand_Benchmark_Headless.sh
index 0b1f1808..96c4455d 100755
--- a/org.sheepy.vsand/releng/linux/benchmark/VSand_Benchmark_Headless.sh
+++ b/org.sheepy.vsand/releng/linux/benchmark/VSand_Benchmark_Headless.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 DIR=${0%/*}/../bin
-(cd $DIR && ./java -Xms64M -Xmx128M -p ../modules -m org.sheepy.vsand/org.sheepy.vsand.VSandHeadlessBenchmarkLauncher  $@)
+ARGS="-Xms64M -Xmx128M --enable-preview"
+(cd $DIR && ./java $ARGS -p ../modules -m org.sheepy.vsand/org.sheepy.vsand.VSandHeadlessBenchmarkLauncher $@)
diff --git a/org.sheepy.vsand/releng/windows/VSand.bat b/org.sheepy.vsand/releng/windows/VSand.bat
index a5a99adf..eaa1759d 100644
--- a/org.sheepy.vsand/releng/windows/VSand.bat
+++ b/org.sheepy.vsand/releng/windows/VSand.bat
@@ -1,4 +1,5 @@
 @echo off
 set DIR="%~dp0\bin"
 set JAVA_EXEC="%DIR:"=%\java"
-pushd %DIR% & %JAVA_EXEC% -Xms32M -Xmx64M -p ..\modules -Xscmx32M -Xshareclasses:cacheDir=sharedClasses,name=VSand,nonfatal -m org.sheepy.vsand/org.sheepy.vsand.VSandApplicationLauncher  %* & popd
+set ARGS="-Xms32M -Xmx64M --enable-preview"
+pushd %DIR% & %JAVA_EXEC% %ARGS% -p ..\modules -m org.sheepy.vsand/org.sheepy.vsand.VSandApplicationLauncher  %* & popd
diff --git a/org.sheepy.vsand/releng/windows/benchmark/VSand_Benchmark.bat b/org.sheepy.vsand/releng/windows/benchmark/VSand_Benchmark.bat
index 243dcbde..60f4c860 100644
--- a/org.sheepy.vsand/releng/windows/benchmark/VSand_Benchmark.bat
+++ b/org.sheepy.vsand/releng/windows/benchmark/VSand_Benchmark.bat
@@ -1,5 +1,6 @@
 @echo off
 set DIR="%~dp0\..\bin"
 set JAVA_EXEC="%DIR:"=%\java"
-pushd %DIR% & %JAVA_EXEC% -Xms64M -Xmx128M -p ..\modules -m org.sheepy.vsand/org.sheepy.vsand.VSandBenchmarkLauncher  %* & popd
+set ARGS="-Xms64M -Xmx128M --enable-preview"
+pushd %DIR% & %JAVA_EXEC% %ARGS% -p ..\modules -m org.sheepy.vsand/org.sheepy.vsand.VSandBenchmarkLauncher  %* & popd
 pause
diff --git a/org.sheepy.vsand/releng/windows/benchmark/VSand_Benchmark_Headless.bat b/org.sheepy.vsand/releng/windows/benchmark/VSand_Benchmark_Headless.bat
index cdc32064..b035ba24 100644
--- a/org.sheepy.vsand/releng/windows/benchmark/VSand_Benchmark_Headless.bat
+++ b/org.sheepy.vsand/releng/windows/benchmark/VSand_Benchmark_Headless.bat
@@ -1,5 +1,6 @@
 @echo off
 set DIR="%~dp0\..\bin"
 set JAVA_EXEC="%DIR:"=%\java"
-pushd %DIR% & %JAVA_EXEC% -Xms64M -Xmx128M -p ..\modules -m org.sheepy.vsand/org.sheepy.vsand.VSandHeadlessBenchmarkLauncher  %* & popd
+set ARGS="-Xms64M -Xmx128M --enable-preview"
+pushd %DIR% & %JAVA_EXEC% %ARGS% -p ..\modules -m org.sheepy.vsand/org.sheepy.vsand.VSandHeadlessBenchmarkLauncher  %* & popd
 pause