From f3e8a2a6da84fa0a372e46bb7e8d5a6b696bec24 Mon Sep 17 00:00:00 2001
From: Eric Timmons <etimmons@mit.edu>
Date: Tue, 1 Dec 2020 21:44:34 -0500
Subject: [PATCH] Add upstream's recommended java options

---
 1.7.1/buster/jdk-11/abcl-wrapper                         | 6 +++++-
 1.7.1/buster/jdk-11/slim/abcl-wrapper                    | 6 +++++-
 1.7.1/buster/jdk-15/abcl-wrapper                         | 6 +++++-
 1.7.1/buster/jdk-15/slim/abcl-wrapper                    | 6 +++++-
 1.7.1/buster/jdk-8/abcl-wrapper                          | 6 +++++-
 1.7.1/buster/jdk-8/slim/abcl-wrapper                     | 6 +++++-
 1.7.1/windowsservercore-1809/jdk-11/abcl-wrapper.bat     | 2 +-
 1.7.1/windowsservercore-1809/jdk-15/abcl-wrapper.bat     | 2 +-
 1.7.1/windowsservercore-1809/jdk-8/abcl-wrapper.bat      | 2 +-
 1.7.1/windowsservercore-ltsc2016/jdk-11/abcl-wrapper.bat | 2 +-
 1.7.1/windowsservercore-ltsc2016/jdk-15/abcl-wrapper.bat | 2 +-
 1.7.1/windowsservercore-ltsc2016/jdk-8/abcl-wrapper.bat  | 2 +-
 1.8.0/buster/jdk-11/abcl-wrapper                         | 6 +++++-
 1.8.0/buster/jdk-11/slim/abcl-wrapper                    | 6 +++++-
 1.8.0/buster/jdk-15/abcl-wrapper                         | 6 +++++-
 1.8.0/buster/jdk-15/slim/abcl-wrapper                    | 6 +++++-
 1.8.0/buster/jdk-8/abcl-wrapper                          | 6 +++++-
 1.8.0/buster/jdk-8/slim/abcl-wrapper                     | 6 +++++-
 1.8.0/windowsservercore-1809/jdk-11/abcl-wrapper.bat     | 2 +-
 1.8.0/windowsservercore-1809/jdk-15/abcl-wrapper.bat     | 2 +-
 1.8.0/windowsservercore-1809/jdk-8/abcl-wrapper.bat      | 2 +-
 1.8.0/windowsservercore-ltsc2016/jdk-11/abcl-wrapper.bat | 2 +-
 1.8.0/windowsservercore-ltsc2016/jdk-15/abcl-wrapper.bat | 2 +-
 1.8.0/windowsservercore-ltsc2016/jdk-8/abcl-wrapper.bat  | 2 +-
 abcl-wrapper                                             | 3 ---
 abcl-wrapper-jdk11                                       | 7 +++++++
 abcl-wrapper-jdk11.bat                                   | 2 ++
 abcl-wrapper-jdk15                                       | 7 +++++++
 abcl-wrapper-jdk15.bat                                   | 2 ++
 abcl-wrapper-jdk8                                        | 7 +++++++
 abcl-wrapper-jdk8.bat                                    | 2 ++
 abcl-wrapper.bat                                         | 2 --
 nightly/buster/jdk-11/abcl-wrapper                       | 6 +++++-
 nightly/buster/jdk-11/slim/abcl-wrapper                  | 6 +++++-
 nightly/buster/jdk-15/abcl-wrapper                       | 6 +++++-
 nightly/buster/jdk-15/slim/abcl-wrapper                  | 6 +++++-
 nightly/buster/jdk-8/abcl-wrapper                        | 6 +++++-
 nightly/buster/jdk-8/slim/abcl-wrapper                   | 6 +++++-
 update.sh                                                | 4 ++--
 39 files changed, 131 insertions(+), 37 deletions(-)
 delete mode 100755 abcl-wrapper
 create mode 100755 abcl-wrapper-jdk11
 create mode 100644 abcl-wrapper-jdk11.bat
 create mode 100755 abcl-wrapper-jdk15
 create mode 100644 abcl-wrapper-jdk15.bat
 create mode 100755 abcl-wrapper-jdk8
 create mode 100644 abcl-wrapper-jdk8.bat
 delete mode 100644 abcl-wrapper.bat

