diff options
| author | Stephen D. Huston <shuston@apache.org> | 2011-10-21 01:19:00 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2011-10-21 01:19:00 +0000 |
| commit | ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 (patch) | |
| tree | dcfb94e75656c6c239fc3dcb754cd2015126424d /cpp/managementgen | |
| parent | 5eb354b338bb8d8fcd35b6ac3fb33f8103e757c3 (diff) | |
| download | qpid-python-ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5.tar.gz | |
Undo bad merge from trunk - merged at wrong level.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 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, 5 insertions, 11 deletions
diff --git a/cpp/managementgen/Makefile.am b/cpp/managementgen/Makefile.am index 4fc5edcad4..6c2024ccaa 100644 --- a/cpp/managementgen/Makefile.am +++ b/cpp/managementgen/Makefile.am @@ -19,26 +19,20 @@ qmfpythondir = $(pythondir) dist_bin_SCRIPTS = \ qmf-gen - -pkgpyexec_qmfgendir = $(pyexecdir)/qmfgen -pkgpyexec_qmfgen_PYTHON = \ +nobase_qmfpython_DATA = \ 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/templates/V2Package.h \ + qmfgen/management-types.xml EXTRA_DIST = $(nobase_qmfpython_DATA) CMakeLists.txt diff --git a/cpp/managementgen/qmfgen/schema.py b/cpp/managementgen/qmfgen/schema.py index 59e951fb6e..afdfe42639 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 arg.unit: + if stat.unit: stream.write(" arg.setUnit(\"%s\");\n" % arg.unit) - if arg.desc: + if stat.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") |