r1466@localhost: muntyan | 2005-12-21 23:48:57 -0600

Moved pygtk stuff into moopython/pygtk
master
Yevgen Muntyan 2005-12-23 14:27:59 +00:00
parent 5258dad6ba
commit 782c55eec2
25 changed files with 173 additions and 173 deletions

View File

@ -61,7 +61,7 @@ include moo/mooapp/glade/Makefile.incl
# moopython
include moo/moopython/Makefile.incl
include moo/moopython/codegen/Makefile.incl
include moo/moopython/module/Makefile.incl
include moo/moopython/pygtk/Makefile.incl
include moo/moopython/plugins/Makefile.incl
# moo_libincludedir = $(libdir)/moo-1.0/include

View File

@ -218,7 +218,7 @@ Makefile
moo/moo-config.h
moo/mooterm/termhelper_res.rc
moo/mooutils/pcre/pcre.h
moo/moopython/module/moo-mod.py
moo/moopython/pygtk/moo-mod.py
moo/moo.pc
tests/pyapp.py
m4/Makefile

View File

@ -1,158 +0,0 @@
#
# moo/moopython/Makefile.incl
#
moomodule = $(moopython)/module
moomodule_srcdir = $(srcdir)/$(moomodule)
moomodule_sources = \
$(moomodule)/moo-pygtk.c \
$(moomodule)/moo-pygtk.h \
$(moomodule)/mooapp-mod.h \
$(moomodule)/mooedit-mod.h \
$(moomodule)/mooterm-mod.h \
$(moomodule)/mooutils-mod.h \
$(moomodule)/moo-mod.h
moomodule_built_sources = \
$(moomodule)/mooapp-mod.h \
$(moomodule)/mooedit-mod.h \
$(moomodule)/mooterm-mod.h \
$(moomodule)/mooutils-mod.h \
$(moomodule)/moo-mod.h
nodist_moomodule_sources =
moomodule_cleanfiles = $(moomodule)/moo-mod.h
mooedit_defs_files = \
$(moomodule)/mooeditor.defs \
$(moomodule)/mooplugin.defs
# mooutils_override_files = \
# $(moomodule)/moowindow.override
moomodule_extra_dist = \
$(moomodule)/moo-mod.py \
$(moomodule)/moo-pygtk.c \
$(moomodule)/mooapp-mod.py \
$(moomodule)/mooapp-pygtk.defs \
$(moomodule)/mooapp-pygtk.override \
$(moomodule)/mooapp-mod.c \
$(mooedit_defs_files) \
$(moomodule)/mooedit-mod.py \
$(moomodule)/mooedit-pygtk.defs \
$(moomodule)/mooedit-pygtk.override \
$(moomodule)/mooedit-mod.c \
$(moomodule)/mooterm-mod.py \
$(moomodule)/mooterm-pygtk.defs \
$(moomodule)/mooterm-pygtk.override \
$(moomodule)/mooterm-mod.c \
$(moomodule)/mooutils-mod.py \
$(moomodule)/mooutils-pygtk.defs \
$(moomodule)/mooutils-pygtk.override \
$(moomodule)/mooutils-mod.c \
$(mooutils_defs_files) \
$(mooutils_override_files)
if MOO_BUILD_UTILS
moomodule_sources += $(moomodule)/mooutils-mod.c
nodist_moomodule_sources += $(moomodule)/mooutils-pygtk.c
moomodule_built_sources += $(moomodule)/mooutils-pygtk.c
moomodule_cleanfiles += $(moomodule)/mooutils-pygtk.c
endif MOO_BUILD_UTILS
if MOO_BUILD_TERM
moomodule_sources += $(moomodule)/mooterm-mod.c
nodist_moomodule_sources += $(moomodule)/mooterm-pygtk.c
moomodule_built_sources += $(moomodule)/mooterm-pygtk.c
moomodule_cleanfiles += $(moomodule)/mooterm-pygtk.c
endif MOO_BUILD_TERM
if MOO_BUILD_EDIT
moomodule_sources += $(moomodule)/mooedit-mod.c
nodist_moomodule_sources += $(moomodule)/mooedit-pygtk.c
moomodule_built_sources += $(moomodule)/mooedit-pygtk.c
moomodule_cleanfiles += $(moomodule)/mooedit-pygtk.c
endif MOO_BUILD_EDIT
if MOO_BUILD_APP
moomodule_sources += $(moomodule)/mooapp-mod.c
nodist_moomodule_sources += $(moomodule)/mooapp-pygtk.c
moomodule_built_sources += $(moomodule)/mooapp-pygtk.c
moomodule_cleanfiles += $(moomodule)/mooapp-pygtk.c
endif MOO_BUILD_APP
if MOO_OS_MINGW
codegen_platform = --platform win32
endif
$(moomodule)/mooutils-pygtk.c: $(moomodule)/mooutils-pygtk.defs $(moomodule)/mooutils-pygtk.override $(mooutils_override_files)
mkdir -p $(moomodule)
$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
--prefix _moo_utils $(codegen_platform) \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--override $(moomodule_srcdir)/mooutils-pygtk.override \
--outfilename $(moomodule)/mooutils-pygtk.c \
$(moomodule_srcdir)/mooutils-pygtk.defs > $(moomodule)/mooutils-pygtk.c
$(moomodule)/mooterm-pygtk.c: $(moomodule)/mooterm-pygtk.defs $(moomodule)/mooterm-pygtk.override
mkdir -p $(moomodule)
$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
--prefix _moo_term $(codegen_platform) \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--register $(moomodule_srcdir)/mooutils-pygtk.defs \
--override $(moomodule_srcdir)/mooterm-pygtk.override \
--outfilename $(moomodule)/mooterm-pygtk.c \
$(moomodule_srcdir)/mooterm-pygtk.defs > $(moomodule)/mooterm-pygtk.c
$(moomodule)/mooedit-pygtk.c: $(moomodule)/mooedit-pygtk.defs $(moomodule)/mooedit-pygtk.override $(mooedit_defs_files)
mkdir -p $(moomodule)
$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
--prefix _moo_edit $(codegen_platform) \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--register $(moomodule_srcdir)/mooutils-pygtk.defs \
--override $(moomodule_srcdir)/mooedit-pygtk.override \
--outfilename $(moomodule)/mooedit-pygtk.c \
$(moomodule_srcdir)/mooedit-pygtk.defs > $(moomodule)/mooedit-pygtk.c
$(moomodule)/mooapp-pygtk.c: $(moomodule)/mooapp-pygtk.defs $(moomodule)/mooapp-pygtk.override
mkdir -p $(moomodule)
$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
--prefix _moo_app $(codegen_platform) \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--register $(moomodule_srcdir)/mooedit-pygtk.defs \
--register $(moomodule_srcdir)/mooterm-pygtk.defs \
--register $(moomodule_srcdir)/mooutils-pygtk.defs \
--override $(moomodule_srcdir)/mooapp-pygtk.override \
--outfilename $(moomodule)/mooapp-pygtk.c \
$(moomodule_srcdir)/mooapp-pygtk.defs > $(moomodule)/mooapp-pygtk.c
$(moomodule)/moo-mod.h: $(moomodule)/moo-mod.py $(PY2H)
mkdir -p $(moomodule)
sh $(PY2H) MOO_PY $(moomodule)/moo-mod.py > $(moomodule)/moo-mod.h
$(moomodule)/mooedit-mod.h: $(moomodule)/mooedit-mod.py $(PY2H)
mkdir -p $(moomodule)
sh $(PY2H) MOO_EDIT_PY $(moomodule_srcdir)/mooedit-mod.py > $(moomodule)/mooedit-mod.h
$(moomodule)/mooapp-mod.h: $(moomodule)/mooapp-mod.py $(PY2H)
mkdir -p $(moomodule)
sh $(PY2H) MOO_APP_PY $(moomodule_srcdir)/mooapp-mod.py > $(moomodule)/mooapp-mod.h
$(moomodule)/mooutils-mod.h: $(moomodule)/mooutils-mod.py $(PY2H)
mkdir -p $(moomodule)
sh $(PY2H) MOO_UTILS_PY $(moomodule_srcdir)/mooutils-mod.py > $(moomodule)/mooutils-mod.h
$(moomodule)/mooterm-mod.h: $(moomodule)/mooterm-mod.py $(PY2H)
mkdir -p $(moomodule)
sh $(PY2H) MOO_TERM_PY $(moomodule_srcdir)/mooterm-mod.py > $(moomodule)/mooterm-mod.h
if MOO_USE_PYGTK
moo_sources += $(moomodule_sources)
moo_built_sources += $(moomodule_built_sources)
moo_nodist_sources += $(nodist_moomodule_sources)
moo_cleanfiles += $(moomodule_cleanfiles)
endif
moo_extra_dist += $(moomodule_extra_dist)

