diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2008-05-05 11:22:35 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2008-05-05 11:22:35 +0000 |
| commit | 2358b9d7211cd8611ed61c4cdef9f4d99fa9f437 (patch) | |
| tree | 985d45432ad918a406d59885c6207a55d71d2c01 /java/module.xml | |
| parent | caf22ff7b52b845b5313033de91dfd312b14a396 (diff) | |
| download | qpid-python-2358b9d7211cd8611ed61c4cdef9f4d99fa9f437.tar.gz | |
QPID-998 : prevented warning about missing bin/etc directories in modules that don't have bin or etc.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@653427 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/module.xml')
| -rw-r--r-- | java/module.xml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/java/module.xml b/java/module.xml index b89291d79f..d2ad47534e 100644 --- a/java/module.xml +++ b/java/module.xml @@ -26,6 +26,7 @@ <globmapper from="${project.root}${file.separator}*" to="*"/> </map> + <echo message="Running ant for module : ${module}"/> <property file="${project.root}/build.deps"/> @@ -39,6 +40,10 @@ <property name="module.bin" location="bin"/> <property name="module.etc" location="etc"/> + <available property="module.test.src.exists" file="${module.test.src}"/> + <available property="module.etc.exists" file="${module.etc}"/> + <available property="module.bin.exists" file="${module.bin}"/> + <map property="module.name" value="${module}"> <filtermapper> <replacestring from="${file.separator}" to="-"/> @@ -150,8 +155,6 @@ </copy> </target> - <available property="module.test.src.exists" file="${module.test.src}"/> - <target name="precompile-tests" if="module.test.src.exists"/> <target name="compile-tests" depends="compile,precompile-tests" if="module.test.src.exists" @@ -218,16 +221,21 @@ </junit> </target> - <target name="build" depends="jar,libs" description="compile and copy resources into build tree"> + + <target name="copy-bin" if="module.bin.exists" description="copy bin directory if it exists to build tree"> <copy todir="${build.bin}" failonerror="false"> <fileset dir="${module.bin}"/> </copy> <chmod dir="${build.bin}" perm="ugo+rx" includes="**/*"/> - <copy todir="${build.etc}" failonerror="false"> + </target> + + <target name="copy-etc" if="module.etc.exists" description="copy etc directory if it exists to build tree"> + <copy todir="${build.etc}" failonerror="false"> <fileset dir="${module.etc}"/> </copy> </target> + <target name="build" depends="jar,jar-tests,libs,copy-bin,copy-etc" description="compile and copy resources into build tree"/> <target name="jar.manifest" depends="compile" if="module.manifest"> <jar destfile="${module.jar}" basedir="${module.classes}" manifest="${module.manifest}"/> </target> |