renamed 'scala*2' to 'scala*' in Ant file build...

renamed 'scala*2' to 'scala*' in Ant file build.xml

1 files changed, 23 insertions, 20 deletions

diff --git a/build.xml b/build.xml
index f2684a417b..796df713a4 100644
--- a/build.xml
+++ b/build.xml
@@ -63,13 +63,13 @@ PROPERTIES
   <!-- Location of structure of the distribution properties -->
   <property name="dist.dir" value="${basedir}/dists"/>
   <property name="dist.latest.dir" value="${dist.dir}/latest"/>
-  <property name="dist.name" value="scala2"/>
+  <property name="dist.name" value="scala"/>
   <property name="lib.jar.name" value="${dist.name}-${lib.dir.name}.jar"/>
   <property name="comp.jar.name" value="${dist.name}-${comp.dir.name}.jar"/>
   <property name="scala.exec.name" value="${dist.name}"/>
-  <property name="scalai.exec.name" value="scalai2"/>
-  <property name="scalac.exec.name" value="scalac2"/>
-  <property name="scalatok.exec.name" value="scalatok2"/>
+  <property name="scalai.exec.name" value="scalai"/>
+  <property name="scalac.exec.name" value="scalac"/>
+  <property name="scalatok.exec.name" value="scalatok"/>
   <!-- Shorcut names -->
   <property name="locker.lib.dir" value="${locker.dir}/${lib.dir.name}"/>
   <property name="locker.comp.dir" value="${locker.dir}/${comp.dir.name}"/>
@@ -77,6 +77,9 @@ PROPERTIES
   <property name="quick.comp.dir" value="${quick.dir}/${comp.dir.name}"/>
   <property name="strap.lib.dir" value="${strap.dir}/${lib.dir.name}"/>
   <property name="strap.comp.dir" value="${strap.dir}/${comp.dir.name}"/>
+  <!-- sbaz properties -->
+  <property name="scala.sbaz.name" value="scala2"/>
+  <property name="scalac.sbaz.name" value="scalac2"/>
 
 <!-- ===========================================================================
 INITIALISATION
@@ -650,38 +653,38 @@ GENERATES A DISTRIBUTION
     </if> 
 
     <quicksbaz
-       file="${dist.dir}/scalac2-${version.number}.sbp"
-       adfile="${dist.dir}/scalac2-${version.number}.advert"
-       name="scalac2"
+       file="${dist.dir}/${scalac.sbaz.name}-${version.number}.sbp"
+       adfile="${dist.dir}/${scalac.sbaz.name}-${version.number}.advert"
+       name="${scalac.sbaz.name}"
        version="${version.number}"
        desc="The Scala compiler.  This is used to compile Scala programs
 into Java .class files."
-       depends="scalac2-support">
-      <libset dir="${dist.current.dir}/lib" includes="scala2-compiler.jar"/>
-      <binset dir="${dist.current.dir}/bin" includes="scalac2*"/>
-      <manset dir="${docs.dir}/man" includes="scalac2.1"/>
+       depends="${scalac.sbaz.name}-support">
+      <libset dir="${dist.current.dir}/lib" includes="${dist.name}-compiler.jar"/>
+      <binset dir="${dist.current.dir}/bin" includes="${scalac.exec.name}"/>
+      <manset dir="${docs.dir}/man" includes="${scalac.exec.name}.1"/>
     </quicksbaz>
 
     <quicksbaz
-       file="${dist.dir}/scala2-${version.number}.sbp"
-       adfile="${dist.dir}/scala2-${version.number}.advert"
-       name="scala2"
+       file="${dist.dir}/${scala.sbaz.name}-${version.number}.sbp"
+       adfile="${dist.dir}/${scala.sbaz.name}-${version.number}.advert"
+       name="${scala.sbaz.name}"
        version="${version.number}"
        desc="The Scala command runner.  It is a wrapper around the Java VM that,
 by default, sets up a large CLASSPATH including the Scala library
 as well as all jars installed in the lib directory of the sbaz-
 managed directory.">
-      <binset dir="${dist.current.dir}/bin" includes="scala2*"/>
-      <manset dir="${docs.dir}/man" includes="scala2.1"/>
+      <binset dir="${dist.current.dir}/bin" includes="${scala.exec.name}"/>
+      <manset dir="${docs.dir}/man" includes="${scala.exec.name}.1"/>
     </quicksbaz>
 
     <quicksbaz
-       file="${dist.dir}/scala2-library-${version.number}.sbp"
-       adfile="${dist.dir}/scala2-library-${version.number}.advert"
-       name="scala2-library"
+       file="${dist.dir}/${scala.sbaz.name}-library-${version.number}.sbp"
+       adfile="${dist.dir}/${scala.sbaz.name}-library-${version.number}.advert"
+       name="${scala.sbaz.name}-library"
        version="${version.number}"
        desc="The base Scala library, required for running all Scala programs.">
-      <libset dir="${dist.current.dir}/lib" includes="scala2-library.jar"/>
+      <libset dir="${dist.current.dir}/lib" includes="${dist.name}-library.jar"/>
     </quicksbaz>
   </target>