diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-12 17:36:04 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-12 17:36:04 +0200 |
| commit | d253702f9f23186cbf95f611c2fd1a2d08330ad6 (patch) | |
| tree | 9cd6198413ef8ea5e885559e4f3230373821c00c /build-ant-macros.xml | |
| parent | 819a559173c65ccf80a856ef46bc8f1d5996740a (diff) | |
| parent | 297eeb335cbc50be9107d3f49cc7eb0487514ca7 (diff) | |
| download | scala-d253702f9f23186cbf95f611c2fd1a2d08330ad6.tar.gz scala-d253702f9f23186cbf95f611c2fd1a2d08330ad6.tar.bz2 scala-d253702f9f23186cbf95f611c2fd1a2d08330ad6.zip | |
Merge commit '297eeb3' into merge-2.11-may-12
Diffstat (limited to 'build-ant-macros.xml')
| -rw-r--r-- | build-ant-macros.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build-ant-macros.xml b/build-ant-macros.xml index 246ff01a39..c44a361374 100644 --- a/build-ant-macros.xml +++ b/build-ant-macros.xml @@ -91,7 +91,7 @@ <macrodef name="simple-javac"> <attribute name="project"/> - <!-- project: asm/forkjoin --> + <!-- project: forkjoin --> <attribute name="args" default=""/> <attribute name="jar" default="yes"/> <sequential> @@ -371,6 +371,10 @@ <then> <mkdir dir="${build-pack.dir}/${@{project}.targetdir}"/> <pre/> + <!-- can't check if a fileset is defined, so we have an additional property --> + <if><not><isset property="pack.@{project}.include-jars.defined"/></not><then> + <fileset id="pack.@{project}.include-jars" dir="." excludes="**" /> + </then></if> <if> <not> <equals arg1="@{manifest}" arg2=""/> @@ -380,6 +384,7 @@ <!-- update="true" makes no difference on my machine, so starting from scratch--> <jar-opts/> <path refid="pack.@{project}.files"/> + <zipgroupfileset refid="pack.@{project}.include-jars"/> </jar> </then> <else> |