added target 'dist.quick' (no tests and docs) i...

added target 'dist.quick' (no tests and docs) in file build.xml

2 files changed, 12 insertions, 3 deletions

diff --git a/build.xml b/build.xml
index 0fef2d1065..0c907dc843 100644
--- a/build.xml
+++ b/build.xml
@@ -967,9 +967,18 @@ GENERATES A DISTRIBUTION
     <runtarget target="dist"/>
   </target>
 
+  <target name="dist.quick"
+    depends="build.strap, dist.latest"
+    description="Creates a quick Scala distribution (no tests and docs)"
+  />
+
   <target name="dist"
-    depends="test, docs"
+    depends="test, docs, dist.latest"
     description="Creates a complete Scala distribution"
+  />
+
+  <target name="dist.latest"
+    description="Creates the latest Scala distribution"
   >
     <property
       name="dist.current.dir"
diff --git a/test/scalatest b/test/scalatest
index 2ea32bee11..2fd1fa2e1c 100755
--- a/test/scalatest
+++ b/test/scalatest
@@ -572,8 +572,8 @@ fi
 printf_outline "Source directory is : $SRCDIR\\n";
 bin_dir=$BIN_DIR
 if [ -z "$bin_dir" ]; then
-    bin_dir=`which "$SCALAC"` && bin_dir=`dirname "$bin_dir"`/;
-    bin_dir=`test_get_location ${bin_dir}scalac`;
+    scalac=`which $SCALAC`;
+    bin_dir=`test_get_location $scalac`;
 fi;
 printf_outline "Scala binaries in   : $bin_dir\\n";
 jvm_version=`${JAVACMD:=java} -version 2>&1 | head -3 | tail -1`