View File

@ -0,0 +1,158 @@
#
# moo/moopython/Makefile.incl
#
moopygtk = $(moopython)/pygtk
moopygtk_srcdir = $(srcdir)/$(moopygtk)
moopygtk_sources = \
$(moopygtk)/moo-pygtk.c \
$(moopygtk)/moo-pygtk.h \
$(moopygtk)/mooapp-mod.h \
$(moopygtk)/mooedit-mod.h \
$(moopygtk)/mooterm-mod.h \
$(moopygtk)/mooutils-mod.h \
$(moopygtk)/moo-mod.h
moopygtk_built_sources = \
$(moopygtk)/mooapp-mod.h \
$(moopygtk)/mooedit-mod.h \
$(moopygtk)/mooterm-mod.h \
$(moopygtk)/mooutils-mod.h \
$(moopygtk)/moo-mod.h
nodist_moopygtk_sources =
moopygtk_cleanfiles = $(moopygtk)/moo-mod.h
mooedit_defs_files = \
$(moopygtk)/mooeditor.defs \
$(moopygtk)/mooplugin.defs
# mooutils_override_files = \
# $(moopygtk)/moowindow.override
moopygtk_extra_dist = \
$(moopygtk)/moo-mod.py \
$(moopygtk)/moo-pygtk.c \
$(moopygtk)/mooapp-mod.py \
$(moopygtk)/mooapp-pygtk.defs \
$(moopygtk)/mooapp-pygtk.override \
$(moopygtk)/mooapp-mod.c \
$(mooedit_defs_files) \
$(moopygtk)/mooedit-mod.py \
$(moopygtk)/mooedit-pygtk.defs \
$(moopygtk)/mooedit-pygtk.override \
$(moopygtk)/mooedit-mod.c \
$(moopygtk)/mooterm-mod.py \
$(moopygtk)/mooterm-pygtk.defs \
$(moopygtk)/mooterm-pygtk.override \
$(moopygtk)/mooterm-mod.c \
$(moopygtk)/mooutils-mod.py \
$(moopygtk)/mooutils-pygtk.defs \
$(moopygtk)/mooutils-pygtk.override \
$(moopygtk)/mooutils-mod.c \
$(mooutils_defs_files) \
$(mooutils_override_files)
if MOO_BUILD_UTILS
moopygtk_sources += $(moopygtk)/mooutils-mod.c
nodist_moopygtk_sources += $(moopygtk)/mooutils-pygtk.c
moopygtk_built_sources += $(moopygtk)/mooutils-pygtk.c
moopygtk_cleanfiles += $(moopygtk)/mooutils-pygtk.c
endif MOO_BUILD_UTILS
if MOO_BUILD_TERM
moopygtk_sources += $(moopygtk)/mooterm-mod.c
nodist_moopygtk_sources += $(moopygtk)/mooterm-pygtk.c
moopygtk_built_sources += $(moopygtk)/mooterm-pygtk.c
moopygtk_cleanfiles += $(moopygtk)/mooterm-pygtk.c
endif MOO_BUILD_TERM
if MOO_BUILD_EDIT
moopygtk_sources += $(moopygtk)/mooedit-mod.c
nodist_moopygtk_sources += $(moopygtk)/mooedit-pygtk.c
moopygtk_built_sources += $(moopygtk)/mooedit-pygtk.c
moopygtk_cleanfiles += $(moopygtk)/mooedit-pygtk.c
endif MOO_BUILD_EDIT
if MOO_BUILD_APP
moopygtk_sources += $(moopygtk)/mooapp-mod.c
nodist_moopygtk_sources += $(moopygtk)/mooapp-pygtk.c
moopygtk_built_sources += $(moopygtk)/mooapp-pygtk.c
moopygtk_cleanfiles += $(moopygtk)/mooapp-pygtk.c
endif MOO_BUILD_APP
if MOO_OS_MINGW
codegen_platform = --platform win32
endif
$(moopygtk)/mooutils-pygtk.c: $(moopygtk)/mooutils-pygtk.defs $(moopygtk)/mooutils-pygtk.override $(mooutils_override_files)
mkdir -p $(moopygtk)
$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
--prefix _moo_utils $(codegen_platform) \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--override $(moopygtk_srcdir)/mooutils-pygtk.override \
--outfilename $(moopygtk)/mooutils-pygtk.c \
$(moopygtk_srcdir)/mooutils-pygtk.defs > $(moopygtk)/mooutils-pygtk.c
$(moopygtk)/mooterm-pygtk.c: $(moopygtk)/mooterm-pygtk.defs $(moopygtk)/mooterm-pygtk.override
mkdir -p $(moopygtk)
$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
--prefix _moo_term $(codegen_platform) \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--register $(moopygtk_srcdir)/mooutils-pygtk.defs \
--override $(moopygtk_srcdir)/mooterm-pygtk.override \
--outfilename $(moopygtk)/mooterm-pygtk.c \
$(moopygtk_srcdir)/mooterm-pygtk.defs > $(moopygtk)/mooterm-pygtk.c
$(moopygtk)/mooedit-pygtk.c: $(moopygtk)/mooedit-pygtk.defs $(moopygtk)/mooedit-pygtk.override $(mooedit_defs_files)
mkdir -p $(moopygtk)
$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
--prefix _moo_edit $(codegen_platform) \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--register $(moopygtk_srcdir)/mooutils-pygtk.defs \
--override $(moopygtk_srcdir)/mooedit-pygtk.override \
--outfilename $(moopygtk)/mooedit-pygtk.c \
$(moopygtk_srcdir)/mooedit-pygtk.defs > $(moopygtk)/mooedit-pygtk.c
$(moopygtk)/mooapp-pygtk.c: $(moopygtk)/mooapp-pygtk.defs $(moopygtk)/mooapp-pygtk.override
mkdir -p $(moopygtk)
$(PYTHON) $(moopython_srcdir)/codegen/codegen.py \
--prefix _moo_app $(codegen_platform) \
--register $(PYGTK_DEFS_DIR)/gtk-types.defs \
--register $(PYGTK_DEFS_DIR)/gdk-types.defs \
--register $(moopygtk_srcdir)/mooedit-pygtk.defs \
--register $(moopygtk_srcdir)/mooterm-pygtk.defs \
--register $(moopygtk_srcdir)/mooutils-pygtk.defs \
--override $(moopygtk_srcdir)/mooapp-pygtk.override \
--outfilename $(moopygtk)/mooapp-pygtk.c \
$(moopygtk_srcdir)/mooapp-pygtk.defs > $(moopygtk)/mooapp-pygtk.c
$(moopygtk)/moo-mod.h: $(moopygtk)/moo-mod.py $(PY2H)
mkdir -p $(moopygtk)
sh $(PY2H) MOO_PY $(moopygtk)/moo-mod.py > $(moopygtk)/moo-mod.h
$(moopygtk)/mooedit-mod.h: $(moopygtk)/mooedit-mod.py $(PY2H)
mkdir -p $(moopygtk)
sh $(PY2H) MOO_EDIT_PY $(moopygtk_srcdir)/mooedit-mod.py > $(moopygtk)/mooedit-mod.h
$(moopygtk)/mooapp-mod.h: $(moopygtk)/mooapp-mod.py $(PY2H)
mkdir -p $(moopygtk)
sh $(PY2H) MOO_APP_PY $(moopygtk_srcdir)/mooapp-mod.py > $(moopygtk)/mooapp-mod.h
$(moopygtk)/mooutils-mod.h: $(moopygtk)/mooutils-mod.py $(PY2H)
mkdir -p $(moopygtk)
sh $(PY2H) MOO_UTILS_PY $(moopygtk_srcdir)/mooutils-mod.py > $(moopygtk)/mooutils-mod.h
$(moopygtk)/mooterm-mod.h: $(moopygtk)/mooterm-mod.py $(PY2H)
mkdir -p $(moopygtk)
sh $(PY2H) MOO_TERM_PY $(moopygtk_srcdir)/mooterm-mod.py > $(moopygtk)/mooterm-mod.h
if MOO_USE_PYGTK
moo_sources += $(moopygtk_sources)
moo_built_sources += $(moopygtk_built_sources)
moo_nodist_sources += $(nodist_moopygtk_sources)
moo_cleanfiles += $(moopygtk_cleanfiles)
endif
moo_extra_dist += $(moopygtk_extra_dist)

