diff options
-rw-r--r-- | debian/simpbuild.xml | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/debian/simpbuild.xml b/debian/simpbuild.xml index 8ad85e8f7a..3a72392b57 100644 --- a/debian/simpbuild.xml +++ b/debian/simpbuild.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- This is a simplified build file for Scala on Debian --> -<!-- $Id --> +<!-- $Id$ --> <project name="scala" default="build"> <property environment="env"/> @@ -59,7 +59,7 @@ <property name="scala.exec.name" value="${dist.name}"/> <property name="scalac.exec.name" value="scalac"/> <property name="scaladoc.exec.name" value="scaladoc"/> - <property name="scalaint.exec.name" value="scalaint"/> + <property name="fsc.exec.name" value="fsc"/> <!-- Shorcut names --> <property name="build.lib.dir" value="${build.dir}/${lib.dir.name}"/> @@ -125,10 +125,8 @@ <pathelement location="${starr.comp.jar}"/> </path> - <property name="os.type" value="UNIX"/> - <!-- Printing out some information about what environment I am running in --> <echo level="info" @@ -155,7 +153,6 @@ /> <echo level="verbose" message="version.number=${version.number}"/> - <!-- Creating tasks --> <taskdef name="starr" @@ -208,8 +205,6 @@ </sequential> </macrodef> - - <target name="build"> <!-- Build library --> <mkdir dir="${build.lib.dir}"/> @@ -272,7 +267,7 @@ </classpath> <include name="**/*.scala"/> </starr> - + <!-- Build jars --> <mkdir dir="${build.jar.dir}"/> <jar destfile="${build.jar.dir}/${comp.jar.name}"> @@ -306,7 +301,6 @@ <attribute name="Signature-Version" value="${version.number}"/> </manifest> </jar> - <!-- build tool scripts --> <mkdir dir="${build.bin.dir}"/> @@ -336,8 +330,8 @@ javaFlags="-Xmx256M -Xms16M" /> <starrtool - file="${build.bin.dir}/fsc" - name="Fasc Scala compiler" + file="${build.bin.dir}/${fsc.exec.name}" + name="Fast Scala compiler" class="scala.tools.nsc.CompileClient" version="${version.number}" copyright="${copyright}" @@ -345,8 +339,6 @@ /> </target> - - <target name="docs.lib"> <mkdir dir="${api.lib.dir}"/> <starrdoc @@ -384,7 +376,7 @@ </fileset> </copy> </target> - + <target name="docs" depends="docs.lib, docs.manual"/> <target name="dist" @@ -464,7 +456,6 @@ <arg line="-v install -f ${dist.sbaz.dir}/${sbaz.scala.name}-${version.number}.sbp"/> </exec> </target> - <target name="clean"> <delete @@ -474,4 +465,5 @@ failonerror="no" /> </target> + </project> |