diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-03 10:11:17 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-03 12:47:19 -0800 |
| commit | 4aa290f3ba9b1b4029304f4d19e90e68ab18d781 (patch) | |
| tree | b824f5967a303917e2db95eeefbd8063dc82e88d | |
| parent | c5871a974aeaed8d90794c44629bde61f516dfaa (diff) | |
| parent | 4bbfed3f8fda69624ea6a96de52ba973f55900cf (diff) | |
| download | scala-4aa290f3ba9b1b4029304f4d19e90e68ab18d781.tar.gz scala-4aa290f3ba9b1b4029304f4d19e90e68ab18d781.tar.bz2 scala-4aa290f3ba9b1b4029304f4d19e90e68ab18d781.zip | |
Merge branch 'master' into topic/inline
| -rwxr-xr-x | tools/locker_scala | 8 | ||||
| -rwxr-xr-x | tools/locker_scalac | 8 | ||||
| -rwxr-xr-x | tools/quick_scala | 6 | ||||
| -rwxr-xr-x | tools/quick_scalac | 6 | ||||
| -rwxr-xr-x | tools/starr_scala | 6 | ||||
| -rwxr-xr-x | tools/starr_scalac | 6 |
6 files changed, 30 insertions, 10 deletions
diff --git a/tools/locker_scala b/tools/locker_scala index 4434c94bf3..02d2efcdd8 100755 --- a/tools/locker_scala +++ b/tools/locker_scala @@ -1,8 +1,6 @@ -#!/bin/bash +#!/bin/sh # -THISDIR=`dirname $0` -CP=`$THISDIR/lockercp` -CLASS="scala.tools.nsc.MainGenericRunner" +CP=$($(dirname $BASH_SOURCE)/lockercp) -java -classpath "$CP" $CLASS -usejavacp "$@" +java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.MainGenericRunner -usejavacp "$@" diff --git a/tools/locker_scalac b/tools/locker_scalac index 2ad153e929..c4b28b7bc0 100755 --- a/tools/locker_scalac +++ b/tools/locker_scalac @@ -1,8 +1,6 @@ -#!/bin/bash +#!/bin/sh # -THISDIR=`dirname $0` -CP=`$THISDIR/lockercp` -CLASS="scala.tools.nsc.Main" +CP=$($(dirname $BASH_SOURCE)/lockercp) -java -classpath "$CP" $CLASS -usejavacp "$@" +java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.Main -usejavacp "$@" diff --git a/tools/quick_scala b/tools/quick_scala new file mode 100755 index 0000000000..16938ddba4 --- /dev/null +++ b/tools/quick_scala @@ -0,0 +1,6 @@ +#!/bin/sh +# + +CP=$($(dirname $BASH_SOURCE)/quickcp) + +java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.MainGenericRunner -usejavacp "$@" diff --git a/tools/quick_scalac b/tools/quick_scalac new file mode 100755 index 0000000000..1b9a036c18 --- /dev/null +++ b/tools/quick_scalac @@ -0,0 +1,6 @@ +#!/bin/sh +# + +CP=$($(dirname $BASH_SOURCE)/quickcp) + +java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.Main -usejavacp "$@" diff --git a/tools/starr_scala b/tools/starr_scala new file mode 100755 index 0000000000..9b0fb60cf7 --- /dev/null +++ b/tools/starr_scala @@ -0,0 +1,6 @@ +#!/bin/sh +# + +CP=$($(dirname $BASH_SOURCE)/starrcp) + +java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.MainGenericRunner -usejavacp "$@" diff --git a/tools/starr_scalac b/tools/starr_scalac new file mode 100755 index 0000000000..972eeaff2b --- /dev/null +++ b/tools/starr_scalac @@ -0,0 +1,6 @@ +#!/bin/sh +# + +CP=$($(dirname $BASH_SOURCE)/starrcp) + +java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.Main -usejavacp "$@" |