Mercurial > hg > release > icedtea7-forest-2.2 > langtools
changeset 897:bfa59f3e84bd
7018447: langtools launcher template fails if tools run from their own directory
Reviewed-by: jjg
Contributed-by: daniel.smith@oracle.com
| author | jjg |
|---|---|
| date | Wed, 09 Feb 2011 18:26:08 -0800 |
| parents | 3ce4e1a07e92 |
| children | a19b1f4f23c9 |
| files | src/share/bin/launcher.sh-template |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/bin/launcher.sh-template Wed Feb 09 14:10:52 2011 -0800 +++ b/src/share/bin/launcher.sh-template Wed Feb 09 18:26:08 2011 -0800 @@ -31,8 +31,7 @@ mydir=`cygpath -m $mydir` ;; esac - -mylib="`dirname $mydir`"/lib +mylib="$mydir/../lib" # By default, put the jar file and its dependencies on the bootclasspath. # This is always required on a Mac, because the system langtools classes @@ -73,4 +72,4 @@ unset DUALCASE IFS=$nl -"#TARGET_JAVA#" "${bcp:+-Xbootclasspath/p:"$bcp"}" ${ea} ${javaOpts} -jar "${mydir}"/../lib/#PROGRAM#.jar ${toolOpts} +"#TARGET_JAVA#" "${bcp:+-Xbootclasspath/p:"$bcp"}" ${ea} ${javaOpts} -jar "${mylib}/#PROGRAM#.jar" ${toolOpts}