Author: jelmer Date: 2007-11-27 17:19:15 +0000 (Tue, 27 Nov 2007) New Revision: 26173
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26173 Log: Merge upstream. Modified: branches/4.0-python/ branches/4.0-python/source/build/smb_build/input.pm branches/4.0-python/source/build/smb_build/main.pl branches/4.0-python/source/build/smb_build/makefile.pm branches/4.0-python/source/librpc/rpc/dcerpc.i branches/4.0-python/source/scripting/python/config.mk branches/4.0-python/source/scripting/python/parammodule.c branches/4.0-python/source/scripting/python/sidmodule.c Changeset: Property changes on: branches/4.0-python ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:ancestry:v3-trunk0 ...skipped... Name: bzr:file-ids ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/4.0-python/source/build/smb_build/input.pm =================================================================== --- branches/4.0-python/source/build/smb_build/input.pm 2007-11-27 13:23:01 UTC (rev 26172) +++ branches/4.0-python/source/build/smb_build/input.pm 2007-11-27 17:19:15 UTC (rev 26173) @@ -160,7 +160,9 @@ $python->{LIBRARY_REALNAME} = "$basename.\$(SHLIBEXT)"; } - check_library($INPUT, $python, ["SHARED_LIBRARY"]); + $python->{SUBSYSTEM} = "LIBPYTHON"; + + check_module($INPUT, $python, ["SHARED_LIBRARY"]); } sub check_binary($$) Modified: branches/4.0-python/source/build/smb_build/main.pl =================================================================== --- branches/4.0-python/source/build/smb_build/main.pl 2007-11-27 13:23:01 UTC (rev 26172) +++ branches/4.0-python/source/build/smb_build/main.pl 2007-11-27 17:19:15 UTC (rev 26173) @@ -62,14 +62,14 @@ $mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->PkgConfig($key, $OUTPUT) if $key->{TYPE} eq "LIBRARY" and defined($key->{VERSION}); - $mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY" or - $key->{TYPE} eq "PYTHON") and + $mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY") and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); if ($key->{TYPE} eq "LIBRARY" and ${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") { $shared_libs_used = 1; } - $mkenv->SharedModule($key) if $key->{TYPE} eq "MODULE" and + $mkenv->SharedModule($key) if ($key->{TYPE} eq "MODULE" or + $key->{TYPE} eq "PYTHON") and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->Binary($key) if grep(/BINARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES}); Modified: branches/4.0-python/source/build/smb_build/makefile.pm =================================================================== --- branches/4.0-python/source/build/smb_build/makefile.pm 2007-11-27 13:23:01 UTC (rev 26172) +++ branches/4.0-python/source/build/smb_build/makefile.pm 2007-11-27 17:19:15 UTC (rev 26173) @@ -309,6 +309,11 @@ my $sane_subsystem = lc($ctx->{SUBSYSTEM}); $sane_subsystem =~ s/^lib//; + if ($ctx->{TYPE} eq "PYTHON") { + push (@{$self->{python_dsos}}, + "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}"); + } + push (@{$self->{shared_modules}}, "$ctx->{TARGET_SHARED_LIBRARY}"); push (@{$self->{plugins}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}"); @@ -395,11 +400,6 @@ $self->_prepare_list($ctx, "LINK_FLAGS"); # $self->_prepare_list_ex($ctx, "LINK_FLAGS", "-Wl,--whole-archive", "-Wl,--no-whole-archive"); - if ($ctx->{TYPE} eq "PYTHON") { - push (@{$self->{python_dsos}}, - "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}"); - } - push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)"); my $soarg = ""; Modified: branches/4.0-python/source/librpc/rpc/dcerpc.i =================================================================== --- branches/4.0-python/source/librpc/rpc/dcerpc.i 2007-11-27 13:23:01 UTC (rev 26172) +++ branches/4.0-python/source/librpc/rpc/dcerpc.i 2007-11-27 17:19:15 UTC (rev 26173) @@ -41,7 +41,6 @@ %} -%include "samba.i" %include "../../lib/talloc/talloc.i" %include "../../auth/credentials/credentials.i" Modified: branches/4.0-python/source/scripting/python/config.mk =================================================================== --- branches/4.0-python/source/scripting/python/config.mk 2007-11-27 13:23:01 UTC (rev 26172) +++ branches/4.0-python/source/scripting/python/config.mk 2007-11-27 17:19:15 UTC (rev 26173) @@ -26,7 +26,7 @@ @echo "Removing SWIG output files" @-rm -f bin/python/* # FIXME: Remove _wrap.c files - # + pythonmods: $(PYTHON_DSOS) PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py Modified: branches/4.0-python/source/scripting/python/parammodule.c =================================================================== --- branches/4.0-python/source/scripting/python/parammodule.c 2007-11-27 13:23:01 UTC (rev 26172) +++ branches/4.0-python/source/scripting/python/parammodule.c 2007-11-27 17:19:15 UTC (rev 26173) @@ -21,7 +21,6 @@ */ #include "includes.h" -#include "scripting/python/talloc.h" #include "Python.h" #include "param/param.h" Modified: branches/4.0-python/source/scripting/python/sidmodule.c =================================================================== --- branches/4.0-python/source/scripting/python/sidmodule.c 2007-11-27 13:23:01 UTC (rev 26172) +++ branches/4.0-python/source/scripting/python/sidmodule.c 2007-11-27 17:19:15 UTC (rev 26173) @@ -18,7 +18,6 @@ */ #include "includes.h" -#include "scripting/python/talloc.h" #include "Python.h" #include "libcli/security/security.h"
