GNOME.org
 

[pygobject] move the static bits internal to gi and refactor build files

commit 6b9d738d78c6ac45d49f00402c89356887555069
Author: John (J5) Palmieri <johnp redhat com>
Date:   Fri Jul 22 11:02:49 2011 -0400

    move the static bits internal to gi and refactor build files
    
    * the glib module now becomes the gi._glib module
    * the gobject module now becomes the gi._gobject module
    * we do this so we can install in parallel with PyGObject 2
    
    https://bugzilla.gnome.org/show_bug.cgi?id=642048

 Makefile.am                                  |    2 +-
 configure.ac                                 |    6 +++---
 gi/Makefile.am                               |    8 +++++---
 {glib => gi/_glib}/Makefile.am               |    5 +----
 {glib => gi/_glib}/__init__.py               |    0
 {glib => gi/_glib}/glibmodule.c              |    0
 {glib => gi/_glib}/option.py                 |    0
 {glib => gi/_glib}/pygiochannel.c            |    0
 {glib => gi/_glib}/pygiochannel.h            |    0
 {glib => gi/_glib}/pyglib-private.h          |    0
 {glib => gi/_glib}/pyglib-python-compat.h    |    0
 {glib => gi/_glib}/pyglib.c                  |    0
 {glib => gi/_glib}/pyglib.h                  |    0
 {glib => gi/_glib}/pygmaincontext.c          |    0
 {glib => gi/_glib}/pygmaincontext.h          |    0
 {glib => gi/_glib}/pygmainloop.c             |    0
 {glib => gi/_glib}/pygmainloop.h             |    0
 {glib => gi/_glib}/pygoptioncontext.c        |    0
 {glib => gi/_glib}/pygoptioncontext.h        |    0
 {glib => gi/_glib}/pygoptiongroup.c          |    0
 {glib => gi/_glib}/pygoptiongroup.h          |    0
 {glib => gi/_glib}/pygsource.c               |    0
 {glib => gi/_glib}/pygsource.h               |    0
 {glib => gi/_glib}/pygspawn.c                |    0
 {glib => gi/_glib}/pygspawn.h                |    0
 {gobject => gi/_gobject}/Makefile.am         |   10 ++++------
 {gobject => gi/_gobject}/__init__.py         |    0
 {gobject => gi/_gobject}/constants.py        |    0
 {gobject => gi/_gobject}/ffi-marshaller.c    |    0
 {gobject => gi/_gobject}/ffi-marshaller.h    |    0
 {gobject => gi/_gobject}/gobjectmodule.c     |    0
 {gobject => gi/_gobject}/propertyhelper.py   |    0
 {gobject => gi/_gobject}/pygboxed.c          |    0
 {gobject => gi/_gobject}/pygboxed.h          |    0
 {gobject => gi/_gobject}/pygenum.c           |    0
 {gobject => gi/_gobject}/pygenum.h           |    0
 {gobject => gi/_gobject}/pygflags.c          |    0
 {gobject => gi/_gobject}/pygflags.h          |    0
 {gobject => gi/_gobject}/pyginterface.c      |    0
 {gobject => gi/_gobject}/pyginterface.h      |    0
 {gobject => gi/_gobject}/pygobject-private.h |    0
 {gobject => gi/_gobject}/pygobject.c         |    0
 {gobject => gi/_gobject}/pygobject.h         |    0
 {gobject => gi/_gobject}/pygparamspec.c      |    0
 {gobject => gi/_gobject}/pygparamspec.h      |    0
 {gobject => gi/_gobject}/pygpointer.c        |    0
 {gobject => gi/_gobject}/pygpointer.h        |    0
 {gobject => gi/_gobject}/pygtype.c           |    0
 {gobject => gi/_gobject}/pygtype.h           |    0
 tests/Makefile.am                            |    2 +-
 50 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 340d0e7..3b8b6fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = 1.7
 
-SUBDIRS = docs glib gobject examples gi tests
+SUBDIRS = docs examples gi tests
 
 PLATFORM_VERSION = 3.0
 
diff --git a/configure.ac b/configure.ac
index 3f19ead..d6832c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_INIT(pygobject, pygobject_version,
         [http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject])
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I .")
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([gobject/gobjectmodule.c])
+AC_CONFIG_SRCDIR([gi/gimodule.c])
 
 AC_DEFINE(PYGOBJECT_MAJOR_VERSION, pygobject_major_version, [pygobject major version])
 AC_SUBST(PYGOBJECT_MAJOR_VERSION, pygobject_major_version)
