diff options
author | Lex Spoon <lex@lexspoon.org> | 2006-02-20 03:03:23 +0000 |
---|---|---|
committer | Lex Spoon <lex@lexspoon.org> | 2006-02-20 03:03:23 +0000 |
commit | 46a4e2f69881711bc4dbdbe2ab5fcedec509e159 (patch) | |
tree | 74c4377738a0c0835727f29d128be52289c257fa | |
parent | bbad3c86f9af33c11420c31e3236c345e94a5bbd (diff) | |
download | scala-46a4e2f69881711bc4dbdbe2ab5fcedec509e159.tar.gz scala-46a4e2f69881711bc4dbdbe2ab5fcedec509e159.tar.bz2 scala-46a4e2f69881711bc4dbdbe2ab5fcedec509e159.zip |
- generate a wrapper for scalaint
- renamed sbp files without the "2" (scala vs. scala2, etc.)
-rw-r--r-- | build.xml | 50 |
1 files changed, 47 insertions, 3 deletions
@@ -69,6 +69,7 @@ PROPERTIES <property name="scala.exec.name" value="${dist.name}"/> <property name="scalai.exec.name" value="scalai"/> <property name="scalac.exec.name" value="scalac"/> + <property name="scalaint.exec.name" value="scalaint"/> <property name="scalatok.exec.name" value="scalatok"/> <!-- Shorcut names --> <property name="locker.lib.dir" value="${locker.dir}/${lib.dir.name}"/> @@ -78,8 +79,9 @@ PROPERTIES <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"/> + <property name="scala.sbaz.name" value="scala"/> + <property name="scalac.sbaz.name" value="scalac"/> + <property name="scalaint.sbaz.name" value="scalaint"/> <!-- =========================================================================== INITIALISATION @@ -474,6 +476,15 @@ BUILD QUICK-TEST LAYER perm="ugo+rx"/> <chmod file="${quick.dir}/${exec.dir.name}/${scala.exec.name}" perm="ugo+rx"/> + <lockertool file="${quick.dir}/${exec.dir.name}/${scalaint.exec.name}" + name="Scala interpreter" + class="scala.tools.nsc.MainInterpreter" + version="${version.number}" + copyright="${copyright}" + classpath="" + javaFlags="-Xmx256M -Xms16M"/> + <chmod file="${quick.dir}/${exec.dir.name}/${scalaint.exec.name}" + perm="ugo+rx"/> </target> <target name="test.quick" depends="build"> @@ -560,6 +571,15 @@ TEST perm="ugo+rx"/> <chmod file="${strap.dir}/${exec.dir.name}/${scala.exec.name}" perm="ugo+rx"/> + <quicktool file="${strap.dir}/${exec.dir.name}/${scalaint.exec.name}" + name="Scala interpreter" + class="scala.tools.nsc.MainInterpreter" + version="${version.number}" + copyright="${copyright}" + classpath="" + javaFlags="-Xmx256M -Xms16M"/> + <chmod file="${strap.dir}/${exec.dir.name}/${scalaint.exec.name}" + perm="ugo+rx"/> </target> <target name="test.stability" depends="build.strap"> @@ -643,6 +663,17 @@ GENERATES A DISTRIBUTION perm="ugo+rx"/> <chmod file="${dist.current.dir}/bin/${scala.exec.name}" perm="ugo+rx"/> + <lockertool file="${dist.current.dir}/bin/${scalaint.exec.name}" + name="Scala interpreter" + class="scala.tools.nsc.MainInterpreter" + version="${version.number}" + copyright="${copyright}" + classpath="" + javaFlags="-Xmx256M -Xms16M"/> + <chmod file="${dist.current.dir}/bin/${scalaint.exec.name}" + perm="ugo+rx"/> + + <if><isset property="os.unix"/> <then> <symlink link="${dist.latest.dir}" @@ -659,9 +690,10 @@ GENERATES A DISTRIBUTION version="${version.number}" desc="The Scala compiler. This is used to compile Scala programs into Java .class files." - depends="${scalac.sbaz.name}-support"> + depends="scalac2-support"> <libset dir="${dist.current.dir}/lib" includes="${dist.name}-compiler.jar"/> <binset dir="${dist.current.dir}/bin" includes="${scalac.exec.name}"/> + <binset dir="${dist.current.dir}/bin" includes="${scalac.exec.name}.bat"/> <manset dir="${docs.dir}/man" includes="${scalac.exec.name}.1"/> </quicksbaz> @@ -675,6 +707,7 @@ 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="${scala.exec.name}"/> + <binset dir="${dist.current.dir}/bin" includes="${scala.exec.name}.bat"/> <manset dir="${docs.dir}/man" includes="${scala.exec.name}.1"/> </quicksbaz> @@ -686,6 +719,17 @@ managed directory."> desc="The base Scala library, required for running all Scala programs."> <libset dir="${dist.current.dir}/lib" includes="${dist.name}-library.jar"/> </quicksbaz> + + <quicksbaz + file="${dist.dir}/${scalaint.sbaz.name}-${version.number}.sbp" + adfile="${dist.dir}/${scalaint.sbaz.name}-${version.number}.advert" + name="${scalaint.sbaz.name}" + version="${version.number}" + depends="${scalac.sbaz.name}" + desc="A command-line interpreter for Scala."> + <binset dir="${dist.current.dir}/bin" includes="${scalaint.exec.name}"/> + <binset dir="${dist.current.dir}/bin" includes="${scalaint.exec.name}.bat"/> + </quicksbaz> </target> <!-- =========================================================================== |