From patchwork Tue Aug 14 16:27:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 177363 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5F1B22C0085 for ; Wed, 15 Aug 2012 02:28:44 +1000 (EST) Received: from localhost ([::1]:34413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Jz0-0000FG-BX for incoming@patchwork.ozlabs.org; Tue, 14 Aug 2012 12:28:42 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Jyi-0008UG-Nh for qemu-devel@nongnu.org; Tue, 14 Aug 2012 12:28:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1Jyh-0006O7-Hw for qemu-devel@nongnu.org; Tue, 14 Aug 2012 12:28:24 -0400 Received: from mail-gg0-f173.google.com ([209.85.161.173]:56676) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Jyh-0006O2-DA for qemu-devel@nongnu.org; Tue, 14 Aug 2012 12:28:23 -0400 Received: by ggna5 with SMTP id a5so649557ggn.4 for ; Tue, 14 Aug 2012 09:28:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=xCSfoCuAhb+DtuT88PS32l0yY0/TH8Kay1FJxrr9KAI=; b=joquCm4aUjbEYKVdi6uddqaNPNPMOq0Tp0GkvV5Y3Mis7K9P0omfx38GFCST+bkXou yjbrWwDqVtSEtOSqw9QoVOMySUleUhk3JHPrY3GYBG31E3bXA9WfJaRpxG16ojVzAgjk GlFJyCPFxZ8R8cWrGC+nlr8FcxjQ76CVD3w7NE/i7NMYno2FcX8BAOlDiBmysDOECf3Y cQJEDhiMLUSDQZa+aqPBWtsjE/+csJRMTXdI7bv0Z3lcZF5by7wm6qbioN5BH/0Bvmrg xK+vj0m6TFkrjZVrdfddoUEoe+mfHFCRcHrBxjo4UgVf6Em5lP99RPdCwbzRD0kqJPTE KNfA== Received: by 10.50.168.66 with SMTP id zu2mr12875535igb.54.1344961702531; Tue, 14 Aug 2012 09:28:22 -0700 (PDT) Received: from loki.morrigu.org (cpe-72-179-62-111.austin.res.rr.com. [72.179.62.111]) by mx.google.com with ESMTPS id ul4sm11903203igb.15.2012.08.14.09.28.21 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Aug 2012 09:28:21 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 14 Aug 2012 11:27:08 -0500 Message-Id: <1344961646-21194-3-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344961646-21194-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1344961646-21194-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.161.173 Cc: blauwirbel@gmail.com, aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 02/20] qapi: qapi-types.py -> qapi_types.py 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 Python doesn't allow "-" in module names, so we need to rename the file so we can re-use bits of the codegen Signed-off-by: Michael Roth --- Makefile | 8 ++++---- scripts/{qapi-types.py => qapi_types.py} | 0 tests/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename scripts/{qapi-types.py => qapi_types.py} (100%) diff --git a/Makefile b/Makefile index 08c7d0e..e92ea6b 100644 --- a/Makefile +++ b/Makefile @@ -184,8 +184,8 @@ endif qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\ -$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") +$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi_types.py $(qapi-py) + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi_types.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h :\ $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi_visit.py $(qapi-py) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi_visit.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") @@ -194,8 +194,8 @@ $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-p $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, " GEN $@") qapi-types.c qapi-types.h :\ -$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "." < $<, " GEN $@") +$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi_types.py $(qapi-py) + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi_types.py $(gen-out-type) -o "." < $<, " GEN $@") qapi-visit.c qapi-visit.h :\ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi_visit.py $(qapi-py) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi_visit.py $(gen-out-type) -o "." < $<, " GEN $@") diff --git a/scripts/qapi-types.py b/scripts/qapi_types.py similarity index 100% rename from scripts/qapi-types.py rename to scripts/qapi_types.py diff --git a/tests/Makefile b/tests/Makefile index 3c05bdf..156105c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -52,8 +52,8 @@ tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(coroutine-obj-y) $(tools tests/test-iov$(EXESUF): tests/test-iov.o iov.o tests/test-qapi-types.c tests/test-qapi-types.h :\ -$(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o tests -p "test-" < $<, " GEN $@") +$(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi_types.py + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi_types.py $(gen-out-type) -o tests -p "test-" < $<, " GEN $@") tests/test-qapi-visit.c tests/test-qapi-visit.h :\ $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi_visit.py $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi_visit.py $(gen-out-type) -o tests -p "test-" < $<, " GEN $@")