@@ -261,8 +261,8 @@ AC_CONFIG_FILES(
   gi/Makefile
   gi/repository/Makefile
   gi/overrides/Makefile
-  glib/Makefile
-  gobject/Makefile
+  gi/_glib/Makefile
+  gi/_gobject/Makefile
   examples/Makefile
   tests/Makefile
   PKG-INFO)
diff --git a/gi/Makefile.am b/gi/Makefile.am
index 5598c0a..71f0b65 100644
--- a/gi/Makefile.am
+++ b/gi/Makefile.am
@@ -5,9 +5,11 @@ pkgpyexecdir = $(pyexecdir)
 
 SUBDIRS = \
 	repository \
-	overrides
+	overrides \
+        _glib \
+	_gobject
 
-INCLUDES = -I$(top_srcdir)/gobject -I$(top_srcdir)/glib
+INCLUDES = -I$(top_srcdir)/gi/_gobject -I$(top_srcdir)/gi/_glib
 
 pygidir = $(pkgpyexecdir)/gi
 pygi_PYTHON = \
@@ -25,7 +27,7 @@ _gi_la_LDFLAGS = \
 	-export-symbols-regex "init_gi|PyInit__gi"
 _gi_la_LIBADD = \
 	$(GI_LIBS) \
-	$(top_builddir)/glib/libpyglib-2 0- PYTHON_BASENAME@.la
+	$(top_builddir)/gi/_glib/libpyglib-2 0- PYTHON_BASENAME@.la
 _gi_la_SOURCES = \
 	pygi-repository.c \
 	pygi-repository.h \
diff --git a/glib/Makefile.am b/gi/_glib/Makefile.am
similarity index 92%
rename from glib/Makefile.am
rename to gi/_glib/Makefile.am
index ed2602a..5651d69 100644
--- a/glib/Makefile.am
+++ b/gi/_glib/Makefile.am
@@ -1,14 +1,11 @@
 AUTOMAKE_OPTIONS = 1.7
 INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN
 
-pkgincludedir = $(includedir)/pygtk-2.0
-pkginclude_HEADERS = pyglib.h
-
 lib_LTLIBRARIES = libpyglib-2 0- PYTHON_BASENAME@.la
 
 pkgpyexecdir = $(pyexecdir)
 
-pyglibdir = $(pkgpyexecdir)/glib
+pyglibdir = $(pkgpyexecdir)/gi/_glib
 pyglib_PYTHON = 	\
 	__init__.py	\
 	option.py
