svn commit: samba r26180 - in branches/SAMBA_4_0: . source/lib/tdb

jelmer at samba.org jelmer at samba.org
Wed Nov 28 01:20:03 GMT 2007


Author: jelmer
Date: 2007-11-28 01:20:00 +0000 (Wed, 28 Nov 2007)
New Revision: 26180

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

Log:
Allow prebuilding swig output files.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/tdb/Makefile.in
   branches/SAMBA_4_0/source/lib/tdb/autogen.sh
   branches/SAMBA_4_0/source/lib/tdb/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/tdb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/Makefile.in	2007-11-28 00:25:47 UTC (rev 26179)
+++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in	2007-11-28 01:20:00 UTC (rev 26180)
@@ -21,6 +21,7 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PICFLAG = @PICFLAG@
 SHLIBEXT = @SHLIBEXT@
+SWIG = @SWIG@
 
 .PHONY: test
 
@@ -111,7 +112,10 @@
 realdistclean: distclean
 	rm -f configure include/config.h.in
 
-build-python: libtdb.$(SHLIBEXT)
+tdb_wrap.c tdb.py: tdb.i
+	$(SWIG) -python -keyword tdb.i
+
+build-python: libtdb.$(SHLIBEXT) tdb_wrap.c tdb.py
 	./setup.py build
 
 install-python:

Modified: branches/SAMBA_4_0/source/lib/tdb/autogen.sh
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/autogen.sh	2007-11-28 00:25:47 UTC (rev 26179)
+++ branches/SAMBA_4_0/source/lib/tdb/autogen.sh	2007-11-28 01:20:00 UTC (rev 26180)
@@ -9,6 +9,8 @@
 
 rm -rf autom4te.cache
 
+swig -python -keyword tdb.i # Ignore errors for now
+
 echo "Now run ./configure and then make."
 exit 0
 

Modified: branches/SAMBA_4_0/source/lib/tdb/setup.py
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/setup.py	2007-11-28 00:25:47 UTC (rev 26179)
+++ branches/SAMBA_4_0/source/lib/tdb/setup.py	2007-11-28 01:20:00 UTC (rev 26180)
@@ -5,6 +5,7 @@
 setup(name='tdb',
       version='1.0',
       url="http://tdb.samba.org/",
-      ext_modules=[Extension('_tdb', ['tdb.i'], include_dirs=['include'],
-          library_dirs=["."], libraries=['tdb'], swig_opts=["-keyword"])],
+      py_modules=["tdb"],
+      ext_modules=[Extension('_tdb', ['tdb_wrap.c'], include_dirs=['include'],
+          library_dirs=["."], libraries=['tdb'])],
 )



More information about the samba-cvs mailing list