Author: tross
Date: Fri Sep 5 09:07:57 2008
New Revision: 692475
URL: http://svn.apache.org/viewvc?rev=692475&view=rev
Log:
QPID-1274 - Moved management-gen data files into the qmf subdirectory to fix an
install problem
Added:
incubator/qpid/trunk/qpid/cpp/managementgen/qmf/management-types.xml
- copied unchanged from r692450,
incubator/qpid/trunk/qpid/cpp/managementgen/management-types.xml
incubator/qpid/trunk/qpid/cpp/managementgen/qmf/templates/
incubator/qpid/trunk/qpid/cpp/managementgen/qmf/templates/Args.h
- copied unchanged from r692448,
incubator/qpid/trunk/qpid/cpp/managementgen/templates/Args.h
incubator/qpid/trunk/qpid/cpp/managementgen/qmf/templates/Class.cpp
- copied unchanged from r692448,
incubator/qpid/trunk/qpid/cpp/managementgen/templates/Class.cpp
incubator/qpid/trunk/qpid/cpp/managementgen/qmf/templates/Class.h
- copied unchanged from r692448,
incubator/qpid/trunk/qpid/cpp/managementgen/templates/Class.h
incubator/qpid/trunk/qpid/cpp/managementgen/qmf/templates/Makefile.mk
- copied unchanged from r692448,
incubator/qpid/trunk/qpid/cpp/managementgen/templates/Makefile.mk
incubator/qpid/trunk/qpid/cpp/managementgen/qmf/templates/Package.cpp
- copied unchanged from r692448,
incubator/qpid/trunk/qpid/cpp/managementgen/templates/Package.cpp
incubator/qpid/trunk/qpid/cpp/managementgen/qmf/templates/Package.h
- copied unchanged from r692448,
incubator/qpid/trunk/qpid/cpp/managementgen/templates/Package.h
Removed:
incubator/qpid/trunk/qpid/cpp/managementgen/management-types.xml
incubator/qpid/trunk/qpid/cpp/managementgen/templates/
Modified:
incubator/qpid/trunk/qpid/cpp/managementgen/Makefile.am
incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen
incubator/qpid/trunk/qpid/cpp/managementgen/qmf/generate.py
Modified: incubator/qpid/trunk/qpid/cpp/managementgen/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/managementgen/Makefile.am?rev=692475&r1=692474&r2=692475&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/Makefile.am Fri Sep 5 09:07:57
2008
@@ -1,18 +1,16 @@
-qmfdatadir = $(datadir)/qmf
qmfpythondir = $(pythondir)
dist_bin_SCRIPTS = \
qmf-gen
-nobase_qmfdata_DATA = \
- templates/Args.h \
- templates/Class.cpp \
- templates/Class.h \
- templates/Makefile.mk \
- templates/Package.cpp \
- templates/Package.h \
- management-types.xml
nobase_qmfpython_DATA = \
qmf/__init__.py \
qmf/generate.py \
- qmf/schema.py
+ qmf/schema.py \
+ qmf/templates/Args.h \
+ qmf/templates/Class.cpp \
+ qmf/templates/Class.h \
+ qmf/templates/Makefile.mk \
+ qmf/templates/Package.cpp \
+ qmf/templates/Package.h \
+ qmf/management-types.xml
-EXTRA_DIST = $(nobase_qmfdata_DATA) $(nobase_qmfpython_DATA)
+EXTRA_DIST = $(nobase_qmfpython_DATA)
Modified: incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen?rev=692475&r1=692474&r2=692475&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen Fri Sep 5 09:07:57 2008
@@ -24,16 +24,16 @@
from qmf.generate import Generator
from optparse import OptionParser
-dataPath = os.path.dirname(sys.argv[0])
+dataPath = os.path.dirname(sys.argv[0]) + "/qmf/"
# Set command line options
usage = "usage: %prog [options] schema-document out-directory"
parser = OptionParser (usage=usage)
parser.add_option ("-m", "--makefile", dest="makefile", metavar="FILE",
help="Makefile fragment")
-parser.add_option ("-t", "--typefile", dest="typefile", metavar="FILE",
default=dataPath + "/management-types.xml",
+parser.add_option ("-t", "--typefile", dest="typefile", metavar="FILE",
default=dataPath + "management-types.xml",
help="Type descriptor file")
-parser.add_option ("-d", "--templatedir", dest="templatedir", metavar="DIR",
default=dataPath + "/templates",
+parser.add_option ("-d", "--templatedir", dest="templatedir", metavar="DIR",
default=dataPath + "templates",
help="Template directory")
(opts, args) = parser.parse_args ()
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=692475&r1=692474&r2=692475&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/qmf/generate.py (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/qmf/generate.py Fri Sep 5
09:07:57 2008
@@ -110,7 +110,7 @@
stream.write (mdir + "/qmf-gen \\\n")
stream.write (" " + mdir + "/qmf/generate.py \\\n")
stream.write (" " + mdir + "/qmf/schema.py \\\n")
- stream.write (" " + mdir + "/management-types.xml \\\n")
+ stream.write (" " + mdir + "/qmf/management-types.xml \\\n")
stream.write (" " + sdir + "/management-schema.xml \\\n")
first = True
for template in self.templateFiles:
@@ -119,7 +119,7 @@
stream.write (" ")
else:
stream.write (" \\\n ")
- stream.write (mdir + "/templates/" + template)
+ stream.write (mdir + "/qmf/templates/" + template)
def genGenCppFiles (self, stream, variables):
first = True
