diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-08 15:37:14 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-05-11 14:25:26 +0200 |
| commit | f7e1d7c35010fea6810d1917197cd6d5dde4822e (patch) | |
| tree | 5ff7d8e38ffd39aeed9c2cc591743a81f329872a /build-ant-macros.xml | |
| parent | e12ba55589192fc3a3cc7b441569fbcabc04dd33 (diff) | |
| download | scala-f7e1d7c35010fea6810d1917197cd6d5dde4822e.tar.gz scala-f7e1d7c35010fea6810d1917197cd6d5dde4822e.tar.bz2 scala-f7e1d7c35010fea6810d1917197cd6d5dde4822e.zip | |
Include ASM as a dependency in ANT build
The classfiles are still integrated into scala-compiler.jar.
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 259d6a6eb6..ace86cac49 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> |