nyje
/
medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r1465@localhost: muntyan | 2005-12-21 23:43:30 -0600 

Moving python stuff around
master
Yevgen Muntyan 2005-12-23 14:26:23 +00:00
parent 89ca7d94e6
commit 5258dad6ba
27 changed files with 186 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -60,6 +60,9 @@ include moo/mooapp/Makefile.incl
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/plugins/Makefile.incl
# moo_libincludedir = $(libdir)/moo-1.0/include
# moo_libinclude_HEADERS = $(moo_libinclude_headers)

2
configure.ac
View File

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

176
moo/moopython/Makefile.incl
View File

@ -5,182 +5,6 @@
moopython = $(moo_prefix)/moopython
moopython_srcdir = $(srcdir)/$(moopython)
moopython_plugins = \
$(moopython)/plugins/console.py \
$(moopython)/plugins/pyconsole.py \
$(moopython)/plugins/pystuff.py
moopython_codegen = \
$(moopython)/codegen/__init__.py \
$(moopython)/codegen/argtypes.py \
$(moopython)/codegen/codegen.py \
$(moopython)/codegen/definitions.py \
$(moopython)/codegen/defsparser.py \
$(moopython)/codegen/docgen.py \
$(moopython)/codegen/mergedefs.py \
$(moopython)/codegen/mkskel.py \
$(moopython)/codegen/override.py \
$(moopython)/codegen/reversewrapper.py \
$(moopython)/codegen/scmexpr.py
moopython_sources = \
$(moopython)/moo-pygtk.c \
$(moopython)/moo-pygtk.h \
$(moopython)/mooapp-mod.h \
$(moopython)/mooedit-mod.h \
$(moopython)/mooterm-mod.h \
$(moopython)/mooutils-mod.h \
$(moopython)/moo-mod.h
moopython_built_sources = \
$(moopython)/mooapp-mod.h \
$(moopython)/mooedit-mod.h \
$(moopython)/mooterm-mod.h \
$(moopython)/mooutils-mod.h \
$(moopython)/moo-mod.h
nodist_moopython_sources =
moopython_cleanfiles = $(moopython)/moo-mod.h
mooedit_defs_files = \
$(moopython)/mooeditor.defs \
$(moopython)/mooplugin.defs
# mooutils_override_files = \
# $(moopython)/moowindow.override
moopython_extra_dist = \
$(moopython_plugins) \
$(moopython_codegen) \
$(moopython)/moo-mod.py \
$(moopython)/moo-pygtk.c \
$(moopython)/mooapp-mod.py \
$(moopython)/mooapp-pygtk.defs \
$(moopython)/mooapp-pygtk.override \
$(moopython)/mooapp-mod.c \
$(mooedit_defs_files) \
$(moopython)/mooedit-mod.py \
$(moopython)/mooedit-pygtk.defs \
$(moopython)/mooedit-pygtk.override \
$(moopython)/mooedit-mod.c \
$(moopython)/mooterm-mod.py \
$(moopython)/mooterm-pygtk.defs \
$(moopython)/mooterm-pygtk.override \
$(moopython)/mooterm-mod.c \
$(moopython)/mooutils-mod.py \
$(moopython)/mooutils-pygtk.defs \
$(moopython)/mooutils-pygtk.override \
$(moopython)/mooutils-mod.c \
$(mooutils_defs_files) \
$(mooutils_override_files)
if MOO_BUILD_UTILS
moopython_sources += $(moopython)/mooutils-mod.c
nodist_moopython_sources += $(moopython)/mooutils-pygtk.c
moopython_built_sources += $(moopython)/mooutils-pygtk.c
moopython_cleanfiles += $(moopython)/mooutils-pygtk.c
endif MOO_BUILD_UTILS
if MOO_BUILD_TERM
moopython_sources += $(moopython)/mooterm-mod.c
nodist_moopython_sources += $(moopython)/mooterm-pygtk.c
moopython_built_sources += $(moopython)/mooterm-pygtk.c
moopython_cleanfiles += $(moopython)/mooterm-pygtk.c
endif MOO_BUILD_TERM
if MOO_BUILD_EDIT
moopython_sources += $(moopython)/mooedit-mod.c
nodist_moopython_sources += $(moopython)/mooedit-pygtk.c
moopython_built_sources += $(moopython)/mooedit-pygtk.c
moopython_cleanfiles += $(moopython)/mooedit-pygtk.c
endif MOO_BUILD_EDIT
if MOO_BUILD_APP
moopython_sources += $(moopython)/mooapp-mod.c
nodist_moopython_sources += $(moopython)/mooapp-pygtk.c
moopython_built_sources += $(moopython)/mooapp-pygtk.c
moopython_cleanfiles += $(moopython)/mooapp-pygtk.c
endif MOO_BUILD_APP
if MOO_OS_MINGW
codegen_platform = --platform win32
endif
$(moopython)/mooutils-pygtk.c: $(moopython)/mooutils-pygtk.defs $(moopython)/mooutils-pygtk.override $(mooutils_override_files)
mkdir -p $(moopython)
$(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 $(moopython_srcdir)/mooutils-pygtk.override \
--outfilename $(moopython)/mooutils-pygtk.c \
$(moopython_srcdir)/mooutils-pygtk.defs > $(moopython)/mooutils-pygtk.c
$(moopython)/mooterm-pygtk.c: $(moopython)/mooterm-pygtk.defs $(moopython)/mooterm-pygtk.override
mkdir -p $(moopython)
$(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 $(moopython_srcdir)/mooutils-pygtk.defs \
--override $(moopython_srcdir)/mooterm-pygtk.override \
--outfilename $(moopython)/mooterm-pygtk.c \
$(moopython_srcdir)/mooterm-pygtk.defs > $(moopython)/mooterm-pygtk.c
$(moopython)/mooedit-pygtk.c: $(moopython)/mooedit-pygtk.defs $(moopython)/mooedit-pygtk.override $(mooedit_defs_files)
mkdir -p $(moopython)
$(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 $(moopython_srcdir)/mooutils-pygtk.defs \
--override $(moopython_srcdir)/mooedit-pygtk.override \
--outfilename $(moopython)/mooedit-pygtk.c \
$(moopython_srcdir)/mooedit-pygtk.defs > $(moopython)/mooedit-pygtk.c
$(moopython)/mooapp-pygtk.c: $(moopython)/mooapp-pygtk.defs $(moopython)/mooapp-pygtk.override
mkdir -p $(moopython)
$(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 $(moopython_srcdir)/mooedit-pygtk.defs \
--register $(moopython_srcdir)/mooterm-pygtk.defs \
--register $(moopython_srcdir)/mooutils-pygtk.defs \
--override $(moopython_srcdir)/mooapp-pygtk.override \
--outfilename $(moopython)/mooapp-pygtk.c \
$(moopython_srcdir)/mooapp-pygtk.defs > $(moopython)/mooapp-pygtk.c
$(moopython)/moo-mod.h: $(moopython)/moo-mod.py $(PY2H)
mkdir -p $(moopython)
sh $(PY2H) MOO_PY $(moopython)/moo-mod.py > $(moopython)/moo-mod.h
$(moopython)/mooedit-mod.h: $(moopython)/mooedit-mod.py $(PY2H)
mkdir -p $(moopython)
sh $(PY2H) MOO_EDIT_PY $(moopython_srcdir)/mooedit-mod.py > $(moopython)/mooedit-mod.h
$(moopython)/mooapp-mod.h: $(moopython)/mooapp-mod.py $(PY2H)
mkdir -p $(moopython)
sh $(PY2H) MOO_APP_PY $(moopython_srcdir)/mooapp-mod.py > $(moopython)/mooapp-mod.h
$(moopython)/mooutils-mod.h: $(moopython)/mooutils-mod.py $(PY2H)
mkdir -p $(moopython)
sh $(PY2H) MOO_UTILS_PY $(moopython_srcdir)/mooutils-mod.py > $(moopython)/mooutils-mod.h
$(moopython)/mooterm-mod.h: $(moopython)/mooterm-mod.py $(PY2H)
mkdir -p $(moopython)
sh $(PY2H) MOO_TERM_PY $(moopython_srcdir)/mooterm-mod.py > $(moopython)/mooterm-mod.h
if MOO_USE_PYGTK
moo_sources += $(moopython_sources)
moo_built_sources += $(moopython_built_sources)
moo_nodist_sources += $(nodist_moopython_sources)
moo_cleanfiles += $(moopython_cleanfiles)
endif
moo_extra_dist += $(moopython_extra_dist)
###########################################################################
# Python plugin
mooplugin_python_sources = \
$(moopython)/mooplugin-python.c \
$(moopython)/mooplugin-python.h

16
moo/moopython/codegen/Makefile.incl Normal file
View File

@ -0,0 +1,16 @@
#
# moo/moopython/codegen/Makefile.incl
#
moo_extra_dist += \
$(moopython)/codegen/__init__.py \
$(moopython)/codegen/argtypes.py \
$(moopython)/codegen/codegen.py \
$(moopython)/codegen/definitions.py \
$(moopython)/codegen/defsparser.py \
$(moopython)/codegen/docgen.py \
$(moopython)/codegen/mergedefs.py \
$(moopython)/codegen/mkskel.py \
$(moopython)/codegen/override.py \
$(moopython)/codegen/reversewrapper.py \
$(moopython)/codegen/scmexpr.py

158
moo/moopython/module/Makefile.incl Normal file
View File

@ -0,0 +1,158 @@
#
# 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)

0
moo/moopython/moo-mod.py.in → moo/moopython/module/moo-mod.py.in
View File

0
moo/moopython/moo-pygtk.c → moo/moopython/module/moo-pygtk.c
View File

0
moo/moopython/moo-pygtk.h → moo/moopython/module/moo-pygtk.h
View File

0
moo/moopython/mooapp-mod.c → moo/moopython/module/mooapp-mod.c
View File

0
moo/moopython/mooapp-mod.py → moo/moopython/module/mooapp-mod.py
View File

0
moo/moopython/mooapp-pygtk.defs → moo/moopython/module/mooapp-pygtk.defs
View File

0
moo/moopython/mooapp-pygtk.override → moo/moopython/module/mooapp-pygtk.override
View File

0
moo/moopython/mooedit-mod.c → moo/moopython/module/mooedit-mod.c
View File

0
moo/moopython/mooedit-mod.py → moo/moopython/module/mooedit-mod.py
View File

0
moo/moopython/mooedit-pygtk.defs → moo/moopython/module/mooedit-pygtk.defs
View File

0
moo/moopython/mooedit-pygtk.override → moo/moopython/module/mooedit-pygtk.override
View File

0
moo/moopython/mooeditor.defs → moo/moopython/module/mooeditor.defs
View File

0
moo/moopython/mooplugin.defs → moo/moopython/module/mooplugin.defs
View File

0
moo/moopython/mooterm-mod.c → moo/moopython/module/mooterm-mod.c
View File

0
moo/moopython/mooterm-mod.py → moo/moopython/module/mooterm-mod.py
View File

0
moo/moopython/mooterm-pygtk.defs → moo/moopython/module/mooterm-pygtk.defs
View File

0
moo/moopython/mooterm-pygtk.override → moo/moopython/module/mooterm-pygtk.override
View File

0
moo/moopython/mooutils-mod.c → moo/moopython/module/mooutils-mod.c
View File

0
moo/moopython/mooutils-mod.py → moo/moopython/module/mooutils-mod.py
View File

0
moo/moopython/mooutils-pygtk.defs → moo/moopython/module/mooutils-pygtk.defs
View File

0
moo/moopython/mooutils-pygtk.override → moo/moopython/module/mooutils-pygtk.override
View File

8
moo/moopython/plugins/Makefile.incl Normal file
View File

@ -0,0 +1,8 @@
#
# moo/moopython/plugins/Makefile.incl
#
moo_extra_dist += \
$(moopython)/plugins/console.py \
$(moopython)/plugins/pyconsole.py \
$(moopython)/plugins/pystuff.py