diff options
Diffstat (limited to 'qpid/cpp')
| -rwxr-xr-x | qpid/cpp/managementgen/qmf-gen | 2 | ||||
| -rwxr-xr-x | qpid/cpp/managementgen/qmf/generate.py | 23 |
2 files changed, 17 insertions, 8 deletions
diff --git a/qpid/cpp/managementgen/qmf-gen b/qpid/cpp/managementgen/qmf-gen index 523579fe6c..a1d76ae234 100755 --- a/qpid/cpp/managementgen/qmf-gen +++ b/qpid/cpp/managementgen/qmf-gen @@ -54,7 +54,7 @@ if len(args) == 0: for schemafile in args: package = SchemaPackage (typefile, schemafile, opts) - gen.setPackage (package.packageName) + gen.setPackage (package.packageName, schemafile) gen.makeClassFiles ("Class.h", package) gen.makeClassFiles ("Class.cpp", package) gen.makeMethodFiles ("Args.h", package) diff --git a/qpid/cpp/managementgen/qmf/generate.py b/qpid/cpp/managementgen/qmf/generate.py index 7346200a28..a6b3932357 100755 --- a/qpid/cpp/managementgen/qmf/generate.py +++ b/qpid/cpp/managementgen/qmf/generate.py @@ -100,10 +100,11 @@ class Template: class Makefile: """ Object representing a makefile fragment """ - def __init__ (self, filelists, templateFiles, packagelist): + def __init__ (self, filelists, templateFiles, packagelist, inputList): self.filelists = filelists self.templateFiles = templateFiles self.packagelist = packagelist + self.inputList = inputList def genGenSources (self, stream, variables): mdir = variables["mgenDir"] @@ -112,15 +113,21 @@ class Makefile: stream.write (" " + mdir + "/qmf/generate.py \\\n") stream.write (" " + mdir + "/qmf/schema.py \\\n") stream.write (" " + mdir + "/qmf/management-types.xml \\\n") - stream.write (" " + sdir + "/management-schema.xml \\\n") first = True for template in self.templateFiles: if first: first = False - stream.write (" ") + stream.write(" ") else: - stream.write (" \\\n ") - stream.write (mdir + "/qmf/templates/" + template) + stream.write(" \\\n ") + stream.write(mdir + "/qmf/templates/" + template) + for input in self.inputList: + if first: + first = False + srteam.write(" ") + else: + stream.write(" \\\n ") + stream.write("$(srcdir)/" + input) def genGenCppFiles (self, stream, variables): first = True @@ -192,10 +199,12 @@ class Generator: self.filelists["cpp"] = [] self.filelists["mk"] = [] self.packagelist = [] + self.inputList = [] self.templateFiles = [] self.variables = {} - def setPackage (self, packageName): + def setPackage (self, packageName, schemaFile): + self.inputList.append(schemaFile) path = "/".join(packageName.split(".")) self.packagelist.append(path) self.packagePath = self.normalize(self.dest + path) @@ -316,7 +325,7 @@ class Generator: def makeSingleFile (self, templateFile, target, force=False): """ Generate a single expanded template """ - makefile = Makefile (self.filelists, self.templateFiles, self.packagelist) + makefile = Makefile (self.filelists, self.templateFiles, self.packagelist, self.inputList) template = Template (self.input + templateFile, self) self.templateFiles.append (templateFile) stream = template.expand (makefile) |