diff --git a/glib/__init__.py b/gi/_glib/__init__.py
similarity index 100%
rename from glib/__init__.py
rename to gi/_glib/__init__.py
diff --git a/glib/glibmodule.c b/gi/_glib/glibmodule.c
similarity index 100%
rename from glib/glibmodule.c
rename to gi/_glib/glibmodule.c
diff --git a/glib/option.py b/gi/_glib/option.py
similarity index 100%
rename from glib/option.py
rename to gi/_glib/option.py
diff --git a/glib/pygiochannel.c b/gi/_glib/pygiochannel.c
similarity index 100%
rename from glib/pygiochannel.c
rename to gi/_glib/pygiochannel.c
diff --git a/glib/pygiochannel.h b/gi/_glib/pygiochannel.h
similarity index 100%
rename from glib/pygiochannel.h
rename to gi/_glib/pygiochannel.h
diff --git a/glib/pyglib-private.h b/gi/_glib/pyglib-private.h
similarity index 100%
rename from glib/pyglib-private.h
rename to gi/_glib/pyglib-private.h
diff --git a/glib/pyglib-python-compat.h b/gi/_glib/pyglib-python-compat.h
similarity index 100%
rename from glib/pyglib-python-compat.h
rename to gi/_glib/pyglib-python-compat.h
diff --git a/glib/pyglib.c b/gi/_glib/pyglib.c
similarity index 100%
rename from glib/pyglib.c
rename to gi/_glib/pyglib.c
diff --git a/glib/pyglib.h b/gi/_glib/pyglib.h
similarity index 100%
rename from glib/pyglib.h
rename to gi/_glib/pyglib.h
diff --git a/glib/pygmaincontext.c b/gi/_glib/pygmaincontext.c
similarity index 100%
rename from glib/pygmaincontext.c
rename to gi/_glib/pygmaincontext.c
diff --git a/glib/pygmaincontext.h b/gi/_glib/pygmaincontext.h
similarity index 100%
rename from glib/pygmaincontext.h
rename to gi/_glib/pygmaincontext.h
diff --git a/glib/pygmainloop.c b/gi/_glib/pygmainloop.c
similarity index 100%
rename from glib/pygmainloop.c
rename to gi/_glib/pygmainloop.c
diff --git a/glib/pygmainloop.h b/gi/_glib/pygmainloop.h
similarity index 100%
rename from glib/pygmainloop.h
rename to gi/_glib/pygmainloop.h
diff --git a/glib/pygoptioncontext.c b/gi/_glib/pygoptioncontext.c
similarity index 100%
rename from glib/pygoptioncontext.c
rename to gi/_glib/pygoptioncontext.c
diff --git a/glib/pygoptioncontext.h b/gi/_glib/pygoptioncontext.h
similarity index 100%
rename from glib/pygoptioncontext.h
rename to gi/_glib/pygoptioncontext.h
diff --git a/glib/pygoptiongroup.c b/gi/_glib/pygoptiongroup.c
similarity index 100%
rename from glib/pygoptiongroup.c
rename to gi/_glib/pygoptiongroup.c
diff --git a/glib/pygoptiongroup.h b/gi/_glib/pygoptiongroup.h
similarity index 100%
rename from glib/pygoptiongroup.h
rename to gi/_glib/pygoptiongroup.h
diff --git a/glib/pygsource.c b/gi/_glib/pygsource.c
similarity index 100%
rename from glib/pygsource.c
rename to gi/_glib/pygsource.c
diff --git a/glib/pygsource.h b/gi/_glib/pygsource.h
similarity index 100%
rename from glib/pygsource.h
rename to gi/_glib/pygsource.h
diff --git a/glib/pygspawn.c b/gi/_glib/pygspawn.c
similarity index 100%
rename from glib/pygspawn.c
rename to gi/_glib/pygspawn.c
diff --git a/glib/pygspawn.h b/gi/_glib/pygspawn.h
similarity index 100%
rename from glib/pygspawn.h
rename to gi/_glib/pygspawn.h
diff --git a/gobject/Makefile.am b/gi/_gobject/Makefile.am
similarity index 88%
rename from gobject/Makefile.am
rename to gi/_gobject/Makefile.am
index 0ff704a..ddeaa17 100644
--- a/gobject/Makefile.am
+++ b/gi/_gobject/Makefile.am
@@ -1,13 +1,10 @@
 AUTOMAKE_OPTIONS = 1.7
 PLATFORM_VERSION = 2.0
 
-pkgincludedir = $(includedir)/pygtk-$(PLATFORM_VERSION)
-pkginclude_HEADERS = pygobject.h
-
 pkgpyexecdir = $(pyexecdir)
 
 # gobject python scripts
-pygobjectdir = $(pkgpyexecdir)/gobject
+pygobjectdir = $(pkgpyexecdir)/gi/_gobject
 pygobject_PYTHON = 	\
 	__init__.py 	\
 	constants.py	\
@@ -20,7 +17,7 @@ common_ldflags += -no-undefined
 endif
 
 _gobject_la_CFLAGS = \
-	-I$(top_srcdir)/glib \
+	-I$(top_srcdir)/gi/_glib \
 	-I$(top_srcdir)/gi \
 	$(PYTHON_INCLUDES) \
 	$(FFI_CFLAGS) \
@@ -33,7 +30,8 @@ _gobject_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(FFI_LIBS) \
 	$(PYTHON_LIBS) \
-	$(top_builddir)/glib/libpyglib-2 0- PYTHON_BASENAME@.la
+	$(top_builddir)/gi/_glib/libpyglib-2 0- PYTHON_BASENAME@.la
+
 _gobject_la_SOURCES =           \
         gobjectmodule.c         \
         pygboxed.c              \
