summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jonathan Beck2009-01-11 20:44:33 +0100
committerGravatar Jonathan Beck2009-01-11 20:44:33 +0100
commit74dae54b1b092aca744b4df6668569d6fc1153b5 (patch)
tree46d0e9ade9da94d12a57a06032f4fe81716ff8f5
parented5f0b7154a5f653c240e6962098ae7b28ab61e5 (diff)
downloadlibplist-74dae54b1b092aca744b4df6668569d6fc1153b5.tar.gz
libplist-74dae54b1b092aca744b4df6668569d6fc1153b5.tar.bz2
Add a pythyon binding to the library (using SWIG).
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac7
-rw-r--r--include/plist/plist.h3
-rw-r--r--m4/ac_pkg_swig.m4122
-rw-r--r--m4/ac_python_devel.m4265
-rw-r--r--m4/swig_python.m465
-rw-r--r--src/plist.c5
-rw-r--r--swig/Makefile.am15
-rw-r--r--swig/__init__.py1
-rw-r--r--swig/plist.i171
10 files changed, 654 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 264b0a3..fdb496d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
1AUTOMAKE_OPTIONS = foreign 1AUTOMAKE_OPTIONS = foreign
2ACLOCAL_AMFLAGS = -I m4 2ACLOCAL_AMFLAGS = -I m4
3SUBDIRS = src include plutil 3SUBDIRS = src include plutil swig
4 4
5pkgconfigdir = $(libdir)/pkgconfig 5pkgconfigdir = $(libdir)/pkgconfig
6pkgconfig_DATA = libplist-1.0.pc 6pkgconfig_DATA = libplist-1.0.pc
diff --git a/configure.ac b/configure.ac
index 2f171e1..fb8a484 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,11 @@ AC_CONFIG_MACRO_DIR([m4])
10 10
11AC_PROG_LIBTOOL 11AC_PROG_LIBTOOL
12 12
13AM_PATH_PYTHON(2.3)
14AC_PROG_SWIG(1.3.21)
15SWIG_PYTHON
16
17
13# Checks for programs. 18# Checks for programs.
14AC_PROG_CC 19AC_PROG_CC
15AM_PROG_CC_C_O 20AM_PROG_CC_C_O
@@ -48,4 +53,4 @@ fi
48AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wmissing-declarations -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -Wswitch-default -Wno-unused-parameter") 53AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wmissing-declarations -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -Wswitch-default -Wno-unused-parameter")
49AC_SUBST(GLOBAL_CFLAGS) 54AC_SUBST(GLOBAL_CFLAGS)
50 55
51AC_OUTPUT(Makefile src/Makefile include/Makefile plutil/Makefile libplist-1.0.pc) 56AC_OUTPUT(Makefile src/Makefile include/Makefile plutil/Makefile swig/Makefile libplist-1.0.pc)
diff --git a/include/plist/plist.h b/include/plist/plist.h
index b496d6f..976408d 100644
--- a/include/plist/plist.h
+++ b/include/plist/plist.h
@@ -71,7 +71,10 @@ plist_t plist_get_first_child(plist_t node);
71plist_t plist_get_next_sibling(plist_t node); 71plist_t plist_get_next_sibling(plist_t node);
72plist_t plist_get_prev_sibling(plist_t node); 72plist_t plist_get_prev_sibling(plist_t node);
73 73
74//utili function to find first (and only the first encountred) corresponding node
74plist_t plist_find_node(plist_t plist, plist_type type, void *value, uint64_t length); 75plist_t plist_find_node(plist_t plist, plist_type type, void *value, uint64_t length);
76plist_t plist_find_node_by_string(plist_t plist, char *value);
77
75void plist_get_type_and_value(plist_t node, plist_type * type, void *value, uint64_t * length); 78void plist_get_type_and_value(plist_t node, plist_type * type, void *value, uint64_t * length);
76 79
77//Plist reading 80//Plist reading
diff --git a/m4/ac_pkg_swig.m4 b/m4/ac_pkg_swig.m4
new file mode 100644
index 0000000..738f69d
--- /dev/null
+++ b/m4/ac_pkg_swig.m4
@@ -0,0 +1,122 @@
1# ===========================================================================
2# http://autoconf-archive.cryp.to/ac_pkg_swig.html
3# ===========================================================================
4#
5# SYNOPSIS
6#
7# AC_PROG_SWIG([major.minor.micro])
8#
9# DESCRIPTION
10#
11# This macro searches for a SWIG installation on your system. If found you
12# should call SWIG via $(SWIG). You can use the optional first argument to
13# check if the version of the available SWIG is greater than or equal to
14# the value of the argument. It should have the format: N[.N[.N]] (N is a
15# number between 0 and 999. Only the first N is mandatory.)
16#
17# If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks that
18# the swig package is this version number or higher.
19#
20# In configure.in, use as:
21#
22# AC_PROG_SWIG(1.3.17)
23# SWIG_ENABLE_CXX
24# SWIG_MULTI_MODULE_SUPPORT
25# SWIG_PYTHON
26#
27# LAST MODIFICATION
28#
29# 2008-04-12
30#
31# COPYLEFT
32#
33# Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
34# Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
35# Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
36# Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
37#
38# This program is free software; you can redistribute it and/or modify it
39# under the terms of the GNU General Public License as published by the
40# Free Software Foundation; either version 2 of the License, or (at your
41# option) any later version.
42#
43# This program is distributed in the hope that it will be useful, but
44# WITHOUT ANY WARRANTY; without even the implied warranty of
45# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
46# Public License for more details.
47#
48# You should have received a copy of the GNU General Public License along
49# with this program. If not, see <http://www.gnu.org/licenses/>.
50#
51# As a special exception, the respective Autoconf Macro's copyright owner
52# gives unlimited permission to copy, distribute and modify the configure
53# scripts that are the output of Autoconf when processing the Macro. You
54# need not follow the terms of the GNU General Public License when using
55# or distributing such scripts, even though portions of the text of the
56# Macro appear in them. The GNU General Public License (GPL) does govern
57# all other use of the material that constitutes the Autoconf Macro.
58#
59# This special exception to the GPL applies to versions of the Autoconf
60# Macro released by the Autoconf Macro Archive. When you make and
61# distribute a modified version of the Autoconf Macro, you may extend this
62# special exception to the GPL to apply to your modified version as well.
63
64AC_DEFUN([AC_PROG_SWIG],[
65 AC_PATH_PROG([SWIG],[swig])
66 if test -z "$SWIG" ; then
67 AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org])
68 SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false'
69 elif test -n "$1" ; then
70 AC_MSG_CHECKING([for SWIG version])
71 [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
72 AC_MSG_RESULT([$swig_version])
73 if test -n "$swig_version" ; then
74 # Calculate the required version number components
75 [required=$1]
76 [required_major=`echo $required | sed 's/[^0-9].*//'`]
77 if test -z "$required_major" ; then
78 [required_major=0]
79 fi
80 [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
81 [required_minor=`echo $required | sed 's/[^0-9].*//'`]
82 if test -z "$required_minor" ; then
83 [required_minor=0]
84 fi
85 [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
86 [required_patch=`echo $required | sed 's/[^0-9].*//'`]
87 if test -z "$required_patch" ; then
88 [required_patch=0]
89 fi
90 # Calculate the available version number components
91 [available=$swig_version]
92 [available_major=`echo $available | sed 's/[^0-9].*//'`]
93 if test -z "$available_major" ; then
94 [available_major=0]
95 fi
96 [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
97 [available_minor=`echo $available | sed 's/[^0-9].*//'`]
98 if test -z "$available_minor" ; then
99 [available_minor=0]
100 fi
101 [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
102 [available_patch=`echo $available | sed 's/[^0-9].*//'`]
103 if test -z "$available_patch" ; then
104 [available_patch=0]
105 fi
106 if test $available_major -ne $required_major \
107 -o $available_minor -ne $required_minor \
108 -o $available_patch -lt $required_patch ; then
109 AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org])
110 SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false'
111 else
112 AC_MSG_NOTICE([SWIG executable is '$SWIG'])
113 SWIG_LIB=`$SWIG -swiglib`
114 AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
115 fi
116 else
117 AC_MSG_WARN([cannot determine SWIG version])
118 SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false'
119 fi
120 fi
121 AC_SUBST([SWIG_LIB])
122])
diff --git a/m4/ac_python_devel.m4 b/m4/ac_python_devel.m4
new file mode 100644
index 0000000..7cec10f
--- /dev/null
+++ b/m4/ac_python_devel.m4
@@ -0,0 +1,265 @@
1# ===========================================================================
2# http://autoconf-archive.cryp.to/ac_python_devel.html
3# ===========================================================================
4#
5# SYNOPSIS
6#
7# AC_PYTHON_DEVEL([version])
8#
9# DESCRIPTION
10#
11# Note: Defines as a precious variable "PYTHON_VERSION". Don't override it
12# in your configure.ac.
13#
14# This macro checks for Python and tries to get the include path to
15# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS)
16# output variables. It also exports $(PYTHON_EXTRA_LIBS) and
17# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
18#
19# You can search for some particular version of Python by passing a
20# parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please
21# note that you *have* to pass also an operator along with the version to
22# match, and pay special attention to the single quotes surrounding the
23# version number. Don't use "PYTHON_VERSION" for this: that environment
24# variable is declared as precious and thus reserved for the end-user.
25#
26# This macro should work for all versions of Python >= 2.1.0. As an end
27# user, you can disable the check for the python version by setting the
28# PYTHON_NOVERSIONCHECK environment variable to something else than the
29# empty string.
30#
31# If you need to use this macro for an older Python version, please
32# contact the authors. We're always open for feedback.
33#
34# LAST MODIFICATION
35#
36# 2008-04-12
37#
38# COPYLEFT
39#
40# Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
41# Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
42# Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
43# Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
44# Copyright (c) 2008 Matteo Settenvini <matteo@member.fsf.org>
45# Copyright (c) 2008 Horst Knorr <hk_classes@knoda.org>
46#
47# This program is free software: you can redistribute it and/or modify it
48# under the terms of the GNU General Public License as published by the
49# Free Software Foundation, either version 3 of the License, or (at your
50# option) any later version.
51#
52# This program is distributed in the hope that it will be useful, but
53# WITHOUT ANY WARRANTY; without even the implied warranty of
54# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
55# Public License for more details.
56#
57# You should have received a copy of the GNU General Public License along
58# with this program. If not, see <http://www.gnu.org/licenses/>.
59#
60# As a special exception, the respective Autoconf Macro's copyright owner
61# gives unlimited permission to copy, distribute and modify the configure
62# scripts that are the output of Autoconf when processing the Macro. You
63# need not follow the terms of the GNU General Public License when using
64# or distributing such scripts, even though portions of the text of the
65# Macro appear in them. The GNU General Public License (GPL) does govern
66# all other use of the material that constitutes the Autoconf Macro.
67#
68# This special exception to the GPL applies to versions of the Autoconf
69# Macro released by the Autoconf Macro Archive. When you make and
70# distribute a modified version of the Autoconf Macro, you may extend this
71# special exception to the GPL to apply to your modified version as well.
72
73AC_DEFUN([AC_PYTHON_DEVEL],[
74 #
75 # Allow the use of a (user set) custom python version
76 #
77 AC_ARG_VAR([PYTHON_VERSION],[The installed Python
78 version to use, for example '2.3'. This string
79 will be appended to the Python interpreter
80 canonical name.])
81
82 AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
83 if test -z "$PYTHON"; then
84 AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
85 PYTHON_VERSION=""
86 fi
87
88 #
89 # Check for a version of Python >= 2.1.0
90 #
91 AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
92 ac_supports_python_ver=`$PYTHON -c "import sys, string; \
93 ver = string.split(sys.version)[[0]]; \
94 print ver >= '2.1.0'"`
95 if test "$ac_supports_python_ver" != "True"; then
96 if test -z "$PYTHON_NOVERSIONCHECK"; then
97 AC_MSG_RESULT([no])
98 AC_MSG_FAILURE([
99This version of the AC@&t@_PYTHON_DEVEL macro
100doesn't work properly with versions of Python before
1012.1.0. You may need to re-run configure, setting the
102variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
103PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
104Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
105to something else than an empty string.
106])
107 else
108 AC_MSG_RESULT([skip at user request])
109 fi
110 else
111 AC_MSG_RESULT([yes])
112 fi
113
114 #
115 # if the macro parameter ``version'' is set, honour it
116 #
117 if test -n "$1"; then
118 AC_MSG_CHECKING([for a version of Python $1])
119 ac_supports_python_ver=`$PYTHON -c "import sys, string; \
120 ver = string.split(sys.version)[[0]]; \
121 print ver $1"`
122 if test "$ac_supports_python_ver" = "True"; then
123 AC_MSG_RESULT([yes])
124 else
125 AC_MSG_RESULT([no])
126 AC_MSG_ERROR([this package requires Python $1.
127If you have it installed, but it isn't the default Python
128interpreter in your system path, please pass the PYTHON_VERSION
129variable to configure. See ``configure --help'' for reference.
130])
131 PYTHON_VERSION=""
132 fi
133 fi
134
135 #
136 # Check if you have distutils, else fail
137 #
138 AC_MSG_CHECKING([for the distutils Python package])
139 ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
140 if test -z "$ac_distutils_result"; then
141 AC_MSG_RESULT([yes])
142 else
143 AC_MSG_RESULT([no])
144 AC_MSG_ERROR([cannot import Python module "distutils".
145Please check your Python installation. The error was:
146$ac_distutils_result])
147 PYTHON_VERSION=""
148 fi
149
150 #
151 # Check for Python include path
152 #
153 AC_MSG_CHECKING([for Python include path])
154 if test -z "$PYTHON_CPPFLAGS"; then
155 python_path=`$PYTHON -c "import distutils.sysconfig; \
156 print distutils.sysconfig.get_python_inc();"`
157 if test -n "${python_path}"; then
158 python_path="-I$python_path"
159 fi
160 PYTHON_CPPFLAGS=$python_path
161 fi
162 AC_MSG_RESULT([$PYTHON_CPPFLAGS])
163 AC_SUBST([PYTHON_CPPFLAGS])
164
165 #
166 # Check for Python library path
167 #
168 AC_MSG_CHECKING([for Python library path])
169 if test -z "$PYTHON_LDFLAGS"; then
170 # (makes two attempts to ensure we've got a version number
171 # from the interpreter)
172 py_version=`$PYTHON -c "from distutils.sysconfig import *; \
173 from string import join; \
174 print join(get_config_vars('VERSION'))"`
175 if test "$py_version" == "[None]"; then
176 if test -n "$PYTHON_VERSION"; then
177 py_version=$PYTHON_VERSION
178 else
179 py_version=`$PYTHON -c "import sys; \
180 print sys.version[[:3]]"`
181 fi
182 fi
183
184 PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
185 from string import join; \
186 print '-L' + get_python_lib(0,1), \
187 '-lpython';"`$py_version
188 fi
189 AC_MSG_RESULT([$PYTHON_LDFLAGS])
190 AC_SUBST([PYTHON_LDFLAGS])
191
192 #
193 # Check for site packages
194 #
195 AC_MSG_CHECKING([for Python site-packages path])
196 if test -z "$PYTHON_SITE_PKG"; then
197 PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
198 print distutils.sysconfig.get_python_lib(0,0);"`
199 fi
200 AC_MSG_RESULT([$PYTHON_SITE_PKG])
201 AC_SUBST([PYTHON_SITE_PKG])
202
203 #
204 # libraries which must be linked in when embedding
205 #
206 AC_MSG_CHECKING(python extra libraries)
207 if test -z "$PYTHON_EXTRA_LIBS"; then
208 PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
209 conf = distutils.sysconfig.get_config_var; \
210 print conf('LOCALMODLIBS'), conf('LIBS')"`
211 fi
212 AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
213 AC_SUBST(PYTHON_EXTRA_LIBS)
214
215 #
216 # linking flags needed when embedding
217 #
218 AC_MSG_CHECKING(python extra linking flags)
219 if test -z "$PYTHON_EXTRA_LDFLAGS"; then
220 PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
221 conf = distutils.sysconfig.get_config_var; \
222 print conf('LINKFORSHARED')"`
223 fi
224 AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
225 AC_SUBST(PYTHON_EXTRA_LDFLAGS)
226
227 #
228 # final check to see if everything compiles alright
229 #
230 AC_MSG_CHECKING([consistency of all components of python development environment])
231 AC_LANG_PUSH([C])
232 # save current global flags
233 LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
234 CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
235 AC_TRY_LINK([
236 #include <Python.h>
237 ],[
238 Py_Initialize();
239 ],[pythonexists=yes],[pythonexists=no])
240
241 AC_MSG_RESULT([$pythonexists])
242
243 if test ! "$pythonexists" = "yes"; then
244 AC_MSG_ERROR([
245 Could not link test program to Python. Maybe the main Python library has been
246 installed in some non-standard library path. If so, pass it to configure,
247 via the LDFLAGS environment variable.
248 Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
249 ============================================================================
250 ERROR!
251 You probably have to install the development version of the Python package
252 for your distribution. The exact name of this package varies among them.
253 ============================================================================
254 ])
255 PYTHON_VERSION=""
256 fi
257 AC_LANG_POP
258 # turn back to default flags
259 CPPFLAGS="$ac_save_CPPFLAGS"
260 LIBS="$ac_save_LIBS"
261
262 #
263 # all done!
264 #
265])
diff --git a/m4/swig_python.m4 b/m4/swig_python.m4
new file mode 100644
index 0000000..2496976
--- /dev/null
+++ b/m4/swig_python.m4
@@ -0,0 +1,65 @@
1# ===========================================================================
2# http://autoconf-archive.cryp.to/swig_python.html
3# ===========================================================================
4#
5# SYNOPSIS
6#
7# SWIG_PYTHON([use-shadow-classes = {no, yes}])
8#
9# DESCRIPTION
10#
11# Checks for Python and provides the $(SWIG_PYTHON_CPPFLAGS), and
12# $(SWIG_PYTHON_OPT) output variables.
13#
14# $(SWIG_PYTHON_OPT) contains all necessary SWIG options to generate code
15# for Python. Shadow classes are enabled unless the value of the optional
16# first argument is exactly 'no'. If you need multi module support
17# (provided by the SWIG_MULTI_MODULE_SUPPORT macro) use
18# $(SWIG_PYTHON_LIBS) to link against the appropriate library. It contains
19# the SWIG Python runtime library that is needed by the type check system
20# for example.
21#
22# LAST MODIFICATION
23#
24# 2008-04-12
25#
26# COPYLEFT
27#
28# Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
29# Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
30# Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
31# Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
32#
33# This program is free software; you can redistribute it and/or modify it
34# under the terms of the GNU General Public License as published by the
35# Free Software Foundation; either version 2 of the License, or (at your
36# option) any later version.
37#
38# This program is distributed in the hope that it will be useful, but
39# WITHOUT ANY WARRANTY; without even the implied warranty of
40# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
41# Public License for more details.
42#
43# You should have received a copy of the GNU General Public License along
44# with this program. If not, see <http://www.gnu.org/licenses/>.
45#
46# As a special exception, the respective Autoconf Macro's copyright owner
47# gives unlimited permission to copy, distribute and modify the configure
48# scripts that are the output of Autoconf when processing the Macro. You
49# need not follow the terms of the GNU General Public License when using
50# or distributing such scripts, even though portions of the text of the
51# Macro appear in them. The GNU General Public License (GPL) does govern
52# all other use of the material that constitutes the Autoconf Macro.
53#
54# This special exception to the GPL applies to versions of the Autoconf
55# Macro released by the Autoconf Macro Archive. When you make and
56# distribute a modified version of the Autoconf Macro, you may extend this
57# special exception to the GPL to apply to your modified version as well.
58
59AC_DEFUN([SWIG_PYTHON],[
60 AC_REQUIRE([AC_PROG_SWIG])
61 AC_REQUIRE([AC_PYTHON_DEVEL])
62 test "x$1" != "xno" || swig_shadow=" -noproxy"
63 AC_SUBST([SWIG_PYTHON_OPT],[-python$swig_shadow])
64 AC_SUBST([SWIG_PYTHON_CPPFLAGS],[$PYTHON_CPPFLAGS])
65])
diff --git a/src/plist.c b/src/plist.c
index 640bbe5..adee262 100644
--- a/src/plist.c
+++ b/src/plist.c
@@ -194,6 +194,11 @@ plist_t plist_find_node(plist_t plist, plist_type type, void *value, uint64_t le
194 return NULL; 194 return NULL;
195} 195}
196 196
197plist_t plist_find_node_by_string(plist_t plist, char *value)
198{
199 return plist_find_node(plist, PLIST_STRING, value, strlen(value));
200}
201
197void plist_get_type_and_value(plist_t node, plist_type * type, void *value, uint64_t * length) 202void plist_get_type_and_value(plist_t node, plist_type * type, void *value, uint64_t * length)
198{ 203{
199 if (!node) 204 if (!node)
diff --git a/swig/Makefile.am b/swig/Makefile.am
new file mode 100644
index 0000000..2e5b280
--- /dev/null
+++ b/swig/Makefile.am
@@ -0,0 +1,15 @@
1INCLUDES = -I$(top_srcdir)/include
2
3BUILT_SOURCES = $(srcdir)/plist_wrap.c
4SWIG_SOURCES = plist.i
5
6pkgpython_PYTHON = PList.py __init__.py
7pkgpyexec_LTLIBRARIES = _PList.la
8_PList_la_SOURCES = $(srcdir)/plist_wrap.c $(SWIG_SOURCES)
9_PList_la_CFLAGS = $(PYTHON_CPPFLAGS) -I$(top_srcdir)/src
10_PList_la_LDFLAGS = -module $(PYTHON_LDFLAGS)
11_PList_la_LIBADD = ../src/libplist.la
12
13$(srcdir)/plist_wrap.c : $(SWIG_SOURCES)
14 $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -I$(top_srcdir)/src -o $@ $<
15
diff --git a/swig/__init__.py b/swig/__init__.py
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/swig/__init__.py
@@ -0,0 +1 @@
diff --git a/swig/plist.i b/swig/plist.i
new file mode 100644
index 0000000..78f102f
--- /dev/null
+++ b/swig/plist.i
@@ -0,0 +1,171 @@
1 /* swig.i */
2 %module PList
3 %{
4 /* Includes the header in the wrapper code */
5 #include <plist/plist.h>
6typedef struct {
7 plist_t node;
8} PListNode;
9 %}
10/* Parse the header file to generate wrappers */
11typedef enum {
12 PLIST_BOOLEAN,
13 PLIST_UINT,
14 PLIST_REAL,
15 PLIST_STRING,
16 PLIST_UNICODE,
17 PLIST_ARRAY,
18 PLIST_DICT,
19 PLIST_DATE,
20 PLIST_DATA,
21 PLIST_KEY,
22 PLIST_NONE
23} plist_type;
24
25typedef struct {
26 plist_t node;
27} PListNode;
28
29%extend PListNode { // Attach these functions to struct Vector
30 PListNode(plist_type t) {
31 PListNode* node = NULL;
32 switch (t) {
33 case PLIST_ARRAY :
34 node = (PListNode*) malloc(sizeof(PListNode));
35 node->node = plist_new_array();
36 break;
37 case PLIST_DICT :
38 node = (PListNode*) malloc(sizeof(PListNode));
39 node->node = plist_new_dict();
40 break;
41 default :
42 node = NULL;
43 break;
44 }
45 return node;
46 }
47
48 PListNode(char* xml) {
49 PListNode* plist = (PListNode*) malloc(sizeof(PListNode));
50 plist_from_xml(xml, strlen(xml), &plist->node);
51 return plist;
52 }
53
54 PListNode(char* bin, uint64_t len) {
55 PListNode* plist = (PListNode*) malloc(sizeof(PListNode));
56 plist_from_bin(bin, len, &plist->node);
57 return plist;
58 }
59
60 ~PListNode() {
61 plist_free($self->node);
62 free($self);
63 }
64
65 void AddSubNode(PListNode* subnode) {
66 plist_add_sub_node($self->node, subnode);
67 }
68
69 void AddSubKey(char* k) {
70 plist_add_sub_key_el($self->node, k);
71 }
72
73 void AddSubString(char* s) {
74 plist_add_sub_string_el($self->node, s);
75 }
76
77 void AddSubBool(char b) {
78 plist_add_sub_bool_el($self->node, b);
79 }
80
81 void AddSubUInt(uint64_t i) {
82 plist_add_sub_uint_el($self->node, i);
83 }
84
85 void AddSubReal(double d) {
86 plist_add_sub_real_el($self->node, d);
87 }
88
89 void AddSubData(char* v, uint64_t l) {
90 plist_add_sub_data_el($self->node, v, l);
91 }
92
93 PListNode* GetFirstChild() {
94 PListNode* plist = (PListNode*) malloc(sizeof(PListNode));
95 plist_get_first_child(&$self->node);
96 return plist;
97 }
98
99 PListNode* GetNextSibling() {
100 PListNode* plist = (PListNode*) malloc(sizeof(PListNode));
101 plist_get_next_sibling(&$self->node);
102 return plist;
103 }
104
105 PListNode* GetPrevSibling() {
106 PListNode* plist = (PListNode*) malloc(sizeof(PListNode));
107 plist_get_prev_sibling(&$self->node);
108 return plist;
109 }
110
111 char* AsKey() {
112 char* k = NULL;
113 plist_get_key_val($self->node, &k);
114 return k;
115 }
116
117 char* AsString() {
118 char* s = NULL;
119 plist_get_string_val($self->node, &s);
120 return s;
121 }
122
123 char AsBool() {
124 char b;
125 plist_get_bool_val($self->node, &b);
126 return b;
127 }
128
129 uint64_t AsUInt() {
130 uint64_t i = 0;
131 plist_get_uint_val($self->node, &i);
132 return i;
133 }
134
135 double AsReal() {
136 double d = 0;
137 plist_get_real_val($self->node, &d);
138 return d;
139 }
140
141 char* AsData() {
142 char* v;
143 uint64_t l;
144 plist_get_data_val($self->node, &v, &l);
145 return v;
146 }
147
148 plist_type GetType() {
149 return plist_get_node_type($self->node);
150 }
151
152 PListNode* FindSubNodeByString(char* s) {
153 PListNode* plist = (PListNode*) malloc(sizeof(PListNode));
154 plist = plist_find_node_by_string($self->node, s);
155 return plist;
156 }
157
158 char* ToXml () {
159 char* s = NULL;
160 uint32_t l;
161 plist_to_xml($self->node, &s, &l);
162 return s;
163 }
164
165 char* ToBin () {
166 char* s = NULL;
167 uint32_t l;
168 plist_to_bin($self->node, &s, &l);
169 return s;
170 }
171}; \ No newline at end of file