From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Fri, 30 Jan 2009 11:26:00 +0000 (+0000)
Subject: configure update
X-Git-Tag: glite-security-gss_R_2_0_0_3~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=9d79ad511ac461b0e3a374e52db541e11b244849;p=jra1mw.git

configure update
---

diff --git a/org.glite.security.gss/configure b/org.glite.security.gss/configure
index e58d090..c059fa4 100755
--- a/org.glite.security.gss/configure
+++ b/org.glite.security.gss/configure
@@ -21,6 +21,10 @@ my $help = 0;
 my $listmodules;
 my $version;
 my $output;
+my $lb_tag = '';
+my $lbjp_tag = '';
+my $sec_tag = '';
+my $jobid_tag = '';
 
 my @nodes = qw/client server logger utils client-java doc ws-test/;
 my %enable_nodes;
@@ -73,6 +77,10 @@ my @opts = (
 	'version=s' => \$version,
 	'output=s' => \$output,
 	'stage=s' => \$stagedir,
+	'lb-tag=s' => \$lb_tag,
+	'lbjp-common-tag=s' => \$lbjp_tag,
+	'security-tag=s' => \$sec_tag,
+	'jobid-tag=s' => \$jobid_tag,
 	'help' => \$help,
 );
 
@@ -222,9 +230,42 @@ sub mode_build {
 	
 sub mode_checkout() {
 	for (@modules) {
+		my $module = $_;
+		my $tag = "";
+		if ($lb_tag){
+			for (@{$lbmodules{lb}}){
+				if ("lb.".$_ eq $module){
+					$tag = '-r '.$lb_tag;
+				}
+			}	
+		}
+		if ($lbjp_tag){
+			for (@{$lbmodules{'lbjp-common'}}){
+				if ("lbjp-common.".$_ eq $module){
+                                        $tag = '-r '.$lbjp_tag;
+                                }
+			}
+		}
+		if ($sec_tag){
+			for (@{$lbmodules{security}}){
+				if ("security.".$_ eq $module){
+                                        $tag = '-r '.$sec_tag;
+                                }
+			}
+		}
+		if ($jobid_tag){
+			for (@{$lbmodules{jobid}}){
+				if ("jobid.".$_ eq $module){
+                                        $tag = '-r '.$jobid_tag;
+                                }
+			}
+		}
+		#if (grep {"lb.".$_ eq $module} @{$lbmodules{lb}}){
+		#	print "found";
+		#}
 		$_ = full($_);
 		print "\n*** Checking out $_\n";
-		system("cvs checkout $_") == 0 or die "cvs checkout $_: $?\n";
+		system("cvs checkout  $tag $_") == 0 or die "cvs checkout $tag $_: $?\n";
 	}
 }
 
@@ -505,7 +546,7 @@ init = None
 install = make install
 clean = make clean
 test = make check
-configure = cd $confdir && \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --module $subsys.$module @copts
+configure = cd $confdir && \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --module $subsys.$module @copts
 checkstyle = None
 
 [Platform-default:Property]
@@ -573,6 +614,10 @@ What to build:
   --enable-NODE			build this "node" (set of modules) only. Available nodes are
 					@{$lbmodules{lb}},@{$lbmodules{security}}
   --disable-NODE		don't build this node
+  --lb-tag=tag			checkout LB modules with specific tag
+  --lbjp-common-tag=tag         checkout lbjp-common modules with specific tag
+  --security-tag=tag		checkout security modules with specific tag
+  --jobid-tag=tag		checkout jobid modules with specific tag
 
 Dependencies:
   --with-EXTERNAL=PATH		where to look for an external. Required externals
diff --git a/org.glite.security.gss/project/ChangeLog b/org.glite.security.gss/project/ChangeLog
index 89c5f93..54cf3aa 100644
--- a/org.glite.security.gss/project/ChangeLog
+++ b/org.glite.security.gss/project/ChangeLog
@@ -3,3 +3,7 @@
 
 2.0.0-2
 - proper reference to cppunit
+
+2.0.0-3
+- globus flavors added to configure
+
diff --git a/org.glite.security.gss/project/version.properties b/org.glite.security.gss/project/version.properties
index 4429364..df34a7e 100644
--- a/org.glite.security.gss/project/version.properties
+++ b/org.glite.security.gss/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
 module.version=2.0.0
-module.age=2
+module.age=3