[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.02.00-1-g3aa78ef

[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=3aa78efa2839cc3c00c8f70a3e2bb4c09ddc463c

The branch, STABLE2 has been updated
       via  3aa78efa2839cc3c00c8f70a3e2bb4c09ddc463c (commit)
      from  1f0985dfe6d4d79a539abbe4a681c10296837d91 (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 3aa78efa2839cc3c00c8f70a3e2bb4c09ddc463c
Author: Fabio M. Di Nitto <fabbione at fabbione.net>
Date:   Fri Mar 7 04:45:05 2008 +0100

    [BUILD] Fix configure script to handle releases
    
    Add concept of release_micro value used only for RELEASE_VERSION.
    
    Attention packagers: release_micro is a mandatory value.
    
    Add support for encoding release versions in the tarball by adding
    a file at release time:
    
    cluster/make$ cat official_release_version
    VERSION "2.2.10"
    
    will automatically set the release to 2.2.10 with library sonames to 2.2
    
    NOTE: manual values will always override whatever is set by default.
    
    Signed-off-by: Fabio M. Di Nitto <fabbione at fabbione.net>

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

Summary of changes:
 configure |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 01901f8..fd7825e 100755
--- a/configure
+++ b/configure
@@ -82,6 +82,7 @@ my %options = (
 	enable_xen => \$enable_xen,
 	release_major => \$release_major,
 	release_minor => \$release_minor,
+	release_micro => \$release_micro,
 	without_ccs => \$without_ccs,
 	without_cman => \$without_cman,
 	without_dlm => \$without_dlm,
@@ -144,6 +145,7 @@ my $err = &GetOptions (\%options,
 		    'conffile=s',
 		    'release_major=s',
 		    'release_minor=s',
+		    'release_micro=s',
 		    'fence_agents=s',
 		    'enable_xen',
 		    'without_ccs',
@@ -531,6 +533,9 @@ if (defined($release_major) && not length $release_major) {
 if (defined($release_minor) && not length $release_minor) {
   $release_minor="";
 }
+if (defined($release_micro) && not length $release_micro) {
+  $release_micro="";
+}
 
 @args = "find fence/agents -mindepth 2 -maxdepth 2 -name Makefile -printf '%h'";
 open (IFILE, "@args |");
@@ -619,16 +624,35 @@ while (<IFILE>) {
 
 close IFILE;
 
-if ((not defined($release_major)) || (not defined($release_minor))) {
-  $release_major = DEVEL;
-  $release_minor = `date +%s`;
-  chomp $release_minor;
+if ((not defined($release_major)) || (not defined($release_minor)) || (not defined($release_micro))) {
+  if ( -f 'make/official_release_version' ) {
+    my $current_version = 0;
+    open OFFICIAL_VERSION, '<', "make/official_release_version";
+    while (<OFFICIAL_VERSION>) {
+      if ($_ =~ /VERSION/) {
+	$current_version = $_;
+	last;
+      }
+    }
+    close OFFICIAL_VERSION;
+    $current_version =~ s/.*"(.*)"\n/$1/;
+    my @release_version = split /\./, $current_version;
+    $release_major = $release_version[0];
+    $release_minor = $release_version[1];
+    $release_micro = $release_version[2];
+  } else {
+    $release_major = DEVEL;
+    $release_minor = `date +%s`;
+    chomp $release_minor;
+    $release_micro = 0;
+  }
 }
 
 print OFILE "RELEASE_MAJOR = $release_major\n";
 print OFILE "RELEASE_MINOR = $release_minor\n";
-print OFILE "RELEASE_VERSION = $release_major.$release_minor\n";
-print OFILE "CFLAGS += -DRELEASE_VERSION=\\\"$release_major.$release_minor\\\"\n";
+print OFILE "RELEASE_MICRO = $release_micro\n";
+print OFILE "RELEASE_VERSION = $release_major.$release_minor.$release_micro\n";
+print OFILE "CFLAGS += -DRELEASE_VERSION=\\\"$release_major.$release_minor.$release_micro\\\"\n";
 close OFILE;
 
 print "Completed Makefile configuration\n\n";


hooks/post-receive
--
Cluster Project