summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-10-28 11:43:28 +0100
committerJason Zaugg <jzaugg@gmail.com>2013-10-28 11:48:04 +0100
commit08c6a9b6b071a4d09b3a5718e3413e6810f0946e (patch)
treef000c6f07d9407c7214c8dac77c4078943fc62a4 /tools
parent7a8d51d45761e33d494a0a247194f8b185680aee (diff)
downloadscala-08c6a9b6b071a4d09b3a5718e3413e6810f0946e.tar.gz
scala-08c6a9b6b071a4d09b3a5718e3413e6810f0946e.tar.bz2
scala-08c6a9b6b071a4d09b3a5718e3413e6810f0946e.zip
Remove tools/*{cp, _scala, _scalac}, and tools/*pickled
The scripts to fire up a compiler or REPL from build products have bitrotted just enough to get rid of them. They do not include the correct JLine, nor the scala modules. I've also removed showPickled and diffPickled which were based on these, and were also based on some code in ShowPickled that no longer exists since 48cc8b4.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/buildcp11
-rwxr-xr-xtools/diffPickled51
-rwxr-xr-xtools/locker_scala6
-rwxr-xr-xtools/locker_scalac6
-rwxr-xr-xtools/lockercp4
-rwxr-xr-xtools/packcp5
-rwxr-xr-xtools/quick_scala6
-rwxr-xr-xtools/quick_scalac6
-rwxr-xr-xtools/quickcp4
-rwxr-xr-xtools/showPickled32
-rwxr-xr-xtools/starr_scala6
-rwxr-xr-xtools/starr_scalac6
-rwxr-xr-xtools/starrcp5
-rwxr-xr-xtools/strapcp11
14 files changed, 0 insertions, 159 deletions
diff --git a/tools/buildcp b/tools/buildcp
deleted file mode 100755
index 3ae70e10a3..0000000000
--- a/tools/buildcp
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-
-[[ $# -eq 1 ]] || { echo "Usage: $0 <locker|quick|...>"; exit 0; }
-
-dir=$(dirname $0)
-lib=$($dir/abspath $dir/../lib)
-build=$($dir/abspath $dir/../build)
-cp=$($dir/cpof $build/$1/classes):$build/asm/classes
-
-echo $cp:$lib/forkjoin.jar:$lib/jline.jar:$lib/extra/'*'
diff --git a/tools/diffPickled b/tools/diffPickled
deleted file mode 100755
index b4a345dc7d..0000000000
--- a/tools/diffPickled
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# Shows the difference in pickler output between two variations on a class.
-#
-# If quick and strap are built normally you can run
-#
-# diffPickled foo.bar.Baz
-#
-# to see any differences between them in that class.
-
-USAGE="Usage: $0 classpath1 classpath2 class"
-TOOLSDIR=`dirname $0`
-BUILDDIR="${TOOLSDIR}/../build"
-QUICKDIR="${BUILDDIR}/quick"
-STRAPDIR="${BUILDDIR}/strap"
-
-CP1=""
-CP2=""
-CLASS=""
-
-if [ $# == 1 ] ; then
- if [ -e ${QUICKDIR} ] && [ -e ${STRAPDIR} ] ; then
- CP1=`${TOOLSDIR}/quickcp`
- CP2=`${TOOLSDIR}/strapcp`
- CLASS=$1
- else
- echo $USAGE
- echo "(If only one argument is given, $QUICKDIR and $STRAPDIR must exist.)"
- exit 1
- fi
-elif [ $# == 3 ] ; then
- CP1=$1
- CP2=$2
- CLASS=$3
-else
- echo $USAGE
- exit 1
-fi
-
-TMPDIR="/tmp/scala_pickle_diff${RANDOM}"
-
-if mkdir -m 0700 "$TMPDIR" 2>/dev/null ; then
- ${TOOLSDIR}/showPickled -cp $CP1 $CLASS > "${TMPDIR}/out1.txt"
- ${TOOLSDIR}/showPickled -cp $CP2 $CLASS > "${TMPDIR}/out2.txt"
- diff "${TMPDIR}/out1.txt" "${TMPDIR}/out2.txt"
- rm -rf ${TMPDIR}
-else
- echo "Failed to create temporary directory ${TMPDIR}."
- exit 1
-fi
-
diff --git a/tools/locker_scala b/tools/locker_scala
deleted file mode 100755
index 02d2efcdd8..0000000000
--- a/tools/locker_scala
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#
-
-CP=$($(dirname $BASH_SOURCE)/lockercp)
-
-java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.MainGenericRunner -usejavacp "$@"
diff --git a/tools/locker_scalac b/tools/locker_scalac
deleted file mode 100755
index c4b28b7bc0..0000000000
--- a/tools/locker_scalac
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#
-
-CP=$($(dirname $BASH_SOURCE)/lockercp)
-
-java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.Main -usejavacp "$@"
diff --git a/tools/lockercp b/tools/lockercp
deleted file mode 100755
index 43c72dd629..0000000000
--- a/tools/lockercp
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-#
-
-$(dirname $0)/buildcp locker
diff --git a/tools/packcp b/tools/packcp
deleted file mode 100755
index ecc7ee1b5d..0000000000
--- a/tools/packcp
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-#
-
-dir=$(dirname $0)
-$dir/cpof $dir/../build/pack/lib
diff --git a/tools/quick_scala b/tools/quick_scala
deleted file mode 100755
index 16938ddba4..0000000000
--- a/tools/quick_scala
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
deleted file mode 100755
index 1b9a036c18..0000000000
--- a/tools/quick_scalac
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#
-
-CP=$($(dirname $BASH_SOURCE)/quickcp)
-
-java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.Main -usejavacp "$@"
diff --git a/tools/quickcp b/tools/quickcp
deleted file mode 100755
index 25d46e56d9..0000000000
--- a/tools/quickcp
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-#
-
-$(dirname $0)/buildcp quick
diff --git a/tools/showPickled b/tools/showPickled
deleted file mode 100755
index 27421c3ae5..0000000000
--- a/tools/showPickled
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# Shows the pickled scala data in a classfile.
-
-if [ $# == 0 ] ; then
- echo "Usage: $0 [--bare] [-cp classpath] <class*>"
- exit 1
-fi
-
-TOOLSDIR=`dirname $0`
-CPOF="$TOOLSDIR/cpof"
-
-PACK="$TOOLSDIR/../build/pack/lib"
-QUICK="$TOOLSDIR/../build/quick/classes"
-STARR="$TOOLSDIR/../lib"
-CP=""
-
-if [ -f "${PACK}/scala-library.jar" ] ; then
- CP=`${TOOLSDIR}/packcp`
-elif [ -d "${QUICK}/library" ] ; then
- CP=`${TOOLSDIR}/quickcp`
-else
- CP=`${TOOLSDIR}/starrcp`
-fi
-
-if [ "$1" == "-cp" ] ; then
- shift
- CP="${1}:${CP}"
- shift
-fi
-
-java -cp "$CP" scala.tools.nsc.util.ShowPickled $*
diff --git a/tools/starr_scala b/tools/starr_scala
deleted file mode 100755
index 9b0fb60cf7..0000000000
--- a/tools/starr_scala
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
deleted file mode 100755
index 972eeaff2b..0000000000
--- a/tools/starr_scalac
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#
-
-CP=$($(dirname $BASH_SOURCE)/starrcp)
-
-java $JAVA_OPTS -classpath "$CP" scala.tools.nsc.Main -usejavacp "$@"
diff --git a/tools/starrcp b/tools/starrcp
deleted file mode 100755
index 76f40fde03..0000000000
--- a/tools/starrcp
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-#
-
-dir=$(dirname $0)
-$dir/cpof $dir/../lib
diff --git a/tools/strapcp b/tools/strapcp
deleted file mode 100755
index 6a4044ae24..0000000000
--- a/tools/strapcp
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-
-dir=$(dirname $0)
-strap="$dir/../build/strap/classes"
-[[ -d $strap ]] || { echo "Error: no directory at $strap"; exit 1; }
-
-cp=$($dir/cpof $strap)
-asm=$($dir/abspath $dir/../build/asm/classes)
-
-echo $cp:$asm