svn commit: samba r26106 - in branches/SAMBA_4_0/source/lib/ldb: . tests/python

jelmer at samba.org jelmer at samba.org
Sun Nov 25 02:58:13 GMT 2007


Author: jelmer
Date: 2007-11-25 02:58:12 +0000 (Sun, 25 Nov 2007)
New Revision: 26106

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

Log:
Add targets for building, installing and checking python bindings.
Modified:
   branches/SAMBA_4_0/source/lib/ldb/
   branches/SAMBA_4_0/source/lib/ldb/Makefile.in
   branches/SAMBA_4_0/source/lib/ldb/setup.py
   branches/SAMBA_4_0/source/lib/ldb/tests/python/


Changeset:

Property changes on: branches/SAMBA_4_0/source/lib/ldb
___________________________________________________________________
Name: svn:ignore
   - *.d
bin
lib
*.po
*.gc??
Makefile
config.cache
config.status
ldb.pc
configure
config.log
autom4te.cache
apidocs
   + *.d
bin
lib
*.po
*.gc??
Makefile
config.cache
config.status
ldb.pc
configure
config.log
autom4te.cache
apidocs
_trial_temp


Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2007-11-25 02:29:59 UTC (rev 26105)
+++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2007-11-25 02:58:12 UTC (rev 26106)
@@ -99,6 +99,12 @@
 SOLIB = lib/libldb.$(SHLIBEXT).0.9.0
 STATICLIB = lib/libldb.a
 
+lib/$(SONAME): $(SOLIB)
+	ln -fs $< $@
+
+lib/libldb.$(SHLIBEXT): $(SOLIB)
+	ln -fs $< $@
+
 $(SOLIB): $(OBJS)
 	$(SHLD) $(SHLD_FLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS) $(LDAP_LIBS) @SONAMEFLAG@$(SONAME)
 
@@ -170,22 +176,23 @@
 doxygen:
 	test -z "$(DOXYGEN)" || (cd $(srcdir) && "$(DOXYGEN)")
 
-clean:
+clean::
 	rm -f *.o */*.o *.gcov */*.gc?? tdbtest.ldb*
 	rm -f $(BINS) $(TDB_OBJ) $(TALLOC_OBJ) $(STATICLIB) $(NSS_LIB) $(SOLIB)
+	rm -f $(POPT_OBJ)
 	rm -f man/*.1 man/*.3 man/*.html
 	rm -f $(EXAMPLES)
 	rm -rf apidocs/
 	rm -rf tests/schema/
 
-distclean: clean
+distclean:: clean
 	rm -f *~ */*~
 	rm -rf bin lib
 	rm -f config.log config.status config.cache include/config.h
 	rm -f ldb.pc
 	rm -f Makefile
 
-realdistclean: distclean
+realdistclean:: distclean
 	rm -f configure.in include/config.h.in
 
 check:: test check-soloading
@@ -201,7 +208,7 @@
 
 installcheck: install test
 
-install: all
+install:: all
 	mkdir -p $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(libdir) $(bindir)
 	cp $(srcdir)/include/ldb.h $(srcdir)/include/ldb_errors.h $(DESTDIR)$(includedir)
 	cp $(STATICLIB) $(SOLIB) $(DESTDIR)$(libdir)
@@ -224,8 +231,15 @@
 	ctags `find $(srcdir) -name "*.[ch]"`
 
 # Python bindings
-build-python:
+build-python: lib/libldb.$(SHLIBEXT)
 	./setup.py build
 
 install-python:
 	./setup.py install --prefix=$(prefix)
+
+check-python: build-python
+	# FIXME: This isn't portable
+	LD_LIBRARY_PATH=lib PYTHONPATH=.:build/lib.linux-i686-2.4/ trial tests/python/api.py
+
+clean-python:
+	./setup.py clean

Modified: branches/SAMBA_4_0/source/lib/ldb/setup.py
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/setup.py	2007-11-25 02:29:59 UTC (rev 26105)
+++ branches/SAMBA_4_0/source/lib/ldb/setup.py	2007-11-25 02:58:12 UTC (rev 26106)
@@ -10,5 +10,5 @@
       license="LGPLv3",
       keywords=["ldap","ldb","db","ldif"],
       ext_modules=[Extension('_ldb', ['ldb.i'], include_dirs=['include'],
-                             libraries=['ldb','ldap'])],
+                             library_dirs=["lib"], libraries=['ldb','ldap'])],
       )


Property changes on: branches/SAMBA_4_0/source/lib/ldb/tests/python
___________________________________________________________________
Name: svn:ignore
   + *.pyc




More information about the samba-cvs mailing list