Author: tross
Date: Wed Sep 17 05:48:08 2008
New Revision: 696280
URL: http://svn.apache.org/viewvc?rev=696280&view=rev
Log:
Added missing Makefile dependencies for ACL and Cluster schema files
Modified:
incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen
incubator/qpid/trunk/qpid/cpp/managementgen/qmf/generate.py
Modified: incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen?rev=696280&r1=696279&r2=696280&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen Wed Sep 17 05:48:08 2008
@@ -54,7 +54,7 @@
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)
Modified: incubator/qpid/trunk/qpid/cpp/managementgen/qmf/generate.py
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/managementgen/qmf/generate.py?rev=696280&r1=696279&r2=696280&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/qmf/generate.py (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/qmf/generate.py Wed Sep 17
05:48:08 2008
@@ -100,10 +100,11 @@
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 @@
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 @@
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 @@
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)
