Changeset 35673 for main/trunk/release-kits

Timestamp:

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

Author:

davidb

Message:

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

Location:

main/trunk/release-kits

Files:

• bin/rk (modified) (1 diff)
• bin/rk.bat (modified) (1 diff)
• rk-setup.bash (modified) (2 diffs)

main/trunk/release-kits/bin/rk

@@ -47 +47 @@
 export ANT_OPTS=-Xmx1024M
 
-# set JAVACFLAGS (used in the relevant javac lines in our Makefiles) so that any compiled Java code
-# is backwards compatible with Java v1.6
 
-# Note: Given the way autoconf uses 'eval' to test javac, then the usual technique of double-quoting
-#       (e.g.) the bootclasspath directory to project against spaces *won't* *work* as it is not passed
-#       to a shell environment to be interpretted first.  
-#       Instead, we result to backlash escaping any spaces
-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 ''"
+if [ "x$JAVACFLAGS" = "x" ] ; then
+    echo "****" >&2
+    echo "Warning: Expected to have JAVACFLAGS set.  Have your sourced rk3-setup.bassh?" >&2
+    echo "****" >&2
+    echo "Sleeping for 5 seconds then continuing, unless ^C is pressed" >&2
+    sleep 5
+fi
 
 #create the command

main/trunk/release-kits/bin/rk.bat

@@ -11 +11 @@
 :: set JAVACFLAGS (used in the relevant javac lines in our win32.mak/Makefiles) so that any compiled Java code
 :: is backwards compatible with Java v1.6
+echo ****** Setting JAVACFLAGS in rk.bat
+echo ****** Need to update the script so it is done through rk-setup.bat
 set JAVACFLAGS=-source 1.8 -target 1.8 -bootclasspath "%RK_HOME%\shared\core\java-rt\rt-openjdk8.jar" -extdirs ""
 

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"