diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2008-04-18 18:35:51 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2008-04-18 18:35:51 +0000 |
| commit | 0840224977bc62171ed7dc310c61e3d1487db0e0 (patch) | |
| tree | 6ab6c5b9994825d28d31ba61413f5b0743168e0c | |
| parent | 8c1c77da5913dd8e94c1e214a654218f92dfb0a3 (diff) | |
| download | qpid-python-0840224977bc62171ed7dc310c61e3d1487db0e0.tar.gz | |
QPID-901: update pom to work with new codegen
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@649648 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/common/build.xml | 1 | ||||
| -rwxr-xr-x | qpid/java/common/codegen | 3 | ||||
| -rw-r--r-- | qpid/java/common/pom.xml | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/qpid/java/common/build.xml b/qpid/java/common/build.xml index 796385eff3..af27eb8d8f 100644 --- a/qpid/java/common/build.xml +++ b/qpid/java/common/build.xml @@ -45,6 +45,7 @@ <arg value="${basedir}/codegen"/> <arg value="${module.precompiled}"/> <arg value="${xml.spec.dir}/amqp.0-10-qpid-errata.xml"/> + <arg value="${basedir}"/> <classpath> <pathelement location="jython-2.2-rc2.jar"/> </classpath> diff --git a/qpid/java/common/codegen b/qpid/java/common/codegen index f5d1577774..ab1ab1c542 100755 --- a/qpid/java/common/codegen +++ b/qpid/java/common/codegen @@ -6,6 +6,7 @@ from genutil import * out_dir = sys.argv[1] spec_file = sys.argv[2] +tpl_dir = sys.argv[3] pkg_dir = os.path.join(out_dir, "org/apache/qpidity/transport") if not os.path.exists(pkg_dir): @@ -22,7 +23,7 @@ def excludes(nd): return True def execute(output, template, **kwargs): - f = open(template) + f = open(os.path.join(tpl_dir, template)) input = f.read() f.close() p = Parser(**kwargs) diff --git a/qpid/java/common/pom.xml b/qpid/java/common/pom.xml index 2f1a75915b..ee3ae1b0a7 100644 --- a/qpid/java/common/pom.xml +++ b/qpid/java/common/pom.xml @@ -85,14 +85,14 @@ <params> <param>-Dpython.cachedir.skip=true</param> <param>-Dpython.path=${basedir}/jython-lib.jar/Lib${path.separator}${mllib.dir}</param> - <param>${basedir}/generate</param> + <param>${basedir}/codegen</param> <param>${generated.path}</param> - <param>org.apache.qpidity.transport</param> - <param>${specs.dir}/amqp.0-10-preview.xml</param> + <param>${specs.dir}/amqp.0-10-qpid-errata.xml</param> + <param>${basedir}</param> </params> <sources> - <source>${specs.dir}/amqp.0-10-preview.xml</source> - <source>${basedir}/generate</source> + <source>${specs.dir}/amqp.0-10-qpid-errata.xml</source> + <source>${basedir}/codegen</source> </sources> <timestamp>${generated.path}/generated.timestamp</timestamp> </configuration> |