diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-12-18 22:58:09 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-12-18 22:58:09 +0000 |
| commit | acbc9230d2dbe48fea152fc08ec1bf4187acd364 (patch) | |
| tree | 85984e776c6af08950ed568a41ec6c75cec137a7 /java/common/build.xml | |
| parent | c4b3e38342dad29789e7fede4c7686a23be1a685 (diff) | |
| download | qpid-python-acbc9230d2dbe48fea152fc08ec1bf4187acd364.tar.gz | |
QPID-4458: remove unused subdirs and files from gentools then move the remainder src to java/common/gentools.
- Integrate into the java common module build process
- Retrieve the Velocity dependencies using Ivy.
- Remove unused java/common/protocol-version.xml and cpp/src/generate.sh files.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1423705 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common/build.xml')
| -rw-r--r-- | java/common/build.xml | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/java/common/build.xml b/java/common/build.xml index 9caf93c026..e599c840db 100644 --- a/java/common/build.xml +++ b/java/common/build.xml @@ -53,7 +53,15 @@ </target> <target name="compile_gentools"> - <ant dir="${gentools.home}" /> + <mkdir dir="${gentools.build}/classes"/> + <javac srcdir="${gentools.home}/src" destdir="${gentools.build}/classes" source="${java.source}" target="${java.target}" fork="true" includeantruntime="false"> + <classpath> + <fileset dir="${project.root}"> + <include name="${velocity.jar}"/> + <include name="${velocity-dep.jar}"/> + </fileset> + </classpath> + </javac> </target> <target name="check_gentool_deps"> @@ -64,15 +72,12 @@ <target name="gentools" depends="compile_gentools,check_gentool_deps" unless="gentools.notRequired"> <mkdir dir="${framing.generated.dir}"/> - <java classname="org.apache.qpid.gentools.Main" fork="true" dir="${gentools.home}/src" failonerror="true"> + <java classname="org.apache.qpid.gentools.Main" fork="true" dir="${gentools.build}/classes" failonerror="true"> <arg line='-j -o "${framing.generated.dir}" -t "${project.root}/common/templates" ${xml.spec.list}'/> <classpath> - <pathelement path="${gentools.home}/src" /> - <fileset dir="${gentools.home}/lib"> - <include name="**/*.jar"/> - </fileset> - <pathelement path="${gentools.home}/lib/velocity-1.4.jar" /> - <pathelement path="${gentools.home}/lib/velocity-dep-1.4.jar" /> + <pathelement path="${gentools.build}/classes" /> + <pathelement path="${project.root}/${velocity.jar}" /> + <pathelement path="${project.root}/${velocity-dep.jar}" /> </classpath> </java> <touch file="${gentools.timestamp}" /> |