summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-10-20 08:56:39 +0200
committerJason Zaugg <jzaugg@gmail.com>2013-10-20 09:05:07 +0200
commitf06e833d783c0bbb15edf03e878a06b3ed139472 (patch)
tree642045346af405e25a3a156e45b1721e7daafbd9 /build.xml
parent8848f241616627b0c5beca38a5107c4eca3e10fd (diff)
downloadscala-f06e833d783c0bbb15edf03e878a06b3ed139472.tar.gz
scala-f06e833d783c0bbb15edf03e878a06b3ed139472.tar.bz2
scala-f06e833d783c0bbb15edf03e878a06b3ed139472.zip
Fix problem assembling sources and docs of modules.
A recent commit added 'overwrite=true' to all usages of the Ant copy task. This was enough to show up a bug in our dist.src and dist.docs tasks, as was seen on the Windows build: Failed to copy: C:\Users\scala\.m2\repository\org\scala-lang\modules\scala-xml_2.11.0-M5\1.0-RC4\scala-xml_2.11.0-M5-1.0-RC4-javadoc.jar to H:\jenkins\workspace\scala-nightly-windows\dists\scala-2.11.0-20131019-064627-8848f24161\doc\scala-devel-docs\C:\Users\scala\.m2\repository\org\scala-lang\modules\scala-xml_2.11.0-M5\1.0-RC4\scala-xml_2.11.0-M5-1.0-RC4-javadoc.jar ... This commit uses a "flattening" copy to put the JARs directly into scala-devel-docs. The Ant docs note [1] this gotcha: > Note that some resources (for example the file resource) return > absolute paths as names and the result of using them without > using a nested mapper (or the flatten attribute) may not be what > you expect. These appear to be the only places we fell into the trap: ack '<file\b' --xml build.xml 1948: <file file="${scala-xml-javadoc}"/> 1949: <file file="${scala-parser-combinators-javadoc}"/> 1992: <file-sets/> 2007: <file file="${scala-xml-sources}"/> 2008: <file file="${scala-parser-combinators-sources}"/> [1] http://ant.apache.org/manual/Tasks/copy.html
Diffstat (limited to 'build.xml')
-rwxr-xr-xbuild.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index d99f4669e0..b28e6d4e8e 100755
--- a/build.xml
+++ b/build.xml
@@ -1944,7 +1944,7 @@ 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">
+ <copy toDir="${dist.dir}/doc/scala-devel-docs" overwrite="true" flatten="true">
<file file="${scala-xml-javadoc}"/>
<file file="${scala-parser-combinators-javadoc}"/>
</copy>
@@ -2003,7 +2003,7 @@ TODO:
<target name="dist.src" depends="dist.base">
<mkdir dir="${dist.dir}/src"/>
- <copy toDir="${dist.dir}/src" overwrite="true">
+ <copy toDir="${dist.dir}/src" overwrite="true" flatten="true">
<file file="${scala-xml-sources}"/>
<file file="${scala-parser-combinators-sources}"/>
</copy>