From patchwork Mon Apr 18 15:02:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 91772 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9FCEEB6FCF for ; Tue, 19 Apr 2011 01:03:54 +1000 (EST) Received: from localhost ([::1]:34081 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBpzT-0006v1-SP for incoming@patchwork.ozlabs.org; Mon, 18 Apr 2011 11:03:51 -0400 Received: from eggs.gnu.org ([140.186.70.92]:39413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBpyw-0006gs-MQ for qemu-devel@nongnu.org; Mon, 18 Apr 2011 11:03:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QBpyr-0000nP-G0 for qemu-devel@nongnu.org; Mon, 18 Apr 2011 11:03:18 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:42593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBpyr-0000nJ-Af for qemu-devel@nongnu.org; Mon, 18 Apr 2011 11:03:13 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e36.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p3IEvhed012267 for ; Mon, 18 Apr 2011 08:57:43 -0600 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id p3IF390a099842 for ; Mon, 18 Apr 2011 09:03:11 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p3IF38uK022044 for ; Mon, 18 Apr 2011 09:03:09 -0600 Received: from localhost.localdomain (sig-9-65-250-146.mts.ibm.com [9.65.250.146]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p3IF2eZk019079; Mon, 18 Apr 2011 09:03:08 -0600 From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 18 Apr 2011 10:02:23 -0500 Message-Id: <1303138953-1334-8-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1303138953-1334-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1303138953-1334-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.110.154 Cc: aliguori@linux.vnet.ibm.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, Jes.Sorensen@redhat.com Subject: [Qemu-devel] [RFC][PATCH v2 07/17] qapi: qmp-gen.py, use basename of path for guard/core prefix X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To avoid errors when generating output to a seperate subdirectory, use only the filename, minus any leading directories, when passing it into functions to be used as a prefix for header guards, includes, etc. Also, trim file extensions based on "." seperator instead of assuming a single-char extension and trimming the last 2 chars Signed-off-by: Michael Roth --- qmp-gen.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qmp-gen.py b/qmp-gen.py index 3667ec5..eeef58c 100644 --- a/qmp-gen.py +++ b/qmp-gen.py @@ -2047,10 +2047,11 @@ def generate(kind, output): enum_types = [] event_types = {} indent_level = 0 + prefix = output.split("/")[-1].split(".")[0] - guard = '%s_H' % c_var(output[:-2]).upper() - core = '%s-core.h' % output[:-2] - header = '%s.h' % output[:-2] + guard = '%s_H' % c_var(prefix).upper() + core = '%s-core.h' % prefix + header = '%s.h' % prefix if kind.endswith('body') or kind.endswith('header'): ret = mcgen(''' @@ -2387,7 +2388,7 @@ void qcfg_options_init(void) return ret def main(args): - if len(args) != 2: + if len(args) < 2: return 1 if not args[0].startswith('--'): return 1