Changeset 35673 for main/trunk/release-kits/rk-setup.bash

Timestamp:

2021-10-23T17:13:42+13:00 (3 years ago)

Author:

davidb

Message:

Scripts updated to add in the jar files needed to support Java's jce.jar extension.

File:

• main/trunk/release-kits/rk-setup.bash (modified) (2 diffs)

main/trunk/release-kits/rk-setup.bash

@@ -7 +7 @@
 fi
 
+# https://stackoverflow.com/questions/59895/how-can-i-get-the-source-directory-of-a-bash-script-from-within-the-script-itsel
+# SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
 export RK_HOME="`pwd`"
 export PATH="$RK_HOME/bin":$PATH
@@ -12 +15 @@
 echo "Set RK_HOME and added RK_HOME/bin into PATH"
 
-export RK_HOME_BACKSLASH_ESCAPED=`echo $RK_HOME | sed 's/ /\\\\ /g'`
 
-export JAVACFLAGS="-source 1.8 -target 1.8 -bootclasspath $RK_HOME_BACKSLASH_ESCAPED/shared/core/java-rt/rt-openjdk8.jar -extdirs ''"
+# Set JAVACFLAGS (used in the relevant javac lines in our Makefiles)
+# so that any compiled Java code is backwards compatible with Java v1.8
+
+# Note: Given the way autoconf/configure uses 'eval' to test for
+#       javac, then the usual technique of double-quoting (e.g.) the
+#       bootclasspath directory to project against spaces *doesn't*
+#       *work* as in an eval it is not passed to a shell environment
+#       to be interpretted first.  The main outcome of all of this
+#       is that we need to resort to backlash escaping any spaces
+#       to keep things on track
+
+# Given the way the bootclasspath developed to needing multiple jar
+# files, no longer use RK_HOME_BACKSLASH_ESCAPED.  But the
+# principle still applies
+
+##export RK_HOME_BACKSLASH_ESCAPED=`echo $RK_HOME | sed 's/ /\\\\ /g'`
+
+jrt_home_dir="$RK_HOME/shared/core/java-rt"
+
+rt_jar="$jrt_home_dir/rt-openjdk8.jar"
+jce_jars="$jrt_home_dir/jce1_2_2.jar:$jrt_home_dir/local_policy.jar:$jrt_home_dir/US_export_policy.jar:$jrt_home_dir/sunjce_provider.jar"
+
+bootclasspath="$rt_jar:$jce_jars"
+bootclasspath_backslash_escaped=`echo $bootclasspath | sed 's/ /\\\\ /g'`
+
+export JAVACFLAGS="-source 1.8 -target 1.8 -bootclasspath $bootclasspath_backslash_escaped -extdirs ''"
 
 echo "Set JAVACFLAGS to compile for source, and to target, 1.8"