diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-13 10:07:09 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-13 10:07:09 -0800 |
| commit | 1e530365fd3a1ab749091e7c56850405dc98aed1 (patch) | |
| tree | e98e6e16c5f6fd003ef4c6581fa8a97f215ccfed /build.xml | |
| parent | d614965f083981817bfa08b84a07c069987d0a78 (diff) | |
| parent | 3bfd83971ec48102fd1e711236f5a313c6a1ce3e (diff) | |
| download | scala-1e530365fd3a1ab749091e7c56850405dc98aed1.tar.gz scala-1e530365fd3a1ab749091e7c56850405dc98aed1.tar.bz2 scala-1e530365fd3a1ab749091e7c56850405dc98aed1.zip | |
Merge pull request #3265 from retronym/merge/2.10.x-to-master
Merge 2.10.x to master
Diffstat (limited to 'build.xml')
| -rwxr-xr-x | build.xml | 35 |
1 files changed, 19 insertions, 16 deletions
@@ -1715,29 +1715,32 @@ TODO: <target name="dist.doc" depends="dist.base, docs.done"> - <mkdir dir="${dist.dir}/doc/scala-devel-docs"/> - <copy toDir="${dist.dir}/doc/scala-devel-docs" overwrite="true" flatten="true"> - <file file="${scala-xml-javadoc}"/> - <file file="${scala-parser-combinators-javadoc}"/> + <mkdir dir="${dist.dir}/doc"/> + <mkdir dir="${dist.dir}/doc/licenses"/> + <mkdir dir="${dist.dir}/doc/tools"/> + <copy file="${docs.dir}/LICENSE" toDir="${dist.dir}/doc" overwrite="true"/> + <copy file="${docs.dir}/README" toDir="${dist.dir}/doc" overwrite="true"/> + <copy toDir="${dist.dir}/doc/licenses" overwrite="true"> + <fileset dir="${docs.dir}/licenses"/> + </copy> + <copy toDir="${dist.dir}/doc/tools" overwrite="true"> + <fileset dir="${build-docs.dir}/manual/html"/> </copy> - <copy file="${docs.dir}/LICENSE" toDir="${dist.dir}/doc" overwrite="true"/> - <copy file="${docs.dir}/README" toDir="${dist.dir}/doc" overwrite="true"/> - <mkdir dir="${dist.dir}/doc/scala-devel-docs/api"/> - <copy toDir="${dist.dir}/doc/scala-devel-docs/api" overwrite="true"> + <mkdir dir="${dist.dir}/api"/> + <copy toDir="${dist.dir}/api" overwrite="true"> <fileset dir="${build-docs.dir}/library"/> </copy> - <mkdir dir="${dist.dir}/doc/scala-devel-docs/examples"/> - <copy toDir="${dist.dir}/doc/scala-devel-docs/examples" overwrite="true"> - <fileset dir="${docs.dir}/examples"> - <exclude name="**/*.desired.sha1"/> - </fileset> - </copy> <copy file="${src.dir}/swing/doc/README" - toFile="${dist.dir}/doc/scala-devel-docs/README.scala-swing" - overwrite="true"/> + toFile="${dist.dir}/api/README.scala-swing" overwrite="true"/> + <copy toDir="${dist.dir}/doc/api" overwrite="true" flatten="true"> + <file file="${scala-xml-javadoc}"/> + <file file="${scala-parser-combinators-javadoc}"/> + </copy> + </target> + <target name="dist.man" depends="dist.base, docs.man"> <mkdir dir="${dist.dir}/man"/> <copy toDir="${dist.dir}/man" overwrite="true"> |