qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: aliguori@linux.vnet.ibm.com, agl@linux.vnet.ibm.com,
	mdroth@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH 5/9] qapi: add --prefix option to type generator
Date: Fri, 29 Apr 2011 10:21:58 -0500	[thread overview]
Message-ID: <1304090522-5861-6-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1304090522-5861-1-git-send-email-mdroth@linux.vnet.ibm.com>

This is mainly so we can generate a header file with the filename
{prefix}qapi-types.h by passing in a test schema for use with unit
tests.

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 scripts/qapi-types.py |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index d645bad..e38a651 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -1,6 +1,7 @@
 from ordereddict import OrderedDict
 from qapi import *
 import sys
+import getopt
 
 def generate_fwd_struct(name, members):
     return mcgen('''
@@ -108,16 +109,33 @@ struct %(name)s
 
     return ret
 
-fdecl = open('qapi-types.h', 'w')
+try:
+    opts, args = getopt.gnu_getopt(sys.argv[1:], "p:", ["prefix="])
+except getopt.GetoptError, err:
+    print str(err)
+    sys.exit(1)
 
-exprs = parse_schema(sys.stdin)
+prefix = ""
+h_file = 'qapi-types.h'
+
+for o, a in opts:
+    if o in ("-p", "--prefix"):
+        prefix = a
+
+h_file = prefix + h_file
+
+fdecl = open(h_file, 'w')
 
-fdecl.write('''/* AUTOMATICALLY GENERATED, DO NOT MODIFY */
-#ifndef QAPI_TYPES_H
-#define QAPI_TYPES_H
+fdecl.write(mcgen('''
+/* AUTOMATICALLY GENERATED, DO NOT MODIFY */
+#ifndef %(guard)s
+#define %(guard)s
 
 #include "qapi-types-core.h"
-''')
+''',
+                  guard=guardname(h_file)))
+
+exprs = parse_schema(sys.stdin)
 
 for expr in exprs:
     ret = "\n"
-- 
1.7.0.4

  parent reply	other threads:[~2011-04-29 15:23 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-29 15:21 [Qemu-devel] [PULL] QAPI code generator fix-ups Michael Roth
2011-04-29 15:21 ` [Qemu-devel] [PATCH 1/9] qapi: Fix type generator for structured type members Michael Roth
2011-04-29 15:21 ` [Qemu-devel] [PATCH 2/9] qapi: input visiter, don't always allocate memory for structs Michael Roth
2011-04-29 15:21 ` [Qemu-devel] [PATCH 3/9] qapi: Fix visiter generator for nested structs/qobjects Michael Roth
2011-04-29 15:21 ` [Qemu-devel] [PATCH 4/9] qapi: some basename/guardname py utility functions Michael Roth
2011-04-29 15:21 ` Michael Roth [this message]
2011-04-29 15:21 ` [Qemu-devel] [PATCH 6/9] qapi: add --prefix option for visiter generator Michael Roth
2011-04-29 15:22 ` [Qemu-devel] [PATCH 7/9] qapi: test schema for test-visiter unit tests Michael Roth
2011-04-29 15:22 ` [Qemu-devel] [PATCH 8/9] qapi: Makefile, build test-visiter with generated test code Michael Roth
2011-04-29 15:22 ` [Qemu-devel] [PATCH 9/9] qapi: test-visiter, pull in gen code, tests for nested structures Michael Roth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1304090522-5861-6-git-send-email-mdroth@linux.vnet.ibm.com \
    --to=mdroth@linux.vnet.ibm.com \
    --cc=agl@linux.vnet.ibm.com \
    --cc=aliguori@linux.vnet.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).