diff --git a/1.7.1/buster/jdk-11/abcl-wrapper b/1.7.1/buster/jdk-11/abcl-wrapper
index cb3658b..da76f04 100755
--- a/1.7.1/buster/jdk-11/abcl-wrapper
+++ b/1.7.1/buster/jdk-11/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/1.7.1/buster/jdk-11/slim/abcl-wrapper b/1.7.1/buster/jdk-11/slim/abcl-wrapper
index cb3658b..da76f04 100755
--- a/1.7.1/buster/jdk-11/slim/abcl-wrapper
+++ b/1.7.1/buster/jdk-11/slim/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/1.7.1/buster/jdk-15/abcl-wrapper b/1.7.1/buster/jdk-15/abcl-wrapper
index cb3658b..da76f04 100755
--- a/1.7.1/buster/jdk-15/abcl-wrapper
+++ b/1.7.1/buster/jdk-15/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/1.7.1/buster/jdk-15/slim/abcl-wrapper b/1.7.1/buster/jdk-15/slim/abcl-wrapper
index cb3658b..da76f04 100755
--- a/1.7.1/buster/jdk-15/slim/abcl-wrapper
+++ b/1.7.1/buster/jdk-15/slim/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/1.7.1/buster/jdk-8/abcl-wrapper b/1.7.1/buster/jdk-8/abcl-wrapper
index cb3658b..033e29a 100755
--- a/1.7.1/buster/jdk-8/abcl-wrapper
+++ b/1.7.1/buster/jdk-8/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/1.7.1/buster/jdk-8/slim/abcl-wrapper b/1.7.1/buster/jdk-8/slim/abcl-wrapper
index cb3658b..033e29a 100755
--- a/1.7.1/buster/jdk-8/slim/abcl-wrapper
+++ b/1.7.1/buster/jdk-8/slim/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/1.7.1/windowsservercore-1809/jdk-11/abcl-wrapper.bat b/1.7.1/windowsservercore-1809/jdk-11/abcl-wrapper.bat
index e82861d..79b0aa4 100644
--- a/1.7.1/windowsservercore-1809/jdk-11/abcl-wrapper.bat
+++ b/1.7.1/windowsservercore-1809/jdk-11/abcl-wrapper.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar C:\abcl\abcl.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/1.7.1/windowsservercore-1809/jdk-15/abcl-wrapper.bat b/1.7.1/windowsservercore-1809/jdk-15/abcl-wrapper.bat
index e82861d..79b0aa4 100644
--- a/1.7.1/windowsservercore-1809/jdk-15/abcl-wrapper.bat
+++ b/1.7.1/windowsservercore-1809/jdk-15/abcl-wrapper.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar C:\abcl\abcl.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/1.7.1/windowsservercore-1809/jdk-8/abcl-wrapper.bat b/1.7.1/windowsservercore-1809/jdk-8/abcl-wrapper.bat
index e82861d..67ccdb3 100644
--- a/1.7.1/windowsservercore-1809/jdk-8/abcl-wrapper.bat
+++ b/1.7.1/windowsservercore-1809/jdk-8/abcl-wrapper.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar C:\abcl\abcl.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/1.7.1/windowsservercore-ltsc2016/jdk-11/abcl-wrapper.bat b/1.7.1/windowsservercore-ltsc2016/jdk-11/abcl-wrapper.bat
index e82861d..79b0aa4 100644
--- a/1.7.1/windowsservercore-ltsc2016/jdk-11/abcl-wrapper.bat
+++ b/1.7.1/windowsservercore-ltsc2016/jdk-11/abcl-wrapper.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar C:\abcl\abcl.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/1.7.1/windowsservercore-ltsc2016/jdk-15/abcl-wrapper.bat b/1.7.1/windowsservercore-ltsc2016/jdk-15/abcl-wrapper.bat
index e82861d..79b0aa4 100644
--- a/1.7.1/windowsservercore-ltsc2016/jdk-15/abcl-wrapper.bat
+++ b/1.7.1/windowsservercore-ltsc2016/jdk-15/abcl-wrapper.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar C:\abcl\abcl.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/1.7.1/windowsservercore-ltsc2016/jdk-8/abcl-wrapper.bat b/1.7.1/windowsservercore-ltsc2016/jdk-8/abcl-wrapper.bat
index e82861d..67ccdb3 100644
--- a/1.7.1/windowsservercore-ltsc2016/jdk-8/abcl-wrapper.bat
+++ b/1.7.1/windowsservercore-ltsc2016/jdk-8/abcl-wrapper.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar C:\abcl\abcl.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/1.8.0/buster/jdk-11/abcl-wrapper b/1.8.0/buster/jdk-11/abcl-wrapper
index cb3658b..da76f04 100755
--- a/1.8.0/buster/jdk-11/abcl-wrapper
+++ b/1.8.0/buster/jdk-11/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/1.8.0/buster/jdk-11/slim/abcl-wrapper b/1.8.0/buster/jdk-11/slim/abcl-wrapper
index cb3658b..da76f04 100755
--- a/1.8.0/buster/jdk-11/slim/abcl-wrapper
+++ b/1.8.0/buster/jdk-11/slim/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/1.8.0/buster/jdk-15/abcl-wrapper b/1.8.0/buster/jdk-15/abcl-wrapper
index cb3658b..da76f04 100755
--- a/1.8.0/buster/jdk-15/abcl-wrapper
+++ b/1.8.0/buster/jdk-15/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/1.8.0/buster/jdk-15/slim/abcl-wrapper b/1.8.0/buster/jdk-15/slim/abcl-wrapper
index cb3658b..da76f04 100755
--- a/1.8.0/buster/jdk-15/slim/abcl-wrapper
+++ b/1.8.0/buster/jdk-15/slim/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/1.8.0/buster/jdk-8/abcl-wrapper b/1.8.0/buster/jdk-8/abcl-wrapper
index cb3658b..033e29a 100755
--- a/1.8.0/buster/jdk-8/abcl-wrapper
+++ b/1.8.0/buster/jdk-8/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/1.8.0/buster/jdk-8/slim/abcl-wrapper b/1.8.0/buster/jdk-8/slim/abcl-wrapper
index cb3658b..033e29a 100755
--- a/1.8.0/buster/jdk-8/slim/abcl-wrapper
+++ b/1.8.0/buster/jdk-8/slim/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/1.8.0/windowsservercore-1809/jdk-11/abcl-wrapper.bat b/1.8.0/windowsservercore-1809/jdk-11/abcl-wrapper.bat
index e82861d..79b0aa4 100644
--- a/1.8.0/windowsservercore-1809/jdk-11/abcl-wrapper.bat
+++ b/1.8.0/windowsservercore-1809/jdk-11/abcl-wrapper.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar C:\abcl\abcl.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/1.8.0/windowsservercore-1809/jdk-15/abcl-wrapper.bat b/1.8.0/windowsservercore-1809/jdk-15/abcl-wrapper.bat
index e82861d..79b0aa4 100644
--- a/1.8.0/windowsservercore-1809/jdk-15/abcl-wrapper.bat
+++ b/1.8.0/windowsservercore-1809/jdk-15/abcl-wrapper.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar C:\abcl\abcl.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/1.8.0/windowsservercore-1809/jdk-8/abcl-wrapper.bat b/1.8.0/windowsservercore-1809/jdk-8/abcl-wrapper.bat
index e82861d..67ccdb3 100644
--- a/1.8.0/windowsservercore-1809/jdk-8/abcl-wrapper.bat
+++ b/1.8.0/windowsservercore-1809/jdk-8/abcl-wrapper.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar C:\abcl\abcl.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/1.8.0/windowsservercore-ltsc2016/jdk-11/abcl-wrapper.bat b/1.8.0/windowsservercore-ltsc2016/jdk-11/abcl-wrapper.bat
index e82861d..79b0aa4 100644
--- a/1.8.0/windowsservercore-ltsc2016/jdk-11/abcl-wrapper.bat
+++ b/1.8.0/windowsservercore-ltsc2016/jdk-11/abcl-wrapper.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar C:\abcl\abcl.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/1.8.0/windowsservercore-ltsc2016/jdk-15/abcl-wrapper.bat b/1.8.0/windowsservercore-ltsc2016/jdk-15/abcl-wrapper.bat
index e82861d..79b0aa4 100644
--- a/1.8.0/windowsservercore-ltsc2016/jdk-15/abcl-wrapper.bat
+++ b/1.8.0/windowsservercore-ltsc2016/jdk-15/abcl-wrapper.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar C:\abcl\abcl.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/1.8.0/windowsservercore-ltsc2016/jdk-8/abcl-wrapper.bat b/1.8.0/windowsservercore-ltsc2016/jdk-8/abcl-wrapper.bat
index e82861d..67ccdb3 100644
--- a/1.8.0/windowsservercore-ltsc2016/jdk-8/abcl-wrapper.bat
+++ b/1.8.0/windowsservercore-ltsc2016/jdk-8/abcl-wrapper.bat
@@ -1,2 +1,2 @@
 @echo off
