diff options
| author | Stephen D. Huston <shuston@apache.org> | 2011-10-21 14:42:12 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2011-10-21 14:42:12 +0000 |
| commit | f83677056891e436bf5ba99e79240df2a44528cd (patch) | |
| tree | 625bfd644b948e89105630759cf6decb0435354d /cpp/managementgen | |
| parent | ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 (diff) | |
| download | qpid-python-QPID-2519.tar.gz | |
Merged out from trunkQPID-2519
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187375 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/managementgen')
| -rw-r--r-- | cpp/managementgen/Makefile.am | 12 | ||||
| -rwxr-xr-x | cpp/managementgen/qmfgen/schema.py | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/cpp/managementgen/Makefile.am b/cpp/managementgen/Makefile.am index 6c2024ccaa..4fc5edcad4 100644 --- a/cpp/managementgen/Makefile.am +++ b/cpp/managementgen/Makefile.am @@ -19,20 +19,26 @@ qmfpythondir = $(pythondir) dist_bin_SCRIPTS = \ qmf-gen -nobase_qmfpython_DATA = \ + +pkgpyexec_qmfgendir = $(pyexecdir)/qmfgen +pkgpyexec_qmfgen_PYTHON = \ qmfgen/__init__.py \ qmfgen/generate.py \ qmfgen/schema.py \ + qmfgen/management-types.xml + +pkgpyexec_qmfgentmpldir = $(pyexecdir)/qmfgen/templates +pkgpyexec_qmfgentmpl_PYTHON = \ qmfgen/templates/Args.h \ qmfgen/templates/Class.cpp \ qmfgen/templates/Class.h \ + qmfgen/templates/CMakeLists.cmake \ qmfgen/templates/Event.cpp \ qmfgen/templates/Event.h \ qmfgen/templates/Makefile.mk \ qmfgen/templates/Package.cpp \ qmfgen/templates/Package.h \ qmfgen/templates/V2Package.cpp \ - qmfgen/templates/V2Package.h \ - qmfgen/management-types.xml + qmfgen/templates/V2Package.h EXTRA_DIST = $(nobase_qmfpython_DATA) CMakeLists.txt diff --git a/cpp/managementgen/qmfgen/schema.py b/cpp/managementgen/qmfgen/schema.py index afdfe42639..59e951fb6e 100755 --- a/cpp/managementgen/qmfgen/schema.py +++ b/cpp/managementgen/qmfgen/schema.py @@ -1731,9 +1731,9 @@ class SchemaPackage: stream.write(" qmf::SchemaProperty arg(\"%s\", %s);\n" % (arg.name, typeName)) if subType: stream.write(" arg.setSubtype(\"%s\");\n" % subType) - if stat.unit: + if arg.unit: stream.write(" arg.setUnit(\"%s\");\n" % arg.unit) - if stat.desc: + if arg.desc: stream.write(" arg.setDesc(\"%s\");\n" % arg.desc) stream.write(" arg.setDirection(%s);\n" % self.qmfv2Dir(arg.dir)) stream.write(" method.addArgument(arg);\n") |