svn commit: samba r25491 - in branches/4.0-python: . source/build/smb_build source/lib/ldb source/scripting/python source/scripting/swig source/setup

[jelmer at samba.org]

Author: jelmer
Date: 2007-10-03 20:15:01 +0000 (Wed, 03 Oct 2007)
New Revision: 25491

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

Log:
Some more minor tweaks, let the build system build python mods by default.
Modified:
   branches/4.0-python/
   branches/4.0-python/source/build/smb_build/makefile.pm
   branches/4.0-python/source/lib/ldb/config.mk
   branches/4.0-python/source/scripting/python/provision.py
   branches/4.0-python/source/scripting/swig/config.mk
   branches/4.0-python/source/setup/provision


Changeset:

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

Modified: branches/4.0-python/source/build/smb_build/makefile.pm
===================================================================
--- branches/4.0-python/source/build/smb_build/makefile.pm	2007-10-03 19:57:32 UTC (rev 25490)
+++ branches/4.0-python/source/build/smb_build/makefile.pm	2007-10-03 20:15:01 UTC (rev 25491)
@@ -24,6 +24,7 @@
 	$self->{bin_progs} = [];
 	$self->{torture_progs} = [];
 	$self->{static_libs} = [];
+	$self->{python_dsos} = [];
 	$self->{shared_libs} = [];
 	$self->{installable_shared_libs} = [];
 	$self->{headers} = [];
@@ -306,6 +307,9 @@
 				$self->{uninstall_plugins} .= "\t\@-rm \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$_.\$(SHLIBEXT)\n";
 			}
 		}
+	} elsif ($ctx->{TYPE} eq "PYTHON") {
+		push (@{$self->{python_dsos}}, 
+		"$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
 	}
 
 	$has_static_lib = 1 if grep(/STATIC_LIBRARY/, @{$ctx->{OUTPUT_TYPE}});
@@ -632,6 +636,7 @@
 	$self->output("BINARIES = " . array2oneperline($self->{binaries}) . "\n");
 	$self->output("STATIC_LIBS = " . array2oneperline($self->{static_libs}) . "\n");
 	$self->output("SHARED_LIBS = " . array2oneperline($self->{shared_libs}) . "\n");
+	$self->output("PYTHON_DSOS = " . array2oneperline($self->{python_dsos}) . "\n");
 	$self->output("INSTALLABLE_SHARED_LIBS = " . array2oneperline($self->{installable_shared_libs}) . "\n");
 	$self->output("PUBLIC_HEADERS = " . array2oneperline($self->{headers}) . "\n");
 	$self->output("PC_FILES = " . array2oneperline($self->{pc_files}) . "\n");

Modified: branches/4.0-python/source/lib/ldb/config.mk
===================================================================
--- branches/4.0-python/source/lib/ldb/config.mk	2007-10-03 19:57:32 UTC (rev 25490)
+++ branches/4.0-python/source/lib/ldb/config.mk	2007-10-03 20:15:01 UTC (rev 25491)
@@ -195,8 +195,7 @@
 #######################
 # Start LIBRARY swig_ldb
 [PYTHON::swig_ldb]
-PUBLIC_DEPENDENCIES = LIBLDB DYNCONFIG LIBPYTHON
-PRIVATE_DEPENDENCIES = gensec
+PUBLIC_DEPENDENCIES = LIBLDB LIBPYTHON
 SWIG_FILE = swig/ldb.i
 # End LIBRARY swig_ldb
 #######################

Modified: branches/4.0-python/source/scripting/python/provision.py
===================================================================
--- branches/4.0-python/source/scripting/python/provision.py	2007-10-03 19:57:32 UTC (rev 25490)
+++ branches/4.0-python/source/scripting/python/provision.py	2007-10-03 20:15:01 UTC (rev 25491)
@@ -12,6 +12,7 @@
 import uuid, sid, misc
 from socket import gethostname, gethostbyname
 import param
+import ldb
 
 class InvalidNetbiosName(Exception):
     def __init__(self, name):

Modified: branches/4.0-python/source/scripting/swig/config.mk
===================================================================
--- branches/4.0-python/source/scripting/swig/config.mk	2007-10-03 19:57:32 UTC (rev 25490)
+++ branches/4.0-python/source/scripting/swig/config.mk	2007-10-03 20:15:01 UTC (rev 25491)
@@ -7,9 +7,10 @@
 #######################
 
 # Swig extensions
-swig: lib/tdb/swig/_tdb.$(SHLIBEXT) lib/ldb/swig/_ldb.$(SHLIBEXT) \
-	libcli/swig/_libcli_nbt.$(SHLIBEXT) libcli/swig/_libcli_smb.$(SHLIBEXT)
+swig: pythonmods
 
+pythonmods: $(PYTHON_DSOS)
+	
 .SUFFIXES: _wrap.c .i
 
 .i_wrap.c:

Modified: branches/4.0-python/source/setup/provision
===================================================================
--- branches/4.0-python/source/setup/provision	2007-10-03 19:57:32 UTC (rev 25490)
+++ branches/4.0-python/source/setup/provision	2007-10-03 20:15:01 UTC (rev 25491)
@@ -70,7 +70,8 @@
 		help="LDB mapping module to use for the LDAP backend")
 parser.add_option("--aci", type="string", metavar="ACI", 
 		help="An arbitary LDIF fragment, particularly useful to loading a backend ACI value into a target LDAP server. You must provide at least a realm and domain")
-parser.add_option("--server-role", type="string", metavar="ROLE",
+parser.add_option("--server-role", type="choice", metavar="ROLE",
+		          choices=["domain controller", "domain server"],
 		help="Set server role to provision for (default standalone)")
 parser.add_option("--partitions-only", help="Configure Samba's partitions, but do not modify them (ie, join a BDC)")