svn commit: samba r14906 - in branches/SAMBA_4_0/source: .
lib/registry scripting scripting/swig
jelmer at samba.org
jelmer at samba.org
Tue Apr 4 14:39:04 GMT 2006
Author: jelmer
Date: 2006-04-04 14:39:00 +0000 (Tue, 04 Apr 2006)
New Revision: 14906
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14906
Log:
Move SWIG-specific files to scripting/swig/
Added:
branches/SAMBA_4_0/source/scripting/swig/config.m4
branches/SAMBA_4_0/source/scripting/swig/config.mk
Removed:
branches/SAMBA_4_0/source/scripting/config.m4
branches/SAMBA_4_0/source/scripting/config.mk
Modified:
branches/SAMBA_4_0/source/configure.in
branches/SAMBA_4_0/source/lib/registry/config.mk
branches/SAMBA_4_0/source/main.mk
Changeset:
Modified: branches/SAMBA_4_0/source/configure.in
===================================================================
--- branches/SAMBA_4_0/source/configure.in 2006-04-04 14:38:05 UTC (rev 14905)
+++ branches/SAMBA_4_0/source/configure.in 2006-04-04 14:39:00 UTC (rev 14906)
@@ -35,7 +35,7 @@
sinclude(libcli/config.m4)
sinclude(smbd/process_model.m4)
sinclude(lib/registry/config.m4)
-sinclude(scripting/config.m4)
+sinclude(scripting/swig/config.m4)
sinclude(gtk/config.m4)
sinclude(ntvfs/posix/config.m4)
sinclude(lib/socket_wrapper/config.m4)
Modified: branches/SAMBA_4_0/source/lib/registry/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/config.mk 2006-04-04 14:38:05 UTC (rev 14905)
+++ branches/SAMBA_4_0/source/lib/registry/config.mk 2006-04-04 14:39:00 UTC (rev 14906)
@@ -21,6 +21,9 @@
--header --outputdir=lib/registry \
--tdr-parser -- lib/registry/regf.idl
+clean::
+ @-rm -f lib/registry/regf.h lib/registry/tdr_regf*
+
################################################
# Start MODULE registry_w95
[MODULE::registry_w95]
Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk 2006-04-04 14:38:05 UTC (rev 14905)
+++ branches/SAMBA_4_0/source/main.mk 2006-04-04 14:39:00 UTC (rev 14906)
@@ -28,7 +28,8 @@
include librpc/config.mk
include client/config.mk
include libcli/config.mk
-include scripting/config.mk
+include scripting/ejs/config.mk
+include scripting/swig/config.mk
include kdc/config.mk
include passdb/config.mk
@@ -246,7 +247,6 @@
@echo Removing generated files
@-rm -f bin/*_init_module.c
@-rm -rf librpc/gen_*
- @-rm -f lib/registry/regf.h lib/registry/tdr_regf*
@echo Removing proto headers
@-rm -f $(PROTO_HEADERS)
@@ -255,7 +255,6 @@
-rm -f Makefile
-rm -f config.status
-rm -f config.log config.cache
- -rm -f samba4-deps.dot
-rm -f config.pm config.mk
-rm -f $(PC_FILES)
Deleted: branches/SAMBA_4_0/source/scripting/config.m4
===================================================================
--- branches/SAMBA_4_0/source/scripting/config.m4 2006-04-04 14:38:05 UTC (rev 14905)
+++ branches/SAMBA_4_0/source/scripting/config.m4 2006-04-04 14:39:00 UTC (rev 14906)
@@ -1,27 +0,0 @@
-dnl # Scripting subsystem
-
-# Check for python support
-
-PYTHON=
-
-AC_ARG_WITH(python,
-[ --with-python=PYTHONNAME build Python libraries],
-[ case "${withval-python}" in
- yes)
- PYTHON=python
- ;;
- no)
- PYTHON=
- ;;
- *)
- PYTHON=${withval-python}
- ;;
- esac ])
-
-if test x"$PYTHON" != "x"; then
- incdir=`python -c 'import sys; print "%s/include/python%d.%d" % (sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'`
- CPPFLAGS="$CPPFLAGS -I $incdir"
-fi
-
-AC_SUBST(PYTHON)
-
Deleted: branches/SAMBA_4_0/source/scripting/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/config.mk 2006-04-04 14:38:05 UTC (rev 14905)
+++ branches/SAMBA_4_0/source/scripting/config.mk 2006-04-04 14:39:00 UTC (rev 14906)
@@ -1,48 +0,0 @@
-include ejs/config.mk
-
-#######################
-# Start LIBRARY swig_tdb
-[LIBRARY::swig_tdb]
-LIBRARY_REALNAME = swig/_tdb.$(SHLIBEXT)
-OBJ_FILES = swig/tdb_wrap.o
-REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG
-# End LIBRARY swig_tdb
-#######################
-
-#######################
-# Start LIBRARY swig_ldb
-[LIBRARY::swig_ldb]
-REQUIRED_SUBSYSTEMS = ldb DYNCONFIG
-LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT)
-OBJ_FILES = swig/ldb_wrap.o
-# End LIBRARY swig_ldb
-#######################
-
-#######################
-# Start LIBRARY swig_dcerpc
-[LIBRARY::swig_dcerpc]
-LIBRARY_REALNAME = swig/_dcerpc.$(SHLIBEXT)
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
-OBJ_FILES = swig/dcerpc_wrap.o
-# End LIBRARY swig_dcerpc
-#######################
-
-# Swig extensions
-swig: scripting/swig/_tdb.$(SHLIBEXT) scripting/swig/_ldb.$(SHLIBEXT)
-
-.SUFFIXES: _wrap.c .i
-
-.i_wrap.c:
- swig -python $<
-
-SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
-
-scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i $(SWIG_INCLUDES)
-
-clean::
- -rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py
-
-# Swig testing
-
-swigtest: swig
- ./script/tests/test_swig.sh
Copied: branches/SAMBA_4_0/source/scripting/swig/config.m4 (from rev 14904, branches/SAMBA_4_0/source/scripting/config.m4)
Copied: branches/SAMBA_4_0/source/scripting/swig/config.mk (from rev 14904, branches/SAMBA_4_0/source/scripting/config.mk)
===================================================================
--- branches/SAMBA_4_0/source/scripting/config.mk 2006-04-04 04:16:02 UTC (rev 14904)
+++ branches/SAMBA_4_0/source/scripting/swig/config.mk 2006-04-04 14:39:00 UTC (rev 14906)
@@ -0,0 +1,46 @@
+#######################
+# Start LIBRARY swig_tdb
+[LIBRARY::swig_tdb]
+LIBRARY_REALNAME = _tdb.$(SHLIBEXT)
+OBJ_FILES = tdb_wrap.o
+REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG
+# End LIBRARY swig_tdb
+#######################
+
+#######################
+# Start LIBRARY swig_ldb
+[LIBRARY::swig_ldb]
+REQUIRED_SUBSYSTEMS = ldb DYNCONFIG
+LIBRARY_REALNAME = _ldb.$(SHLIBEXT)
+OBJ_FILES = ldb_wrap.o
+# End LIBRARY swig_ldb
+#######################
+
+#######################
+# Start LIBRARY swig_dcerpc
+[LIBRARY::swig_dcerpc]
+LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT)
+REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
+OBJ_FILES = dcerpc_wrap.o
+# End LIBRARY swig_dcerpc
+#######################
+
+# Swig extensions
+swig: scripting/swig/_tdb.$(SHLIBEXT) scripting/swig/_ldb.$(SHLIBEXT)
+
+.SUFFIXES: _wrap.c .i
+
+.i_wrap.c:
+ swig -python $<
+
+SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
+
+scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i $(SWIG_INCLUDES)
+
+clean::
+ -rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py
+
+# Swig testing
+
+swigtest: swig
+ ./script/tests/test_swig.sh
More information about the samba-cvs
mailing list