-java -jar C:\abcl\abcl.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/abcl-wrapper b/abcl-wrapper
deleted file mode 100755
index cb3658b..0000000
--- a/abcl-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
diff --git a/abcl-wrapper-jdk11 b/abcl-wrapper-jdk11
new file mode 100755
index 0000000..da76f04
--- /dev/null
+++ b/abcl-wrapper-jdk11
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/abcl-wrapper-jdk11.bat b/abcl-wrapper-jdk11.bat
new file mode 100644
index 0000000..79b0aa4
--- /dev/null
+++ b/abcl-wrapper-jdk11.bat
@@ -0,0 +1,2 @@
+@echo off
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/abcl-wrapper-jdk15 b/abcl-wrapper-jdk15
new file mode 100755
index 0000000..da76f04
--- /dev/null
+++ b/abcl-wrapper-jdk15
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/abcl-wrapper-jdk15.bat b/abcl-wrapper-jdk15.bat
new file mode 100644
index 0000000..79b0aa4
--- /dev/null
+++ b/abcl-wrapper-jdk15.bat
@@ -0,0 +1,2 @@
+@echo off
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/abcl-wrapper-jdk8 b/abcl-wrapper-jdk8
new file mode 100755
index 0000000..033e29a
--- /dev/null
+++ b/abcl-wrapper-jdk8
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/abcl-wrapper-jdk8.bat b/abcl-wrapper-jdk8.bat
new file mode 100644
index 0000000..67ccdb3
--- /dev/null
+++ b/abcl-wrapper-jdk8.bat
@@ -0,0 +1,2 @@
+@echo off
+java -cp C:\abcl\abcl.jar;"%CLASSPATH%" -XshowSettings:vm -Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/abcl-wrapper.bat b/abcl-wrapper.bat
deleted file mode 100644
index e82861d..0000000
--- a/abcl-wrapper.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-java -jar C:\abcl\abcl.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/nightly/buster/jdk-11/abcl-wrapper b/nightly/buster/jdk-11/abcl-wrapper
index cb3658b..da76f04 100755
--- a/nightly/buster/jdk-11/abcl-wrapper
+++ b/nightly/buster/jdk-11/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/nightly/buster/jdk-11/slim/abcl-wrapper b/nightly/buster/jdk-11/slim/abcl-wrapper
index cb3658b..da76f04 100755
--- a/nightly/buster/jdk-11/slim/abcl-wrapper
+++ b/nightly/buster/jdk-11/slim/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/nightly/buster/jdk-15/abcl-wrapper b/nightly/buster/jdk-15/abcl-wrapper
index cb3658b..da76f04 100755
--- a/nightly/buster/jdk-15/abcl-wrapper
+++ b/nightly/buster/jdk-15/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/nightly/buster/jdk-15/slim/abcl-wrapper b/nightly/buster/jdk-15/slim/abcl-wrapper
index cb3658b..da76f04 100755
--- a/nightly/buster/jdk-15/slim/abcl-wrapper
+++ b/nightly/buster/jdk-15/slim/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/nightly/buster/jdk-8/abcl-wrapper b/nightly/buster/jdk-8/abcl-wrapper
index cb3658b..033e29a 100755
--- a/nightly/buster/jdk-8/abcl-wrapper
+++ b/nightly/buster/jdk-8/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/nightly/buster/jdk-8/slim/abcl-wrapper b/nightly/buster/jdk-8/slim/abcl-wrapper
index cb3658b..033e29a 100755
--- a/nightly/buster/jdk-8/slim/abcl-wrapper
+++ b/nightly/buster/jdk-8/slim/abcl-wrapper
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-exec java -jar /usr/local/share/abcl/abcl.jar "$@"
+exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \
+     -XshowSettings:vm -Dfile.encoding=UTF-8 \
+     -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 \
+     org.armedbear.lisp.Main \
+     "$@"
diff --git a/update.sh b/update.sh
index ebc9d74..7af9e9d 100755
--- a/update.sh
+++ b/update.sh
@@ -55,12 +55,12 @@ for version in "${versions[@]}"; do
         case "$os" in
             buster)
                 template="apt$variantTag"
-                cp abcl-wrapper "$dir/abcl-wrapper"
+                cp "abcl-wrapper-jdk$javaVersion" "$dir/abcl-wrapper"
                 cp docker-entrypoint.sh "$dir/docker-entrypoint.sh"
                 ;;
             windowsservercore-*)
                 template='windowsservercore'
-                cp abcl-wrapper.bat "$dir/abcl-wrapper.bat"
+                cp "abcl-wrapper-jdk$javaVersion.bat" "$dir/abcl-wrapper.bat"
                 ;;
         esac
 
-- 
GitLab