updated file scala/tools/nsc/MainScript.scala t...

updated file scala/tools/nsc/MainScript.scala to run it in the DOS
console added executables bin/scalascript* to the Scala distribution

1 files changed, 27 insertions, 1 deletions

diff --git a/build.xml b/build.xml
index f42dda9711..571fb4c159 100644
--- a/build.xml
+++ b/build.xml
@@ -57,6 +57,7 @@ PROPERTIES
   <property name="scalac.exec.name" value="scalac"/>
   <property name="scaladoc.exec.name" value="scaladoc"/>
   <property name="scalaint.exec.name" value="scalaint"/>
+  <property name="scalascript.exec.name" value="scalascript"/>
 
 <!-- ===========================================================================
 INITIALISATION
@@ -338,6 +339,12 @@ BUILD LOCAL REFERENCE (LOCKER) LAYER
       class="scala.tools.nsc.MainInterpreter"
       version="${version.number}"
       copyright="${copyright.string}"/>
+    <lockertool
+      file="${locker.dir}/bin/${scalascript.exec.name}"
+      name="Scala scripting tool"
+      class="scala.tools.nsc.MainScript"
+      version="${version.number}"
+      copyright="${copyright.string}"/>
     <chmod perm="ugo+rx"
       file="${locker.dir}/bin/${scalac.exec.name}"/>
     <chmod perm="ugo+rx"
@@ -346,7 +353,9 @@ BUILD LOCAL REFERENCE (LOCKER) LAYER
       file="${locker.dir}/bin/${scaladoc.exec.name}"/>
     <chmod perm="ugo+rx"
       file="${locker.dir}/bin/${scalaint.exec.name}"/>
-  <!-- Mark LOCKER as being completely built -->
+    <chmod perm="ugo+rx"
+      file="${locker.dir}/bin/${scalascript.exec.name}"/>
+    <!-- Mark LOCKER as being completely built -->
     <touch file="${locker.dir}/complete" verbose="no"/>
   </target>
 
@@ -450,6 +459,12 @@ BUILD QUICK-TEST LAYER
       class="scala.tools.nsc.MainInterpreter"
       version="${version.number}"
       copyright="${copyright.string}"/>
+    <quicktool
+      file="${quick.dir}/bin/${scalascript.exec.name}"
+      name="Scala scripting tool"
+      class="scala.tools.nsc.MainScript"
+      version="${version.number}"
+      copyright="${copyright.string}"/>
     <chmod perm="ugo+rx"
       file="${quick.dir}/bin/${scalac.exec.name}"/>
     <chmod perm="ugo+rx"
@@ -458,6 +473,8 @@ BUILD QUICK-TEST LAYER
       file="${quick.dir}/bin/${scaladoc.exec.name}"/>
     <chmod perm="ugo+rx"
       file="${quick.dir}/bin/${scalaint.exec.name}"/>
+    <chmod perm="ugo+rx"
+      file="${quick.dir}/bin/${scalascript.exec.name}"/>
   </target>
 
   <target name="test.quick" depends="build">
@@ -564,6 +581,12 @@ TEST
       class="scala.tools.nsc.MainInterpreter"
       version="${version.number}"
       copyright="${copyright.string}"/>
+    <straptool
+      file="${strap.dir}/bin/${scalascript.exec.name}"
+      name="Scala scripting tool"
+      class="scala.tools.nsc.MainScript"
+      version="${version.number}"
+      copyright="${copyright.string}"/>
     <chmod perm="ugo+rx"
       file="${strap.dir}/bin/${scalac.exec.name}"/>
     <chmod perm="ugo+rx"
@@ -572,6 +595,8 @@ TEST
       file="${strap.dir}/bin/${scaladoc.exec.name}"/>
     <chmod perm="ugo+rx"
       file="${strap.dir}/bin/${scalaint.exec.name}"/>
+    <chmod perm="ugo+rx"
+      file="${strap.dir}/bin/${scalascript.exec.name}"/>
   </target>
 
   <!-- Compares quick and test level -->
@@ -722,6 +747,7 @@ GENERATES A DISTRIBUTION
     <chmod perm="ugo+rx" file="${dist.current.dir}/bin/${scala.exec.name}"/>
     <chmod perm="ugo+rx" file="${dist.current.dir}/bin/${scaladoc.exec.name}"/>
     <chmod perm="ugo+rx" file="${dist.current.dir}/bin/${scalaint.exec.name}"/>
+    <chmod perm="ugo+rx" file="${dist.current.dir}/bin/${scalascript.exec.name}"/>
   <!-- Copy the API, examples and man -->
     <copy todir="${dist.current.dir}/doc/scala">
       <fileset dir="${docs.dir}" includes="README,LICENSE"/>