Merge memmgr-glib experiment onto trunk
This commit is contained in:
alexhudson
@@ -1,158 +0,0 @@
|
||||
# -*- Makefile -*-
|
||||
# This file needs a lot of help. We need a single list of the python
|
||||
# files we ship, and a target that compiles them at install-time. In
|
||||
# the meantime, we'll have this packagedir monstrosity.
|
||||
|
||||
pkgpythondir = $(pythondir)/bongo
|
||||
pkgpythonadmindir = $(pythondir)/bongo/admin
|
||||
pkgpythonexternaldir = $(pythondir)/bongo/external
|
||||
pkgpythonexternaldateutildir = $(pythondir)/bongo/external/dateutil
|
||||
pkgpythonexternalemaildir = $(pythondir)/bongo/external/email
|
||||
pkgpythonexternalemailmimedir = $(pythondir)/bongo/external/email/mime
|
||||
pkgpythonexternaldateutilzoneinfodir = $(pythondir)/bongo/external/dateutil/zoneinfo
|
||||
pkgpythonexternalsimplejsondir = $(pythondir)/bongo/external/simplejson
|
||||
pkgpythonexternalsimpletaldir = $(pythondir)/bongo/external/simpletal
|
||||
pkgpythonexternalvobjectdir = $(pythondir)/bongo/external/vobject
|
||||
pkgpythonnmapdir = $(pythondir)/bongo/nmap
|
||||
pkgpythonstoredir = $(pythondir)/bongo/store
|
||||
|
||||
pkgpython_PYTHON = \
|
||||
src/libs/python/bongo/__init__.py \
|
||||
src/libs/python/bongo/CalCmd.py \
|
||||
src/libs/python/bongo/cmdparse.py \
|
||||
src/libs/python/bongo/Console.py \
|
||||
src/libs/python/bongo/Contact.py \
|
||||
src/libs/python/bongo/BongoError.py \
|
||||
src/libs/python/bongo/MDB.py \
|
||||
src/libs/python/bongo/Template.py \
|
||||
src/libs/python/bongo/Privs.py \
|
||||
src/libs/python/bongo/StreamIO.py \
|
||||
src/libs/python/bongo/table.py
|
||||
|
||||
nodist_pkgpython_PYTHON = \
|
||||
src/libs/python/bongo/Xpl.py
|
||||
|
||||
pkgpythonadmin_PYTHON = \
|
||||
src/libs/python/bongo/admin/__init__.py \
|
||||
src/libs/python/bongo/admin/Addressbook.py \
|
||||
src/libs/python/bongo/admin/Alias.py \
|
||||
src/libs/python/bongo/admin/Antispam.py \
|
||||
src/libs/python/bongo/admin/Calcmd.py \
|
||||
src/libs/python/bongo/admin/Collector.py \
|
||||
src/libs/python/bongo/admin/Handler.py \
|
||||
src/libs/python/bongo/admin/Imap.py \
|
||||
src/libs/python/bongo/admin/Itip.py \
|
||||
src/libs/python/bongo/admin/JsonUtil.py \
|
||||
src/libs/python/bongo/admin/ManagedSlapd.py \
|
||||
src/libs/python/bongo/admin/Mdb.py \
|
||||
src/libs/python/bongo/admin/Msgserver.py \
|
||||
src/libs/python/bongo/admin/Pop3.py \
|
||||
src/libs/python/bongo/admin/Proxy.py \
|
||||
src/libs/python/bongo/admin/Queue.py \
|
||||
src/libs/python/bongo/admin/Schema.py \
|
||||
src/libs/python/bongo/admin/Security.py \
|
||||
src/libs/python/bongo/admin/Smtp.py \
|
||||
src/libs/python/bongo/admin/Store.py \
|
||||
src/libs/python/bongo/admin/Template.py \
|
||||
src/libs/python/bongo/admin/User.py \
|
||||
src/libs/python/bongo/admin/Util.py \
|
||||
src/libs/python/bongo/admin/Webadmin.py \
|
||||
src/libs/python/bongo/admin/Webservices.py \
|
||||
src/libs/python/bongo/admin/bongoutil.py
|
||||
|
||||
pkgpythonexternal_PYTHON = \
|
||||
src/libs/python/bongo/external/__init__.py
|
||||
|
||||
pkgpythonexternaldateutil_PYTHON = \
|
||||
src/libs/python/bongo/external/dateutil/__init__.py \
|
||||
src/libs/python/bongo/external/dateutil/easter.py \
|
||||
src/libs/python/bongo/external/dateutil/parser.py \
|
||||
src/libs/python/bongo/external/dateutil/relativedelta.py \
|
||||
src/libs/python/bongo/external/dateutil/rrule.py \
|
||||
src/libs/python/bongo/external/dateutil/tz.py \
|
||||
src/libs/python/bongo/external/dateutil/tzwin.py
|
||||
|
||||
pkgpythonexternaldateutilzoneinfo_PYTHON = \
|
||||
src/libs/python/bongo/external/dateutil/zoneinfo/__init__.py
|
||||
|
||||
pkgpythonexternalemail_PYTHON = \
|
||||
src/libs/python/bongo/external/email/feedparser.py \
|
||||
src/libs/python/bongo/external/email/_parseaddr.py \
|
||||
src/libs/python/bongo/external/email/parser.py \
|
||||
src/libs/python/bongo/external/email/message.py \
|
||||
src/libs/python/bongo/external/email/header.py \
|
||||
src/libs/python/bongo/external/email/iterators.py \
|
||||
src/libs/python/bongo/external/email/encoders.py \
|
||||
src/libs/python/bongo/external/email/payloads.py \
|
||||
src/libs/python/bongo/external/email/quoprimime.py \
|
||||
src/libs/python/bongo/external/email/generator.py \
|
||||
src/libs/python/bongo/external/email/filegenerator.py \
|
||||
src/libs/python/bongo/external/email/charset.py \
|
||||
src/libs/python/bongo/external/email/base64mime.py \
|
||||
src/libs/python/bongo/external/email/__init__.py \
|
||||
src/libs/python/bongo/external/email/errors.py \
|
||||
src/libs/python/bongo/external/email/utils.py
|
||||
|
||||
pkgpythonexternalemailmime_PYTHON = \
|
||||
src/libs/python/bongo/external/email/mime/audio.py \
|
||||
src/libs/python/bongo/external/email/mime/message.py \
|
||||
src/libs/python/bongo/external/email/mime/nonmultipart.py \
|
||||
src/libs/python/bongo/external/email/mime/multipart.py \
|
||||
src/libs/python/bongo/external/email/mime/text.py \
|
||||
src/libs/python/bongo/external/email/mime/image.py \
|
||||
src/libs/python/bongo/external/email/mime/base.py \
|
||||
src/libs/python/bongo/external/email/mime/__init__.py \
|
||||
src/libs/python/bongo/external/email/mime/application.py
|
||||
|
||||
pkgpythonexternalsimplejson_PYTHON = \
|
||||
src/libs/python/bongo/external/simplejson/__init__.py \
|
||||
src/libs/python/bongo/external/simplejson/decoder.py \
|
||||
src/libs/python/bongo/external/simplejson/encoder.py \
|
||||
src/libs/python/bongo/external/simplejson/jsonfilter.py \
|
||||
src/libs/python/bongo/external/simplejson/scanner.py
|
||||
|
||||
pkgpythonexternalsimpletal_PYTHON = \
|
||||
src/libs/python/bongo/external/simpletal/DummyLogger.py \
|
||||
src/libs/python/bongo/external/simpletal/__init__.py \
|
||||
src/libs/python/bongo/external/simpletal/simpleElementTree.py \
|
||||
src/libs/python/bongo/external/simpletal/simpleTAL.py \
|
||||
src/libs/python/bongo/external/simpletal/FixedHTMLParser.py \
|
||||
src/libs/python/bongo/external/simpletal/sgmlentitynames.py \
|
||||
src/libs/python/bongo/external/simpletal/simpleTALES.py \
|
||||
src/libs/python/bongo/external/simpletal/simpleTALUtils.py
|
||||
|
||||
|
||||
pkgpythonexternalvobject_PYTHON = \
|
||||
src/libs/python/bongo/external/vobject/__init__.py \
|
||||
src/libs/python/bongo/external/vobject/base.py \
|
||||
src/libs/python/bongo/external/vobject/behavior.py \
|
||||
src/libs/python/bongo/external/vobject/icalendar.py \
|
||||
src/libs/python/bongo/external/vobject/vcard.py \
|
||||
src/libs/python/bongo/external/vobject/win32tz.py
|
||||
|
||||
pkgpythonnmap_PYTHON = \
|
||||
src/libs/python/bongo/nmap/__init__.py \
|
||||
src/libs/python/bongo/nmap/CommandStream.py \
|
||||
src/libs/python/bongo/nmap/NmapClient.py \
|
||||
src/libs/python/bongo/nmap/NmapConnection.py \
|
||||
src/libs/python/bongo/nmap/QueueClient.py
|
||||
|
||||
pkgpythonstore_PYTHON = \
|
||||
src/libs/python/bongo/store/__init__.py \
|
||||
src/libs/python/bongo/store/CommandStream.py \
|
||||
src/libs/python/bongo/store/QueueClient.py \
|
||||
src/libs/python/bongo/store/StoreClient.py \
|
||||
src/libs/python/bongo/store/StoreConnection.py
|
||||
|
||||
CLEANFILES += \
|
||||
src/libs/python/bongo/*.pyc \
|
||||
src/libs/python/bongo/external/*.pyc \
|
||||
src/libs/python/bongo/external/simplejson/*.pyc \
|
||||
src/libs/python/bongo/nmap/*.pyc \
|
||||
src/libs/python/bongoy/store/*.pyc
|
||||
|
||||
src/libs/python/bongo-python-wrapper: $(top_builddir)/config.status $(srcdir)/src/libs/python/bongo-python-wrapper.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $@
|
||||
|
||||
src/libs/python/all: src/libs/python/bongo/all
|
||||
src/libs/python/clean: clean
|
||||
@@ -1,17 +0,0 @@
|
||||
# -*- Makefile -*-
|
||||
#
|
||||
# Do not edit!
|
||||
#
|
||||
# (unless this is Makefile.am.subdir)
|
||||
#
|
||||
# This file is a copy of the toplevel Makefile.am.subdir. If changes
|
||||
# need to be made, edit that file, and make update-makefiles, and
|
||||
# check the new files in.
|
||||
#
|
||||
# This is a skeletal automake file. The real automake fules for
|
||||
# building the targets for this directory can be found in the
|
||||
# Bongo.rules file. This file is simply here so that 'make all' can
|
||||
# work in each subdirectory.
|
||||
|
||||
all clean install:
|
||||
@cd $(top_builddir) && $(MAKE) $(MFLAGS) $(subdir)/$@
|
||||
@@ -0,0 +1,8 @@
|
||||
# should look at doing a 'real' python install
|
||||
# http://www.python.org/doc/2.2.3/dist/setup-script.html
|
||||
|
||||
install(DIRECTORY ./
|
||||
DESTINATION "${PYTHON_SITEPACKAGES_PATH}/bongo/"
|
||||
FILES_MATCHING PATTERN "*.py"
|
||||
PATTERN ".svn" EXCLUDE
|
||||
)
|
||||
@@ -1,17 +0,0 @@
|
||||
# -*- Makefile -*-
|
||||
#
|
||||
# Do not edit!
|
||||
#
|
||||
# (unless this is Makefile.am.subdir)
|
||||
#
|
||||
# This file is a copy of the toplevel Makefile.am.subdir. If changes
|
||||
# need to be made, edit that file, and make update-makefiles, and
|
||||
# check the new files in.
|
||||
#
|
||||
# This is a skeletal automake file. The real automake fules for
|
||||
# building the targets for this directory can be found in the
|
||||
# Bongo.rules file. This file is simply here so that 'make all' can
|
||||
# work in each subdirectory.
|
||||
|
||||
all clean install:
|
||||
@cd $(top_builddir) && $(MAKE) $(MFLAGS) $(subdir)/$@
|
||||
@@ -1,79 +0,0 @@
|
||||
# -*- Makefile -*-
|
||||
pkgpyexecdir = $(pyexecdir)/libbongo
|
||||
|
||||
pkgpyexec_PYTHON = \
|
||||
src/libs/python/libbongo/__init__.py
|
||||
|
||||
pkgpyexec_LTLIBRARIES = \
|
||||
libs.la \
|
||||
bootstrap.la
|
||||
|
||||
# src/libs/python/libbongo/mdb.c
|
||||
libs_la_SOURCES = \
|
||||
src/libs/python/libbongo/cal.c \
|
||||
src/libs/python/libbongo/calcmd.c \
|
||||
src/libs/python/libbongo/libs.c \
|
||||
src/libs/python/libbongo/libs.h \
|
||||
src/libs/python/libbongo/msgapi.c \
|
||||
src/libs/python/libbongo/msgapi-defs.c \
|
||||
src/libs/python/libbongo/msgapi-defs.h \
|
||||
src/libs/python/libbongo/pybongo.c \
|
||||
src/libs/python/libbongo/pybongo.h \
|
||||
src/libs/python/libbongo/streamio.c \
|
||||
src/libs/python/libbongo/json.c \
|
||||
src/libs/python/libbongo/json.h \
|
||||
src/libs/python/libbongo/tests.c \
|
||||
src/libs/python/libbongo/bongoutil.c
|
||||
|
||||
libs_la_CPPFLAGS = $(AM_CPPFLAGS) \
|
||||
$(PYTHON_CPPFLAGS) \
|
||||
$(LIBICAL_CFLAGS) \
|
||||
$(bongo_CFLAGS)
|
||||
|
||||
libs_la_LDFLAGS = -avoid-version -module
|
||||
libs_la_LIBADD = \
|
||||
$(PYTHON_LIBS) \
|
||||
libbongocal.la \
|
||||
libbongocalcmd.la \
|
||||
libbongoutil.la \
|
||||
libbongo-json.la \
|
||||
libbongomsgapi.la \
|
||||
libbongostreamio.la
|
||||
|
||||
# src/libs/python/libbongo/mdb.c
|
||||
bootstrap_la_SOURCES = \
|
||||
src/libs/python/libbongo/bootstrap.c \
|
||||
src/libs/python/libbongo/bootstrap.h \
|
||||
src/libs/python/libbongo/msgapi-defs.c \
|
||||
src/libs/python/libbongo/msgapi-defs.h \
|
||||
src/libs/python/libbongo/pybongo.c \
|
||||
src/libs/python/libbongo/pybongo.h
|
||||
|
||||
bootstrap_la_CPPFLAGS = $(AM_CPPFLAGS) \
|
||||
$(PYTHON_CPPFLAGS) \
|
||||
$(bongo_CFLAGS)
|
||||
|
||||
bootstrap_la_LDFLAGS = -avoid-version -module
|
||||
bootstrap_la_LIBADD = \
|
||||
$(PYTHON_LIBS) \
|
||||
libbongomsgapi.la
|
||||
|
||||
src/libs/python/libbongo/libs.so: libs.la
|
||||
cp .libs/libs.so $@
|
||||
|
||||
src/libs/python/libbongo/bootstrap.so: bootstrap.la
|
||||
cp .libs/bootstrap.so $@
|
||||
|
||||
noinst_DATA += \
|
||||
src/libs/python/libbongo/libs.so \
|
||||
src/libs/python/libbongo/bootstrap.so
|
||||
|
||||
CLEANFILES += \
|
||||
src/libs/python/libbongo/libs.so \
|
||||
src/libs/python/libbongo/bootstrap.so
|
||||
|
||||
src/libs/python/libbongo/all: \
|
||||
src/libs/python/libbongo/libs.so \
|
||||
src/libs/python/libbongo/bootstrap.so
|
||||
|
||||
src/libs/python/bongo/clean: clean
|
||||
@@ -0,0 +1,42 @@
|
||||
include_directories(AFTER ${PYTHON_INCLUDE_PATH})
|
||||
|
||||
python_add_module(libs
|
||||
cal.c
|
||||
calcmd.c
|
||||
libs.c
|
||||
msgapi.c
|
||||
msgapi-defs.c
|
||||
pybongo.c
|
||||
streamio.c
|
||||
json.c
|
||||
tests.c
|
||||
bongoutil.c
|
||||
)
|
||||
|
||||
python_add_module(bootstrap
|
||||
bootstrap.c
|
||||
msgapi-defs.c
|
||||
pybongo.c
|
||||
)
|
||||
|
||||
# remove 'lib' prefix from these libraries.
|
||||
set_target_properties(libs bootstrap
|
||||
PROPERTIES
|
||||
PREFIX ""
|
||||
)
|
||||
|
||||
target_link_libraries(libs
|
||||
bongonmap
|
||||
bongomsgapi
|
||||
bongojson
|
||||
bongoutil
|
||||
bongoxpl
|
||||
bongocal
|
||||
${PYTHON_LIBRARIES}
|
||||
)
|
||||
|
||||
target_link_libraries(bootstrap
|
||||
${PYTHON_LIBRARIES}
|
||||
)
|
||||
|
||||
install(TARGETS libs bootstrap DESTINATION ${PYTHON_SITEPACKAGES_PATH}/libbongo/)
|
||||
@@ -1,17 +0,0 @@
|
||||
# -*- Makefile -*-
|
||||
#
|
||||
# Do not edit!
|
||||
#
|
||||
# (unless this is Makefile.am.subdir)
|
||||
#
|
||||
# This file is a copy of the toplevel Makefile.am.subdir. If changes
|
||||
# need to be made, edit that file, and make update-makefiles, and
|
||||
# check the new files in.
|
||||
#
|
||||
# This is a skeletal automake file. The real automake fules for
|
||||
# building the targets for this directory can be found in the
|
||||
# Bongo.rules file. This file is simply here so that 'make all' can
|
||||
# work in each subdirectory.
|
||||
|
||||
all clean install:
|
||||
@cd $(top_builddir) && $(MAKE) $(MFLAGS) $(subdir)/$@
|
||||
@@ -22,7 +22,6 @@
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#include <bongo-config.h>
|
||||
#include <xpl.h>
|
||||
#include <bongoutil.h>
|
||||
#include <string.h>
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
#include <Python.h>
|
||||
#include "bootstrap.h"
|
||||
#include "msgapi-defs.h"
|
||||
#include <bongo-config.h>
|
||||
#include <memmgr.h>
|
||||
#include <msgapi.h>
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#include <Python.h>
|
||||
#include <datetime.h>
|
||||
|
||||
#include <bongo-config.h>
|
||||
|
||||
#include <bongojson.h>
|
||||
#include <bongocal.h>
|
||||
#include <bongocal-raw.h>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#include <Python.h>
|
||||
|
||||
#include <bongo-config.h>
|
||||
#include <calcmd.h>
|
||||
#include <msgapi.h>
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#include <Python.h>
|
||||
#include "structmember.h"
|
||||
|
||||
#include <bongo-config.h>
|
||||
#include <bongojson.h>
|
||||
#include <bongocal.h>
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
#include <Python.h>
|
||||
#include "libs.h"
|
||||
#include "pybongo.h"
|
||||
#include <bongo-config.h>
|
||||
#include <xpl.h>
|
||||
#include <connio.h>
|
||||
#include <memmgr.h>
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
#define PYBONGO_MSGAPI_DEFS_H
|
||||
|
||||
#include "pybongo.h"
|
||||
#include <bongo-config.h>
|
||||
#include <xpl.h>
|
||||
#include <msgapi.h>
|
||||
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#include <bongo-config.h>
|
||||
#include <xpl.h>
|
||||
#include <msgapi.h>
|
||||
#include <connio.h>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#include <Python.h>
|
||||
|
||||
#include <bongo-config.h>
|
||||
#include <streamio.h>
|
||||
#include <bongostream.h>
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
#include <Python.h>
|
||||
|
||||
#include <bongo-config.h>
|
||||
|
||||
#include "libs.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
Reference in New Issue
Block a user