summaryrefslogtreecommitdiff
path: root/java/module.xml
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2008-11-26 18:23:31 +0000
committerMartin Ritchie <ritchiem@apache.org>2008-11-26 18:23:31 +0000
commitcc1c75562925be828b024f2da14ac6152c6c5f51 (patch)
tree6a03cd0b6d8d173310ec44b8ea24e96d53f114e2 /java/module.xml
parent43e26ecb7cdb04cf7a9c7e87fa7902b7ebe3f5ce (diff)
downloadqpid-python-cc1c75562925be828b024f2da14ac6152c6c5f51.tar.gz
QPID-1243 : Applied patch from Robert Gemmell. Took a different approach for the linux binaries as the provided binaries requried a newer libc than I have. Also restored the qpidversion.properties file generation for this module that
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@720931 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/module.xml')
-rw-r--r--java/module.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/java/module.xml b/java/module.xml
index c487ffb134..2bcfa09f0c 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -26,6 +26,12 @@
<globmapper from="${project.root}${file.separator}*" to="*"/>
</map>
+ <map property="module.name" value="${module}">
+ <filtermapper>
+ <replacestring from="${file.separator}" to="-"/>
+ </filtermapper>
+ </map>
+
<echo message="Running ant for module : ${module}" level="info"/>
<property file="${project.root}/build.deps"/>
@@ -43,7 +49,7 @@
<property name="module.bin" location="bin"/>
<property name="module.etc" location="etc"/>
- <property name="module.namever" value="${project.name}-${module}-${project.version}"/>
+ <property name="module.namever" value="${project.name}-${module.name}-${project.version}"/>
<property name="module.release.base" value="${basedir}/release"/>
<property name="module.release" value="${module.release.base}/${module.namever}"/>
<property name="module.release.lib" value="${module.release}/lib"/>
@@ -62,12 +68,6 @@
<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="-"/>
- </filtermapper>
- </map>
-
<indirect name="module.libs" variable="${module.name}.libs"/>
<indirect name="module.test.libs" variable="${module.name}.test.libs"/>