[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha4-96-g30a33cd
Jelmer Vernooij
jelmer at samba.org
Tue Jun 17 11:49:59 GMT 2008
The branch, v4-0-test has been updated
via 30a33cd0a64c434d6aee551f641343c3b2a6d9ca (commit)
via e12c0b61573f27969a79d4c07a8fd42f6c931d7e (commit)
via 7a7e8f30dd3e5bfad788a098872afa8263321cbb (commit)
via 0e1fccbd73eb0f219ea9662c56ee6da8a92f641a (commit)
via 9a5859c33e2377f3c5ee8d637fa81d49cb6f5456 (commit)
from 1b0621068998590e7b1e9528b78744dcd2cd5909 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 30a33cd0a64c434d6aee551f641343c3b2a6d9ca
Merge: e12c0b61573f27969a79d4c07a8fd42f6c931d7e 1b0621068998590e7b1e9528b78744dcd2cd5909
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jun 17 13:48:29 2008 +0200
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
commit e12c0b61573f27969a79d4c07a8fd42f6c931d7e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jun 17 13:42:19 2008 +0200
Make sure events pc file gets installed.
commit 7a7e8f30dd3e5bfad788a098872afa8263321cbb
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Jun 17 02:21:46 2008 +0200
Avoid including events_util.h in events_internal.h since the latter is
installed.
commit 0e1fccbd73eb0f219ea9662c56ee6da8a92f641a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Jun 16 23:25:48 2008 +0200
Change order of includes in swig file to avoid warnings.
commit 9a5859c33e2377f3c5ee8d637fa81d49cb6f5456
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Jun 16 23:19:14 2008 +0200
Remove support for deprecated JS provisioning.
-----------------------------------------------------------------------
Summary of changes:
source/configure.ac | 1 +
source/lib/events/config.mk | 2 ++
source/lib/events/events.c | 1 +
source/lib/events/events_epoll.c | 1 +
source/lib/events/events_internal.h | 2 --
source/lib/events/events_select.c | 1 +
source/lib/events/events_signal.c | 1 +
source/lib/events/events_standard.c | 1 +
source/lib/events/events_timed.c | 1 +
source/lib/ldb/ldb.i | 2 +-
source/lib/ldb/ldb_wrap.c | 2 +-
source/selftest/target/Samba4.pm | 8 +-------
12 files changed, 12 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.ac b/source/configure.ac
index 8ec6022..7f4b4d0 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -28,6 +28,7 @@ m4_include(nsswitch/nsstest.m4)
m4_include(pidl/config.m4)
AC_CONFIG_FILES(lib/registry/registry.pc)
+AC_CONFIG_FILES(lib/events/events.pc)
AC_CONFIG_FILES(librpc/dcerpc.pc)
AC_CONFIG_FILES(librpc/ndr.pc)
AC_CONFIG_FILES(lib/torture/torture.pc)
diff --git a/source/lib/events/config.mk b/source/lib/events/config.mk
index 8ba5af9..db70830 100644
--- a/source/lib/events/config.mk
+++ b/source/lib/events/config.mk
@@ -54,3 +54,5 @@ swig_events_OBJ_FILES = $(libeventssrcdir)/events_wrap.o
$(eval $(call python_py_module_template,samba/events.py,$(libeventssrcdir)/events.py))
$(swig_events_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
+
+PC_FILES += $(libeventssrcdir)/events.pc
diff --git a/source/lib/events/events.c b/source/lib/events/events.c
index 1c94e34..52699d9 100644
--- a/source/lib/events/events.c
+++ b/source/lib/events/events.c
@@ -55,6 +55,7 @@
#include "replace.h"
#include "events.h"
#include "events_internal.h"
+#include "events_util.h"
struct event_ops_list {
struct event_ops_list *next, *prev;
diff --git a/source/lib/events/events_epoll.c b/source/lib/events/events_epoll.c
index c781bd9..d46d5c2 100644
--- a/source/lib/events/events_epoll.c
+++ b/source/lib/events/events_epoll.c
@@ -25,6 +25,7 @@
#include "system/network.h"
#include "events.h"
#include "events_internal.h"
+#include "events_util.h"
#include <sys/epoll.h>
struct epoll_event_context {
diff --git a/source/lib/events/events_internal.h b/source/lib/events/events_internal.h
index 78df98a..0d0755f 100644
--- a/source/lib/events/events_internal.h
+++ b/source/lib/events/events_internal.h
@@ -156,5 +156,3 @@ bool events_epoll_init(void);
#if HAVE_LINUX_AIO
bool events_aio_init(void);
#endif
-
-#include "events_util.h"
diff --git a/source/lib/events/events_select.c b/source/lib/events/events_select.c
index 9e97d2b..54d3220 100644
--- a/source/lib/events/events_select.c
+++ b/source/lib/events/events_select.c
@@ -27,6 +27,7 @@
#include "system/filesys.h"
#include "system/select.h"
#include "events.h"
+#include "events_util.h"
#include "events_internal.h"
struct select_event_context {
diff --git a/source/lib/events/events_signal.c b/source/lib/events/events_signal.c
index 5c74c47..80a14ac 100644
--- a/source/lib/events/events_signal.c
+++ b/source/lib/events/events_signal.c
@@ -25,6 +25,7 @@
#include "system/select.h"
#include "events.h"
#include "events_internal.h"
+#include "events_util.h"
#define NUM_SIGNALS 64
diff --git a/source/lib/events/events_standard.c b/source/lib/events/events_standard.c
index fbf8389..11128d7 100644
--- a/source/lib/events/events_standard.c
+++ b/source/lib/events/events_standard.c
@@ -32,6 +32,7 @@
#include "system/network.h"
#include "system/select.h" /* needed for HAVE_EVENTS_EPOLL */
#include "events.h"
+#include "events_util.h"
#include "events_internal.h"
struct std_event_context {
diff --git a/source/lib/events/events_timed.c b/source/lib/events/events_timed.c
index c81825b..c58c898 100644
--- a/source/lib/events/events_timed.c
+++ b/source/lib/events/events_timed.c
@@ -27,6 +27,7 @@
#include "system/select.h"
#include "events.h"
#include "events_internal.h"
+#include "events_util.h"
/**
compare two timeval structures.
diff --git a/source/lib/ldb/ldb.i b/source/lib/ldb/ldb.i
index db2fcde..4b61ddb 100644
--- a/source/lib/ldb/ldb.i
+++ b/source/lib/ldb/ldb.i
@@ -36,10 +36,10 @@
#include <stdint.h>
#include <stdbool.h>
#include "talloc.h"
+#include "events.h"
#include "ldb.h"
#include "ldb_errors.h"
#include "ldb_private.h"
-#include "events.h"
typedef struct ldb_message ldb_msg;
typedef struct ldb_context ldb;
diff --git a/source/lib/ldb/ldb_wrap.c b/source/lib/ldb/ldb_wrap.c
index 8614dc7..f9dd847 100644
--- a/source/lib/ldb/ldb_wrap.c
+++ b/source/lib/ldb/ldb_wrap.c
@@ -2546,10 +2546,10 @@ static swig_module_info swig_module = {swig_types, 24, 0, 0, 0, 0};
#include <stdint.h>
#include <stdbool.h>
#include "talloc.h"
+#include "events.h"
#include "ldb.h"
#include "ldb_errors.h"
#include "ldb_private.h"
-#include "events.h"
typedef struct ldb_message ldb_msg;
typedef struct ldb_context ldb;
diff --git a/source/selftest/target/Samba4.pm b/source/selftest/target/Samba4.pm
index 77f4862..b3dc984 100644
--- a/source/selftest/target/Samba4.pm
+++ b/source/selftest/target/Samba4.pm
@@ -706,13 +706,7 @@ nogroup:x:65534:nobody
if (defined($ENV{VALGRIND_PROVISION})) {
push (@provision_options, "valgrind");
}
- if (defined($ENV{PROVISION_EJS})) {
- push (@provision_options, "$self->{bindir}/smbscript");
- push (@provision_options, "$self->{setupdir}/provision.js");
- } else {
-# push (@provision_options, "$self->{bindir}/smbpython");
- push (@provision_options, "$self->{setupdir}/provision");
- }
+ push (@provision_options, "$self->{setupdir}/provision");
push (@provision_options, split(' ', $configuration));
push (@provision_options, "--host-name=$netbiosname");
push (@provision_options, "--host-ip=$ifaceipv4");
--
Samba Shared Repository
More information about the samba-cvs
mailing list