View File

@ -18,7 +18,7 @@
#endif
#include "moopython/moo-mod.h"
#include "moopython/moo-pygtk.h"
#include "moopython/pygtk/moo-pygtk.h"
#include <pygobject.h> /* _PyGObjectAPI lives here */
#include <pygtk/pygtk.h>
#include <glib.h>

View File

@ -15,8 +15,8 @@
#define NO_IMPORT_PYGOBJECT
#include <pygobject.h>
#include <glib.h>
#include "moopython/moo-pygtk.h"
#include "moopython/mooapp-mod.h"
#include "moopython/pygtk/moo-pygtk.h"
#include "moopython/pygtk/mooapp-mod.h"
static char *moo_app_module_doc = (char*) "_moo_app module.";

View File

@ -6,7 +6,7 @@ headers
#include "pygobject.h"
#include "mooapp/mooapp.h"
#include "mooapp/mooapp-python.h"
#include "moopython/moo-pygtk.h"
#include "moopython/pygtk/moo-pygtk.h"
%%
modulename _moo_app

View File

@ -15,8 +15,8 @@
#define NO_IMPORT_PYGOBJECT
#include <pygobject.h>
#include <glib.h>
#include "moopython/moo-pygtk.h"
#include "moopython/mooedit-mod.h"
#include "moopython/pygtk/moo-pygtk.h"
#include "moopython/pygtk/mooedit-mod.h"
static char *moo_edit_module_doc = (char*) "_moo_edit module.";

