Changeset 35673 for main/trunk/release-kits/bin

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/bin

Files:

• rk (modified) (1 diff)
• rk.bat (modified) (1 diff)

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 ""