Changeset 35673 for main/trunk
- Timestamp:
- 2021-10-23T17:13:42+13:00 (3 years ago)
- Location:
- main/trunk/release-kits
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/bin/rk
r35627 r35673 47 47 export ANT_OPTS=-Xmx1024M 48 48 49 # set JAVACFLAGS (used in the relevant javac lines in our Makefiles) so that any compiled Java code50 # is backwards compatible with Java v1.651 49 52 # Note: Given the way autoconf uses 'eval' to test javac, then the usual technique of double-quoting 53 # (e.g.) the bootclasspath directory to project against spaces *won't* *work* as it is not passed 54 # to a shell environment to be interpretted first. 55 # Instead, we result to backlash escaping any spaces 56 export RK_HOME_BACKSLASH_ESCAPED=`echo $RK_HOME | sed 's/ /\\\\ /g'` 57 58 export JAVACFLAGS="-source 1.8 -target 1.8 -bootclasspath $RK_HOME_BACKSLASH_ESCAPED/shared/core/java-rt/rt-openjdk8.jar -extdirs ''" 50 if [ "x$JAVACFLAGS" = "x" ] ; then 51 echo "****" >&2 52 echo "Warning: Expected to have JAVACFLAGS set. Have your sourced rk3-setup.bassh?" >&2 53 echo "****" >&2 54 echo "Sleeping for 5 seconds then continuing, unless ^C is pressed" >&2 55 sleep 5 56 fi 59 57 60 58 #create the command -
main/trunk/release-kits/bin/rk.bat
r35622 r35673 11 11 :: set JAVACFLAGS (used in the relevant javac lines in our win32.mak/Makefiles) so that any compiled Java code 12 12 :: is backwards compatible with Java v1.6 13 echo ****** Setting JAVACFLAGS in rk.bat 14 echo ****** Need to update the script so it is done through rk-setup.bat 13 15 set JAVACFLAGS=-source 1.8 -target 1.8 -bootclasspath "%RK_HOME%\shared\core\java-rt\rt-openjdk8.jar" -extdirs "" 14 16 -
main/trunk/release-kits/rk-setup.bash
r35634 r35673 7 7 fi 8 8 9 # https://stackoverflow.com/questions/59895/how-can-i-get-the-source-directory-of-a-bash-script-from-within-the-script-itsel 10 # SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" 11 9 12 export RK_HOME="`pwd`" 10 13 export PATH="$RK_HOME/bin":$PATH … … 12 15 echo "Set RK_HOME and added RK_HOME/bin into PATH" 13 16 14 export RK_HOME_BACKSLASH_ESCAPED=`echo $RK_HOME | sed 's/ /\\\\ /g'`15 17 16 export JAVACFLAGS="-source 1.8 -target 1.8 -bootclasspath $RK_HOME_BACKSLASH_ESCAPED/shared/core/java-rt/rt-openjdk8.jar -extdirs ''" 18 # Set JAVACFLAGS (used in the relevant javac lines in our Makefiles) 19 # so that any compiled Java code is backwards compatible with Java v1.8 20 21 # Note: Given the way autoconf/configure uses 'eval' to test for 22 # javac, then the usual technique of double-quoting (e.g.) the 23 # bootclasspath directory to project against spaces *doesn't* 24 # *work* as in an eval it is not passed to a shell environment 25 # to be interpretted first. The main outcome of all of this 26 # is that we need to resort to backlash escaping any spaces 27 # to keep things on track 28 29 # Given the way the bootclasspath developed to needing multiple jar 30 # files, no longer use RK_HOME_BACKSLASH_ESCAPED. But the 31 # principle still applies 32 33 ##export RK_HOME_BACKSLASH_ESCAPED=`echo $RK_HOME | sed 's/ /\\\\ /g'` 34 35 jrt_home_dir="$RK_HOME/shared/core/java-rt" 36 37 rt_jar="$jrt_home_dir/rt-openjdk8.jar" 38 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" 39 40 bootclasspath="$rt_jar:$jce_jars" 41 bootclasspath_backslash_escaped=`echo $bootclasspath | sed 's/ /\\\\ /g'` 42 43 export JAVACFLAGS="-source 1.8 -target 1.8 -bootclasspath $bootclasspath_backslash_escaped -extdirs ''" 17 44 18 45 echo "Set JAVACFLAGS to compile for source, and to target, 1.8"
Note:
See TracChangeset
for help on using the changeset viewer.