svn commit: samba r26177 - in branches/SAMBA_4_0: . source/lib/ldb

jelmer at samba.org jelmer at samba.org
Tue Nov 27 23:28:24 GMT 2007


Author: jelmer
Date: 2007-11-27 23:28:23 +0000 (Tue, 27 Nov 2007)
New Revision: 26177

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26177

Log:
Allow prebuilding swig wrapper, install ldb.py.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/ldb/Makefile.in
   branches/SAMBA_4_0/source/lib/ldb/autogen.sh
   branches/SAMBA_4_0/source/lib/ldb/setup.py


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2007-11-27 18:13:24 UTC (rev 26176)
+++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2007-11-27 23:28:23 UTC (rev 26177)
@@ -15,6 +15,7 @@
 srcdir = @srcdir@
 builddir = @builddir@
 SLAPD = @SLAPD@
+SWIG = swig
 EXTRA_OBJ=@EXTRA_OBJ@
 TESTS=test-tdb.sh @TESTS@
 
@@ -232,11 +233,14 @@
 ctags:
 	ctags `find $(srcdir) -name "*.[ch]"`
 
+%_wrap.c %.py: %.i
+	$(SWIG) -python -keyword $<
+
 # Python bindings
-build-python: lib/libldb.$(SHLIBEXT)
+build-python: lib/libldb.$(SHLIBEXT) ldb_wrap.c ldb.py
 	./setup.py build
 
-install-python:
+install-python: build-python
 	./setup.py install --prefix=$(prefix)
 
 check-python: build-python

Modified: branches/SAMBA_4_0/source/lib/ldb/autogen.sh
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/autogen.sh	2007-11-27 18:13:24 UTC (rev 26176)
+++ branches/SAMBA_4_0/source/lib/ldb/autogen.sh	2007-11-27 23:28:23 UTC (rev 26177)
@@ -17,6 +17,8 @@
 
 rm -rf autom4te.cache
 
+swig -python ldb.i # Ignore errors, for now
+
 echo "Now run ./configure and then make."
 exit 0
 

Modified: branches/SAMBA_4_0/source/lib/ldb/setup.py
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/setup.py	2007-11-27 18:13:24 UTC (rev 26176)
+++ branches/SAMBA_4_0/source/lib/ldb/setup.py	2007-11-27 23:28:23 UTC (rev 26177)
@@ -9,7 +9,7 @@
       author_email="ldb at samba.org",
       license="LGPLv3",
       keywords=["ldap","ldb","db","ldif"],
-      ext_modules=[Extension('_ldb', ['ldb.i'], include_dirs=['include'],
-                             swig_opts=["-keyword"],
+      py_modules=["ldb"],
+      ext_modules=[Extension('_ldb', ['ldb_wrap.c'], include_dirs=['include'],
                              library_dirs=["lib"], libraries=['ldb','ldap'])],
       )



More information about the samba-cvs mailing list