diff options
-rw-r--r-- | build.xml | 7 | ||||
-rw-r--r-- | docs/man/build.xml | 2 |
2 files changed, 5 insertions, 4 deletions
@@ -477,7 +477,7 @@ BUILD QUICK-TEST LAYER copyright="${copyright.string}"/> <quicktool file="${quick.dir}/bin/${fsc.exec.name}" - name="Fast Scala compiler" + name="Scala scripting tool" class="scala.tools.nsc.CompileClient" version="${version.number}" copyright="${copyright.string}"/> @@ -607,7 +607,7 @@ TEST copyright="${copyright.string}"/> <straptool file="${strap.dir}/bin/${fsc.exec.name}" - name="Fast Scala compiler" + name="Scala scripting tool" class="scala.tools.nsc.CompileClient" version="${version.number}" copyright="${copyright.string}"/> @@ -785,8 +785,9 @@ GENERATES A DISTRIBUTION <copy todir="${dist.current.dir}/doc/scala/examples"> <fileset dir="${docs.dir}/examples"/> </copy> + <ant dir="${docs.dir}/man" target="dist" inheritAll="false"/> <copy todir="${dist.current.dir}/man"> - <fileset dir="${docs.dir}/man"/> + <fileset dir="${docs.dir}/man/dists" includes="**/*.1"/> </copy> <!-- Recreate the 'latest' link to point to this distribution --> <if><isset property="os.win"/> diff --git a/docs/man/build.xml b/docs/man/build.xml index 012ac076da..c079d4e1c5 100644 --- a/docs/man/build.xml +++ b/docs/man/build.xml @@ -14,7 +14,7 @@ <property name="dist.dir" value="${basedir}/dists"/> <target name="init"> - <echo level="verbose">scala.dir=${scala.dir}</echo> + <echo level="verbose">scala.lib.dir=${scala.lib.dir}</echo> <fail message="A required Scala library is missing."> <condition><not><and> <available file="${scala-library.jar}"/> |