diff options
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 36 |
1 files changed, 14 insertions, 22 deletions
@@ -1837,18 +1837,10 @@ TODO: <copy toDir="${dist.dir}/lib"> <fileset dir="${build-pack.dir}/lib"> <include name="jline.jar"/> - <include name="scalacheck.jar"/> - <include name="scala-partest.jar"/> <include name="scalap.jar"/> </fileset> </copy> - <copy todir="${dist.dir}/lib"> - <resources refid="partest.extras.fileset"/> - <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" - from="${partest.extras.versions}" to="flatten"/> - </copy> - <mkdir dir="${dist.dir}/bin"/> <!-- TODO - Stop being inefficient and don't copy OSGi bundles overtop other jars. --> <copy-bundle name="scala-library"/> @@ -1869,27 +1861,27 @@ TODO: </target> <target name="dist.doc" depends="dist.base, docs.done"> - <mkdir dir="${dist.dir}/doc/scala-devel-docs"/> + <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"/> - <copy file="${docs.dir}/README" toDir="${dist.dir}/doc"/> - <mkdir dir="${dist.dir}/doc/scala-devel-docs/api"/> - <copy toDir="${dist.dir}/doc/scala-devel-docs/api"> - <fileset dir="${build-docs.dir}/library"/> + <copy file="${docs.dir}/README" toDir="${dist.dir}/doc"/> + <copy toDir="${dist.dir}/doc/licenses"> + <fileset dir="${docs.dir}/licenses"/> </copy> - <mkdir dir="${dist.dir}/doc/scala-devel-docs/examples"/> - <copy toDir="${dist.dir}/doc/scala-devel-docs/examples"> - <fileset dir="${docs.dir}/examples"> - <exclude name="**/*.desired.sha1"/> - </fileset> - </copy> - <mkdir dir="${dist.dir}/doc/scala-devel-docs/tools"/> - <copy toDir="${dist.dir}/doc/scala-devel-docs/tools"> + <copy toDir="${dist.dir}/doc/tools"> <fileset dir="${build-docs.dir}/manual/html"/> </copy> + + <mkdir dir="${dist.dir}/api"/> + <copy toDir="${dist.dir}/api"> + <fileset dir="${build-docs.dir}/library"/> + </copy> <copy file="${src.dir}/swing/doc/README" - toFile="${dist.dir}/doc/scala-devel-docs/README.scala-swing"/> + toFile="${dist.dir}/api/README.scala-swing"/> </target> + <target name="dist.man" depends="dist.base"> <mkdir dir="${dist.dir}/man"/> <copy toDir="${dist.dir}/man"> |