View File

@ -12,7 +12,7 @@ headers
#include "mooedit/mooeditprefs.h"
#include "moopython/mooplugin-python.h"
#include "mooutils/mooutils-python.h"
#include "moopython/moo-pygtk.h"
#include "moopython/pygtk/moo-pygtk.h"
#ifdef __WIN32__

View File

@ -15,8 +15,8 @@
#define NO_IMPORT_PYGOBJECT
#include <pygobject.h>
#include <glib.h>
#include "moopython/moo-pygtk.h"
#include "moopython/mooterm-mod.h"
#include "moopython/pygtk/moo-pygtk.h"
#include "moopython/pygtk/mooterm-mod.h"
static char *moo_term_module_doc = (char*)"_moo_term module.";

View File

@ -11,7 +11,7 @@ headers
#include "mooterm/mootermbuffer.h"
#include "mooterm/mooterm-prefs.h"
#include "mooutils/mooutils-python.h"
#include "moopython/moo-pygtk.h"
#include "moopython/pygtk/moo-pygtk.h"
static GdkAtom

View File

@ -15,8 +15,8 @@
#define NO_IMPORT_PYGOBJECT
#include <pygobject.h>
#include <glib.h>
#include "moopython/moo-pygtk.h"
#include "moopython/mooutils-mod.h"
#include "moopython/pygtk/moo-pygtk.h"
#include "moopython/pygtk/mooutils-mod.h"
#include "mooutils/moostock.h"
#include "mooutils/mooutils-python.h"

View File

@ -23,7 +23,7 @@ headers
#include "mooutils/moouixml.h"
#include "mooutils/moomenuaction.h"
#include "mooutils/mooutils-python.h"
#include "moopython/moo-pygtk.h"
#include "moopython/pygtk/moo-pygtk.h"
%%