summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-06-07 13:29:28 +0000
committermichelou <michelou@epfl.ch>2006-06-07 13:29:28 +0000
commit61441aa3be1c4ecc50845e15b909b95eee5a5e83 (patch)
treed64b0396189e852192a0521c3a326f33e5b61fe9
parentf6bdc80cf21942b21e9cb30b0b030684a913af26 (diff)
downloadscala-61441aa3be1c4ecc50845e15b909b95eee5a5e83.tar.gz
scala-61441aa3be1c4ecc50845e15b909b95eee5a5e83.tar.bz2
scala-61441aa3be1c4ecc50845e15b909b95eee5a5e83.zip
now copy generated man pages to the distribution
-rw-r--r--build.xml7
-rw-r--r--docs/man/build.xml2
2 files changed, 5 insertions, 4 deletions
diff --git a/build.xml b/build.xml
index e85103b208..c0f9948bf4 100644
--- a/build.xml
+++ b/build.xml
@@ -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}"/>