Skip to content

Commit 4bbfed3

Browse files
committed
Updated and added some runners.
Easier ways to invoke scala/scalac based on starr, locker, or quick. % tools/starr_scalac -version Scala compiler version 2.10.0.r26060-b20111123092602 -- Copyright 2002-2011, LAMP/EPFL % tools/locker_scalac -version Scala compiler version v2.10.0-M1-0140-g4619a48c1e-2012-02-02 -- Copyright 2002-2011, LAMP/EPFL % tools/quick_scalac -version Scala compiler version v2.10.0-M1-0144-g0c59a25a81-2012-02-02 -- Copyright 2002-2011, LAMP/EPFL
1 parent 58ab20b commit 4bbfed3

File tree

6 files changed

+30
-10
lines changed

6 files changed

+30
-10
lines changed

tools/locker_scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
#
33

4-
THISDIR=`dirname $0`
5-
CP=`$THISDIR/lockercp`
6-
CLASS="scala.tools.nsc.MainGenericRunner"
4+
CP=$($(dirname $BASH_SOURCE)/lockercp)
75

8-
java -classpath "$CP" $CLASS -usejavacp "$@"
6+
java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.MainGenericRunner -usejavacp "$@"

tools/locker_scalac

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#!/bin/bash
1+
#!/bin/sh
22
#
33

4-
THISDIR=`dirname $0`
5-
CP=`$THISDIR/lockercp`
6-
CLASS="scala.tools.nsc.Main"
4+
CP=$($(dirname $BASH_SOURCE)/lockercp)
75

8-
java -classpath "$CP" $CLASS -usejavacp "$@"
6+
java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.Main -usejavacp "$@"

tools/quick_scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
#
3+
4+
CP=$($(dirname $BASH_SOURCE)/quickcp)
5+
6+
java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.MainGenericRunner -usejavacp "$@"

tools/quick_scalac

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
#
3+
4+
CP=$($(dirname $BASH_SOURCE)/quickcp)
5+
6+
java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.Main -usejavacp "$@"

tools/starr_scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
#
3+
4+
CP=$($(dirname $BASH_SOURCE)/starrcp)
5+
6+
java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.MainGenericRunner -usejavacp "$@"

tools/starr_scalac

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
#
3+
4+
CP=$($(dirname $BASH_SOURCE)/starrcp)
5+
6+
java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.Main -usejavacp "$@"

0 commit comments

Comments
 (0)