Commit 3878fbd5 authored by Doug Goldstein's avatar Doug Goldstein Committed by Daniel P. Berrange

Break generator.py to be called per module

Since we don't always want to build all the modules, and there might be
more modules added in the future but we want to retain backwards
compatibility with older libvirts, change generator.py to be called once
per module instead of with all modules at once.
parent 41562e06
......@@ -17,11 +17,6 @@ import re
quiet=True
coreapifile = sys.argv[1]
lxcapifile = sys.argv[2]
qemuapifile = sys.argv[3]
#######################################################################
#
# That part if purely the API acquisition phase from the
......@@ -1945,13 +1940,18 @@ def lxcBuildWrappers(module):
quiet = 0
if not os.path.exists("build"):
os.mkdir("build")
if buildStubs("libvirt", coreapifile) < 0:
sys.exit(1)
if buildStubs("libvirt-lxc", lxcapifile) < 0:
if buildStubs(sys.argv[1], sys.argv[2]) < 0:
sys.exit(1)
if buildStubs("libvirt-qemu", qemuapifile) < 0:
if sys.argv[1] == "libvirt":
buildWrappers(sys.argv[1])
elif sys.argv[1] == "libvirt-lxc":
lxcBuildWrappers(sys.argv[1])
elif sys.argv[1] == "libvirt-qemu":
qemuBuildWrappers(sys.argv[1])
else:
print "ERROR: unknown module %s" % sys.argv[1]
sys.exit(1)
buildWrappers("libvirt")
lxcBuildWrappers("libvirt-lxc")
qemuBuildWrappers("libvirt-qemu")
sys.exit(0)
......@@ -100,7 +100,9 @@ class my_build(build):
def run(self):
apis = self.get_api_xml_files()
self.spawn(["python", "generator.py", apis[0], apis[1], apis[2]])
self.spawn(["python", "generator.py", "libvirt", apis[0]])
self.spawn(["python", "generator.py", "libvirt-qemu", apis[1]])
self.spawn(["python", "generator.py", "libvirt-lxc", apis[2]])
build.run(self)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment