comparison domake @ 1446:5f1100e1cb12

Removed 'java' indirection script and modified domake to create the replacement symlink to /usr/lib/jvm/jre1.7.0/bin/java
author Doug Simon <doug.simon@oracle.com>
date Tue, 09 Nov 2010 17:37:01 +0100
parents f8ab19e5acae
children c0de7306803c
comparison
equal deleted inserted replaced
1445:a7b84a5e16c6 1446:5f1100e1cb12
5 # Resolve location of this script 5 # Resolve location of this script
6 me="${BASH_SOURCE[0]}" 6 me="${BASH_SOURCE[0]}"
7 while [ -h "$me" ]; do 7 while [ -h "$me" ]; do
8 me=`readlink -e "$me"` 8 me=`readlink -e "$me"`
9 done 9 done
10 hsx_home=$(cd `dirname $me`; pwd)
10 11
11 grep '-client KNOWN' $JRE7/lib/amd64/jvm.cfg >/dev/null 12 grep '-client KNOWN' $JRE7/lib/amd64/jvm.cfg >/dev/null
12 if [ $? -ne 0 ] ; then 13 if [ $? -ne 0 ] ; then
13 echo "The setting for -client in $JRE7/lib/amd64/jvm.cfg must be:" 14 echo "The setting for -client in $JRE7/lib/amd64/jvm.cfg must be:"
14 echo 15 echo
15 echo " -client KNOWN" 16 echo " -client KNOWN"
16 echo 17 echo
17 exit 1 18 exit 1
18 fi 19 fi
19 20
20 pushd $(dirname "$me")/make 21 java_link="$hsx_home/c1x4hotspotsrc/hotspot/java"
22 if [ ! -e $java_link ]; then
23 echo "Creating link: $java_link -> $JRE7/bin/java"
24 ln -s $JRE7/bin/java $java_link
25 fi
26
27 pushd $hsx_home/make
21 ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk/ LANG=C ARCH_DATA_MODEL=64 HOTSPOT_BUILD_JOBS=2 make jvmg1 28 ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk/ LANG=C ARCH_DATA_MODEL=64 HOTSPOT_BUILD_JOBS=2 make jvmg1
22 echo "Copying binaries to JRE7 directory $JRE7" 29 echo "Copying binaries to JRE7 directory $JRE7"
23 cp ../build/linux/linux_amd64_compiler1/jvmg/libjvm.so $JRE7/lib/amd64/client 30 cp ../build/linux/linux_amd64_compiler1/jvmg/libjvm.so $JRE7/lib/amd64/client
24 cp ../build/linux/linux_amd64_compiler1/jvmg/libjsig.so $JRE7/lib/amd64/client 31 cp ../build/linux/linux_amd64_compiler1/jvmg/libjsig.so $JRE7/lib/amd64/client
25 popd 32 popd