From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 15 May 2012 11:24:13 +0000 (+0000)
Subject: Handle EMI-1 version of gridsite automatically, added project version to gridsite... 
X-Git-Tag: merge_32_head_src~15
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=367a5a3392c14060b8e984d2c1aac9a87bab2c24;p=jra1mw.git

Handle EMI-1 version of gridsite automatically, added project version to gridsite builds.
---

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 6857be9..e457931 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -285,6 +285,9 @@ if ($project =~ /^([^0-9]*)(.*)$/) {
 }
 %project = %{$projects{$project}};
 $project_version = $project{current_version} unless $project_version;
+if ($project ne 'emi' or $project_version <= 1) {
+	$lbmodules{'gridsite'} = [ qw/apache shared commands core devel slashgrid services service-clients gsexec/ ];
+}
 for my $platform (keys %{$project{etics_externs}}) {
 	for $_ (keys %{$project{etics_externs}{$platform}}) {
 		$etics_externs{$platform}{$_} = $project{etics_externs}{$platform}{$_};
@@ -625,6 +628,7 @@ BEGIN{
 	'gridsite.commands' => [ qw/curl:R openssl:R/ ],
 	'gridsite.apache' => [ qw/libxml2:R openssl:R curl:R/ ],
 	'gridsite.libs' => [ qw/libxml2:R openssl:R/ ],
+	'gridsite.shared' => [ qw/libxml2:R openssl:R/ ],
 	'gridsite.devel' => [ qw// ],
 	'gridsite.slashgrid' => [ qw/curl:R fuse:R/],
 	'gridsite.services' => [ qw/curl:R gsoap:R/ ],
@@ -751,6 +755,7 @@ for my $jar (keys %need_jars) {
 	'gridsite.commands' => [ qw/gridsite.core:B/ ],
 	'gridsite.apache' => [ qw/gridsite.core:B/ ],
 	'gridsite.libs' => [ qw/gridsite.core:B / ],
+	'gridsite.shared' => [ qw/gridsite.core:B / ],
 	'gridsite.devel' => [ qw/gridsite.core:B/ ],
 	'gridsite.slashgrid' => [ qw/gridsite.core:B/],
 	'gridsite.services' => [ qw/gridsite.core:B/ ],
@@ -1559,7 +1564,7 @@ sub mode_etics {
 	else {
 		$conf = "$confprefix$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
 # XXX: gridsite hack
-		$conftag = $subsys eq 'gridsite' ? "$project{tag_prefix}{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
+		$conftag = $subsys eq 'gridsite' ? "$project{tag_prefix}{$subsys}${subsys}_R_${major}_${minor}_${rev}" : 
 			"$project{tag_prefix}{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
 
 		# lowering age for older packaging
@@ -1634,7 +1639,7 @@ sub mode_etics {
 			}
 
 			$cmd{default}{configure} = "cat > Makefile.inc <<EOF
-	project = $project
+	project = $project$project_version
 	top_srcdir = ..
 	$flags
 	EOF";