diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-12-22 21:02:41 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-12-22 21:08:55 +0100 |
| commit | b79ee63dae1df0a5d840a9e1fd20f965a5ce3461 (patch) | |
| tree | fb3a916fec95dedd2e65f4d94069d38f28755ef9 /build.xml | |
| parent | 9f0594c57716ed551918e15be6da843982e8ba12 (diff) | |
| download | scala-b79ee63dae1df0a5d840a9e1fd20f965a5ce3461.tar.gz scala-b79ee63dae1df0a5d840a9e1fd20f965a5ce3461.tar.bz2 scala-b79ee63dae1df0a5d840a9e1fd20f965a5ce3461.zip | |
Fix Ant uptodate checking in OSGI JAR creation
Changes to the compiler or library were not triggering recreation
of the OSGI JARs, which are used in the local maven deployment tasks.
Reason: this Ant-ipattern:
<fileset base="/foo">
<include name="/foo/bar.baz"/>
</fileset>
Instead, we should use a <filelist/>, which doesn't require
a base directory. This can be composed into a <srcresources/>
element in the <uptodate/>.
Phew!
Diffstat (limited to 'build.xml')
| -rwxr-xr-x | build.xml | 55 |
1 files changed, 31 insertions, 24 deletions
@@ -1175,13 +1175,17 @@ TODO: <mkdir dir="${build-osgi.dir}"/> <uptodate property="osgi.bundles.available" targetfile="${build-osgi.dir}/bundles.core.complete"> - <srcfiles dir="${basedir}"> - <include name="build.xml"/> - <include name="src/build/bnd/*.bnd"/> - <include name="${library.jar}"/> - <include name="${reflect.jar}"/> - <include name="${compiler.jar}"/> - </srcfiles> + <srcresources> + <fileset dir="${basedir}"> + <include name="build.xml"/> + <include name="src/build/bnd/*.bnd"/> + </fileset> + <filelist> + <file name="${library.jar}"/> + <file name="${reflect.jar}"/> + <file name="${compiler.jar}"/> + </filelist> + </srcresources> </uptodate> <if><not><isset property="osgi.bundles.available"/></not><then> @@ -1209,23 +1213,26 @@ TODO: <target name="osgi.done" depends="pack.done, osgi.core"> <uptodate property="osgi.all.bundles.available" targetfile="${build-osgi.dir}/bundles.all.complete"> - <srcfiles dir="${basedir}"> - <include name="build.xml"/> - <include name="src/build/bnd/*.bnd"/> - - <!-- TODO modularize compiler - <include name="${interactive.jar}"/> - <include name="${scaladoc.jar}"/> - --> - - <include name="${actors.jar}"/> - - <include name="${continuations-plugin.jar}"/> - <include name="${continuations-library.jar}"/> - <include name="${parser-combinators.jar}"/> - <include name="${xml.jar}"/> - <include name="${swing.jar}"/> - </srcfiles> + <srcresources> + <fileset dir="${basedir}"> + <include name="build.xml"/> + <include name="src/build/bnd/*.bnd"/> + </fileset> + <filelist> + <!-- TODO modularize compiler + <include name="${interactive.jar}"/> + <include name="${scaladoc.jar}"/> + --> + + <file name="${actors.jar}"/> + + <file name="${continuations-plugin.jar}"/> + <file name="${continuations-library.jar}"/> + <file name="${parser-combinators.jar}"/> + <file name="${xml.jar}"/> + <file name="${swing.jar}"/> + </filelist> + </srcresources> </uptodate> <if><not><isset property="osgi.all.bundles.available"/></not><then> |