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

Timestamp:

2021-10-13T14:07:12+13:00 (3 years ago)

Author:

davidb

Message:

Main change is to set explicitly setJAVACFLAGS here (i.e. in the release kit) so as to trigger it generateing backwards compatible Java class files. The opportunity was also taken to update rk.bat to bring it a little bit more inline with what the bash version does

Location:

main/trunk/release-kits/bin

Files:

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

main/trunk/release-kits/bin/rk

@@ -45 +45 @@
 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.6 -target 1.6 -bootclasspath $RK_HOME_BACKSLASH_ESCAPED/shared/core/java-rt/rt-openjdk6.jar -extdirs ''"
+
 #create the command
 toexec="ant -lib \"`pwd`/installer/classes\" -f \"$RK_HOME/kits/$rk_name/ant-scripts/build.xml\" \"-Dbasedir=`pwd`\" \"-Drk.home=$RK_HOME\" \"-Drk.name=$rk_name\""
@@ -57 +68 @@
     toexec="$toexec \"-Dkeep.src=$KEEP_SRC\""
 fi
+
+show_cmd=false
 
 #pass on the arguments

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

@@ -4 +4 @@
 pushd "%CD%"
 CD /D "%~dp0\.."
+
+:: make sure ant has enough memory
+set ANT_OPTS=-Xmx1024M
+
+:: 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
+set JAVACFLAGS=-source 1.6 -target 1.6 -bootclasspath "%RK_HOME%\shared\core\java-rt\rt-openjdk6.jar" -extdirs ""
 
 :: Generally, an ant property can be true|on|yes vs false|off|no (or left unset)