diff --git a/gobject/__init__.py b/gi/_gobject/__init__.py
similarity index 100%
rename from gobject/__init__.py
rename to gi/_gobject/__init__.py
diff --git a/gobject/constants.py b/gi/_gobject/constants.py
similarity index 100%
rename from gobject/constants.py
rename to gi/_gobject/constants.py
diff --git a/gobject/ffi-marshaller.c b/gi/_gobject/ffi-marshaller.c
similarity index 100%
rename from gobject/ffi-marshaller.c
rename to gi/_gobject/ffi-marshaller.c
diff --git a/gobject/ffi-marshaller.h b/gi/_gobject/ffi-marshaller.h
similarity index 100%
rename from gobject/ffi-marshaller.h
rename to gi/_gobject/ffi-marshaller.h
diff --git a/gobject/gobjectmodule.c b/gi/_gobject/gobjectmodule.c
similarity index 100%
rename from gobject/gobjectmodule.c
rename to gi/_gobject/gobjectmodule.c
diff --git a/gobject/propertyhelper.py b/gi/_gobject/propertyhelper.py
similarity index 100%
rename from gobject/propertyhelper.py
rename to gi/_gobject/propertyhelper.py
diff --git a/gobject/pygboxed.c b/gi/_gobject/pygboxed.c
similarity index 100%
rename from gobject/pygboxed.c
rename to gi/_gobject/pygboxed.c
diff --git a/gobject/pygboxed.h b/gi/_gobject/pygboxed.h
similarity index 100%
rename from gobject/pygboxed.h
rename to gi/_gobject/pygboxed.h
diff --git a/gobject/pygenum.c b/gi/_gobject/pygenum.c
similarity index 100%
rename from gobject/pygenum.c
rename to gi/_gobject/pygenum.c
diff --git a/gobject/pygenum.h b/gi/_gobject/pygenum.h
similarity index 100%
rename from gobject/pygenum.h
rename to gi/_gobject/pygenum.h
diff --git a/gobject/pygflags.c b/gi/_gobject/pygflags.c
similarity index 100%
rename from gobject/pygflags.c
rename to gi/_gobject/pygflags.c
diff --git a/gobject/pygflags.h b/gi/_gobject/pygflags.h
similarity index 100%
rename from gobject/pygflags.h
rename to gi/_gobject/pygflags.h
diff --git a/gobject/pyginterface.c b/gi/_gobject/pyginterface.c
similarity index 100%
rename from gobject/pyginterface.c
rename to gi/_gobject/pyginterface.c
diff --git a/gobject/pyginterface.h b/gi/_gobject/pyginterface.h
similarity index 100%
rename from gobject/pyginterface.h
rename to gi/_gobject/pyginterface.h
diff --git a/gobject/pygobject-private.h b/gi/_gobject/pygobject-private.h
similarity index 100%
rename from gobject/pygobject-private.h
rename to gi/_gobject/pygobject-private.h
diff --git a/gobject/pygobject.c b/gi/_gobject/pygobject.c
similarity index 100%
rename from gobject/pygobject.c
rename to gi/_gobject/pygobject.c
diff --git a/gobject/pygobject.h b/gi/_gobject/pygobject.h
similarity index 100%
rename from gobject/pygobject.h
rename to gi/_gobject/pygobject.h
diff --git a/gobject/pygparamspec.c b/gi/_gobject/pygparamspec.c
similarity index 100%
rename from gobject/pygparamspec.c
rename to gi/_gobject/pygparamspec.c
diff --git a/gobject/pygparamspec.h b/gi/_gobject/pygparamspec.h
similarity index 100%
rename from gobject/pygparamspec.h
rename to gi/_gobject/pygparamspec.h
diff --git a/gobject/pygpointer.c b/gi/_gobject/pygpointer.c
similarity index 100%
rename from gobject/pygpointer.c
rename to gi/_gobject/pygpointer.c
diff --git a/gobject/pygpointer.h b/gi/_gobject/pygpointer.h
similarity index 100%
rename from gobject/pygpointer.h
rename to gi/_gobject/pygpointer.h
diff --git a/gobject/pygtype.c b/gi/_gobject/pygtype.c
similarity index 100%
rename from gobject/pygtype.c
rename to gi/_gobject/pygtype.c
diff --git a/gobject/pygtype.h b/gi/_gobject/pygtype.h
similarity index 100%
rename from gobject/pygtype.h
rename to gi/_gobject/pygtype.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index aa84910..4ec6477 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -45,7 +45,7 @@ CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIM
 
 noinst_LTLIBRARIES += testhelper.la
 
-testhelper_la_CFLAGS = -I$(top_srcdir)/gobject -I$(top_srcdir)/glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
+testhelper_la_CFLAGS = -I$(top_srcdir)/gi/_gobject -I$(top_srcdir)/gi/_glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
 testhelper_la_LDFLAGS = -module -avoid-version
 testhelper_la_LIBADD = $(GLIB_LIBS)
 testhelper_la_SOURCES = \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]