You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2008/09/17 16:20:08 UTC
svn commit: r696314 - in /incubator/qpid/trunk/qpid/cpp/managementgen:
qmf-gen qmf/generate.py
Author: tross
Date: Wed Sep 17 07:20:07 2008
New Revision: 696314
URL: http://svn.apache.org/viewvc?rev=696314&view=rev
Log:
Backed out makefile-dependency changes. They break vpath builds
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=696314&r1=696313&r2=696314&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen Wed Sep 17 07:20:07 2008
@@ -54,7 +54,7 @@
for schemafile in args:
package = SchemaPackage (typefile, schemafile, opts)
- gen.setPackage (package.packageName, schemafile)
+ gen.setPackage (package.packageName)
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=696314&r1=696313&r2=696314&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/qmf/generate.py (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/qmf/generate.py Wed Sep 17 07:20:07 2008
@@ -100,11 +100,10 @@
class Makefile:
""" Object representing a makefile fragment """
- def __init__ (self, filelists, templateFiles, packagelist, inputList):
+ def __init__ (self, filelists, templateFiles, packagelist):
self.filelists = filelists
self.templateFiles = templateFiles
self.packagelist = packagelist
- self.inputList = inputList
def genGenSources (self, stream, variables):
mdir = variables["mgenDir"]
@@ -113,16 +112,15 @@
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)
- for input in self.inputList:
- stream.write(" \\\n $(srcdir)/" + input)
+ stream.write (" \\\n ")
+ stream.write (mdir + "/qmf/templates/" + template)
def genGenCppFiles (self, stream, variables):
first = True
@@ -194,12 +192,10 @@
self.filelists["cpp"] = []
self.filelists["mk"] = []
self.packagelist = []
- self.inputList = []
self.templateFiles = []
self.variables = {}
- def setPackage (self, packageName, schemaFile):
- self.inputList.append(schemaFile)
+ def setPackage (self, packageName):
path = "/".join(packageName.split("."))
self.packagelist.append(path)
self.packagePath = self.normalize(self.dest + path)
@@ -320,7 +316,7 @@
def makeSingleFile (self, templateFile, target, force=False):
""" Generate a single expanded template """
- makefile = Makefile (self.filelists, self.templateFiles, self.packagelist, self.inputList)
+ makefile = Makefile (self.filelists, self.templateFiles, self.packagelist)
template = Template (self.input + templateFile, self)
self.templateFiles.append (templateFile)
stream = template.expand (makefile)