[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-17-g1d3b140

[fabbione at sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=1d3b1407b0584ef097713b7619768a9389bc7873

The branch, master has been updated
       via  1d3b1407b0584ef097713b7619768a9389bc7873 (commit)
      from  b5fb9a7b7245174d1d33b1c2f70e864331c4a97e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1d3b1407b0584ef097713b7619768a9389bc7873
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Sun Jun 8 07:20:42 2008 +0200

    [BUILD] Prepare infrastructure for perl/python bindings
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                |    4 +++-
 {config => bindings}/Makefile           |    2 +-
 {dlm/tests => bindings/perl}/Makefile   |    2 +-
 {dlm/tests => bindings/python}/Makefile |    2 +-
 configure                               |    7 +++++++
 make/defines.mk.input                   |    1 +
 6 files changed, 14 insertions(+), 4 deletions(-)
 copy {config => bindings}/Makefile (76%)
 copy {dlm/tests => bindings/perl}/Makefile (80%)
 copy {dlm/tests => bindings/python}/Makefile (80%)

diff --git a/Makefile b/Makefile
index d3fb764..a13937f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 include make/defines.mk
 
 REALSUBDIRS = gnbd-kernel/src gfs-kernel/src/gfs \
-	      config cman ccs dlm fence/libfenced group fence gfs gfs2 gnbd rgmanager
+	      config cman ccs dlm fence/libfenced group fence gfs gfs2 gnbd rgmanager bindings
 
 SUBDIRS = $(filter-out \
 	  $(if ${without_gnbd-kernel/src},gnbd-kernel/src) \
@@ -16,6 +16,7 @@ SUBDIRS = $(filter-out \
 	  $(if ${without_gfs2},gfs2) \
 	  $(if ${without_gnbd},gnbd) \
 	  $(if ${without_rgmanager},rgmanager) \
+	  $(if ${without_bindings},bindings) \
 	  , $(REALSUBDIRS))
 
 all: scripts ${SUBDIRS}
@@ -45,6 +46,7 @@ gfs:
 gfs2: group
 gnbd: cman
 rgmanager: cman dlm
+bindings: cman
 
 install: all
 	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
diff --git a/config/Makefile b/bindings/Makefile
similarity index 76%
copy from config/Makefile
copy to bindings/Makefile
index b244f90..21085c2 100644
--- a/config/Makefile
+++ b/bindings/Makefile
@@ -1,4 +1,4 @@
 include ../make/defines.mk
 include $(OBJDIR)/make/passthrough.mk
 
-SUBDIRS=libs tools
+SUBDIRS=perl python
diff --git a/dlm/tests/Makefile b/bindings/perl/Makefile
similarity index 80%
copy from dlm/tests/Makefile
copy to bindings/perl/Makefile
index 28685d2..810b2d4 100644
--- a/dlm/tests/Makefile
+++ b/bindings/perl/Makefile
@@ -1,4 +1,4 @@
 include ../../make/defines.mk
 include $(OBJDIR)/make/passthrough.mk
 
-SUBDIRS=usertest
+SUBDIRS=
diff --git a/dlm/tests/Makefile b/bindings/python/Makefile
similarity index 80%
copy from dlm/tests/Makefile
copy to bindings/python/Makefile
index 28685d2..810b2d4 100644
--- a/dlm/tests/Makefile
+++ b/bindings/python/Makefile
@@ -1,4 +1,4 @@
 include ../../make/defines.mk
 include $(OBJDIR)/make/passthrough.mk
 
-SUBDIRS=usertest
+SUBDIRS=
diff --git a/configure b/configure
index 274945a..0b8b1dd 100755
--- a/configure
+++ b/configure
@@ -89,6 +89,7 @@ my %options = (
 	without_gfs2 => \$without_gfs2,
 	without_gnbd => \$without_gnbd,
 	without_rgmanager => \$without_rgmanager,
+	without_bindings => \$without_bindings,
 	without_kernel_modules => \$without_kernel_modules,
 	disable_kernel_check => \$disable_kernel_check,
 );
@@ -166,6 +167,7 @@ my $err = &GetOptions (\%options,
 		    'without_gfs2',
 		    'without_gnbd',
 		    'without_rgmanager',
+		    'without_bindings',
 		    'without_kernel_modules',
 		    'disable_kernel_check');
 
@@ -249,6 +251,7 @@ if ($help || !$err) {
   print "--without_gfs2\tDisable gfs2 building  (Default: enabled)\n";
   print "--without_gnbd\tDisable gnbd building  (Default: enabled)\n";
   print "--without_rgmanager\tDisable rgmanager building  (Default: enabled)\n";
+  print "--without_bindings\tDisable perl/python bindings building  (Default: enabled)\n";
   print "--without_kernel_modules\tDisable kernel modules building  (Default: enabled)\n";
   print "--disable_kernel_check\tDisable kernel version check  (Default: enabled)\n";
   exit $ret;
@@ -569,6 +572,9 @@ if (!$without_gnbd) {
 if (!$without_rgmanager) {
   $without_rgmanager="";
 }
+if (!$without_bindings) {
+  $without_bindings="";
+}
 if (!$without_kernel_modules) {
   $without_gfskernel=$without_gfs;
   $without_gnbdkernel=$without_gnbd;
@@ -684,6 +690,7 @@ while (<IFILE>) {
   $_ =~ s/\@DISABLE_GNBD\@/$without_gnbd/;
   $_ =~ s/\@DISABLE_GNBDKERNEL\@/$without_gnbdkernel/;
   $_ =~ s/\@DISABLE_RGMANAGER\@/$without_rgmanager/;
+  $_ =~ s/\@DISABLE_BINDINGS\@/$without_bindings/;
 
   print OFILE "$_\n";
 }
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 5fba309..e1c4d2d 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -75,6 +75,7 @@ without_gfs ?= @DISABLE_GFS@
 without_gfs2 ?= @DISABLE_GFS2@
 without_gnbd ?= @DISABLE_GNBD@
 without_rgmanager ?= @DISABLE_RGMANAGER@
+without_bindings ?= @DISABLE_BINDINGS@
 
 THISDIR = $(shell echo $(CURDIR) | sed -e 's|$(OBJDIR)/||g')
 S=$(SRCDIR)/$(THISDIR)


hooks/post-receive
--
Cluster Project