From 0eaec4e59a9a9662f82d9ceb0c00c15a396adc3f Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Tue, 23 Aug 2011 07:32:18 +0200 Subject: [PATCH] Avoid using - (hyphen) in gdbus-codegen directory name It's an invalid character in Python module names and prevents us from being able to import it. https://bugzilla.gnome.org/show_bug.cgi?id=650763 --- configure.ac | 4 ++-- gio/Makefile.am | 2 +- gio/{gdbus-codegen => gdbus-2.0/codegen}/.gitignore | 0 gio/{gdbus-codegen => gdbus-2.0/codegen}/Makefile.am | 2 +- gio/{gdbus-codegen => gdbus-2.0/codegen}/__init__.py | 0 gio/{gdbus-codegen => gdbus-2.0/codegen}/codegen.py | 0 gio/{gdbus-codegen => gdbus-2.0/codegen}/codegen_docbook.py | 0 gio/{gdbus-codegen => gdbus-2.0/codegen}/codegen_main.py | 0 gio/{gdbus-codegen => gdbus-2.0/codegen}/config.py.in | 0 gio/{gdbus-codegen => gdbus-2.0/codegen}/dbustypes.py | 0 gio/{gdbus-codegen => gdbus-2.0/codegen}/gdbus-codegen.in | 2 +- gio/{gdbus-codegen => gdbus-2.0/codegen}/parser.py | 0 gio/{gdbus-codegen => gdbus-2.0/codegen}/utils.py | 0 13 files changed, 5 insertions(+), 5 deletions(-) rename gio/{gdbus-codegen => gdbus-2.0/codegen}/.gitignore (100%) rename gio/{gdbus-codegen => gdbus-2.0/codegen}/Makefile.am (92%) rename gio/{gdbus-codegen => gdbus-2.0/codegen}/__init__.py (100%) rename gio/{gdbus-codegen => gdbus-2.0/codegen}/codegen.py (100%) rename gio/{gdbus-codegen => gdbus-2.0/codegen}/codegen_docbook.py (100%) rename gio/{gdbus-codegen => gdbus-2.0/codegen}/codegen_main.py (100%) rename gio/{gdbus-codegen => gdbus-2.0/codegen}/config.py.in (100%) rename gio/{gdbus-codegen => gdbus-2.0/codegen}/dbustypes.py (100%) rename gio/{gdbus-codegen => gdbus-2.0/codegen}/gdbus-codegen.in (94%) rename gio/{gdbus-codegen => gdbus-2.0/codegen}/parser.py (100%) rename gio/{gdbus-codegen => gdbus-2.0/codegen}/utils.py (100%) diff --git a/configure.ac b/configure.ac index 5ef55ce9d..ffd2a678d 100644 --- a/configure.ac +++ b/configure.ac @@ -3841,8 +3841,8 @@ gobject/tests/Makefile gthread/Makefile gthread/tests/Makefile gio/Makefile -gio/gdbus-codegen/Makefile -gio/gdbus-codegen/config.py +gio/gdbus-2.0/codegen/Makefile +gio/gdbus-2.0/codegen/config.py gio/xdgmime/Makefile gio/inotify/Makefile gio/libasyncns/Makefile diff --git a/gio/Makefile.am b/gio/Makefile.am index 0a127a6a2..7803bb262 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl NULL = -SUBDIRS = gdbus-codegen +SUBDIRS = gdbus-2.0/codegen if OS_UNIX SUBDIRS += libasyncns xdgmime diff --git a/gio/gdbus-codegen/.gitignore b/gio/gdbus-2.0/codegen/.gitignore similarity index 100% rename from gio/gdbus-codegen/.gitignore rename to gio/gdbus-2.0/codegen/.gitignore diff --git a/gio/gdbus-codegen/Makefile.am b/gio/gdbus-2.0/codegen/Makefile.am similarity index 92% rename from gio/gdbus-codegen/Makefile.am rename to gio/gdbus-2.0/codegen/Makefile.am index dc596d779..1b3aba83f 100644 --- a/gio/gdbus-codegen/Makefile.am +++ b/gio/gdbus-2.0/codegen/Makefile.am @@ -4,7 +4,7 @@ bin_SCRIPTS = CLEANFILES = EXTRA_DIST = -codegendir = $(libdir)/gdbus-codegen +codegendir = $(libdir)/gdbus-2.0/codegen codegen_PYTHON = \ __init__.py \ codegen.py \ diff --git a/gio/gdbus-codegen/__init__.py b/gio/gdbus-2.0/codegen/__init__.py similarity index 100% rename from gio/gdbus-codegen/__init__.py rename to gio/gdbus-2.0/codegen/__init__.py diff --git a/gio/gdbus-codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py similarity index 100% rename from gio/gdbus-codegen/codegen.py rename to gio/gdbus-2.0/codegen/codegen.py diff --git a/gio/gdbus-codegen/codegen_docbook.py b/gio/gdbus-2.0/codegen/codegen_docbook.py similarity index 100% rename from gio/gdbus-codegen/codegen_docbook.py rename to gio/gdbus-2.0/codegen/codegen_docbook.py diff --git a/gio/gdbus-codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py similarity index 100% rename from gio/gdbus-codegen/codegen_main.py rename to gio/gdbus-2.0/codegen/codegen_main.py diff --git a/gio/gdbus-codegen/config.py.in b/gio/gdbus-2.0/codegen/config.py.in similarity index 100% rename from gio/gdbus-codegen/config.py.in rename to gio/gdbus-2.0/codegen/config.py.in diff --git a/gio/gdbus-codegen/dbustypes.py b/gio/gdbus-2.0/codegen/dbustypes.py similarity index 100% rename from gio/gdbus-codegen/dbustypes.py rename to gio/gdbus-2.0/codegen/dbustypes.py diff --git a/gio/gdbus-codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in similarity index 94% rename from gio/gdbus-codegen/gdbus-codegen.in rename to gio/gdbus-2.0/codegen/gdbus-codegen.in index 94c086382..36a214893 100755 --- a/gio/gdbus-codegen/gdbus-codegen.in +++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in @@ -25,7 +25,7 @@ import os import sys -path = os.path.join('@libdir@', 'gdbus-codegen') +path = os.path.join('@libdir@', 'gdbus-2.0', 'codegen') sys.path.insert(0, path) from codegen_main import codegen_main diff --git a/gio/gdbus-codegen/parser.py b/gio/gdbus-2.0/codegen/parser.py similarity index 100% rename from gio/gdbus-codegen/parser.py rename to gio/gdbus-2.0/codegen/parser.py diff --git a/gio/gdbus-codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py similarity index 100% rename from gio/gdbus-codegen/utils.py rename to gio/gdbus-2.0/codegen/utils.py