From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 16 Feb 2010 10:26:38 +0000 (+0000)
Subject: The most recent version copied. Do not modify this instance (RW in ./org.glite.lb).
X-Git-Tag: glite-lbjp-common-db_R_1_0_1_4~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=c07cfdabf9a62130c6ed4e31626f7e921e43ba9e;p=jra1mw.git

The most recent version copied. Do not modify this instance (RW in ./org.glite.lb).
---

diff --git a/org.glite.lbjp-common.maildir/configure b/org.glite.lbjp-common.maildir/configure
index 455145c..b3a5b00 100755
--- a/org.glite.lbjp-common.maildir/configure
+++ b/org.glite.lbjp-common.maildir/configure
@@ -26,6 +26,7 @@ my $lbjp_tag = '';
 my $jp_tag = '';
 my $sec_tag = '';
 my $jobid_tag = '';
+my $libdir = 'lib';
 
 my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient/;
 my %enable_nodes;
@@ -41,6 +42,7 @@ my %extern_prefix = (
 	gsoap => '/usr',
 	mysql => '/usr',
 	'mysql-devel' => '',
+	'mysql-server' => '',
 	voms => '/opt/glite',
 	gridsite => '/opt/glite',
 	lcas => '/opt/glite',
@@ -90,6 +92,7 @@ my @opts = (
 	'security-tag=s' => \$sec_tag,
 	'jobid-tag=s' => \$jobid_tag,
 	'help' => \$help,
+	'libdir=s' => \$libdir,
 );
 
 for (@nodes) {
@@ -108,6 +111,7 @@ my @keeparg = @ARGV;
 GetOptions @opts or die "Errors parsing command line\n";
 
 $extern_prefix{'mysql-devel'}=$extern_prefix{mysql} if $extern_prefix{'mysql-devel'} eq '';
+$extern_prefix{'mysql-server'}=$extern_prefix{mysql} if $extern_prefix{'mysql-server'} eq '';
 
 if ($help) { usage(); exit 0; }
 
@@ -294,7 +298,7 @@ BEGIN{
 	'lb.common' => [ qw/expat cppunit:B classads/ ],
 	'lb.doc' => [],
 	'lb.logger' => [ qw/cppunit:B/ ],
-	'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql cppunit:B gsoap:B classads voms lcas gridsite/ ],
+	'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite/ ],
 	'lb.state-machine' => [ qw/classads/ ],
 	'lb.utils' => [ qw/cppunit:B/ ],
 	'lb.ws-interface' => [],
@@ -484,6 +488,7 @@ PREFIX = $prefix
 stagedir = $stagedir
 thrflavour = $thrflavour
 nothrflavour = $nothrflavour
+libdir = $libdir
 };
 
 	for (@{$need_externs{$short}}) {
@@ -605,7 +610,7 @@ init = None
 install = make install
 clean = make clean
 test = make check
-configure = cd $confdir && \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --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} --libdir=\${libdir} --module $subsys.$module @copts
 checkstyle = None
 
 [Platform-default:Property]
@@ -664,6 +669,7 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour	threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --libdir=libdir		typically [lib,lib64] postfix
   
 Mode of operation:
   --mode={checkout|build|etics}	what to do [build]
diff --git a/org.glite.security.gsoap-plugin/configure b/org.glite.security.gsoap-plugin/configure
index 3fbd147..b3a5b00 100755
--- a/org.glite.security.gsoap-plugin/configure
+++ b/org.glite.security.gsoap-plugin/configure
@@ -26,8 +26,9 @@ my $lbjp_tag = '';
 my $jp_tag = '';
 my $sec_tag = '';
 my $jobid_tag = '';
+my $libdir = 'lib';
 
-my @nodes = qw/client server logger utils client-java doc ws-test db jpprimary jpindex jpclient/;
+my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient/;
 my %enable_nodes;
 my %disable_nodes;
 
@@ -37,23 +38,21 @@ my %extern_prefix = (
 	cppunit => '/usr',
 	expat => '/usr',
 	globus => '/opt/globus',
+	jglobus => '/opt/globus',
 	gsoap => '/usr',
 	mysql => '/usr',
 	'mysql-devel' => '',
+	'mysql-server' => '',
 	voms => '/opt/glite',
 	gridsite => '/opt/glite',
 	lcas => '/opt/glite',
-	trustmanager => '/opt/glite',
 	ant => '/usr',
 	jdk => '/usr',
 	libtar => '/usr',
-	axis => '/usr',
-	log4c => '/usr',
 );
 
 my %jar = (
-	'commons-codec' => '/usr/share/java/commons-codec.jar',
-	'commons-lang' => '/usr/share/java/commons-lang.jar',
+	'commons-codec' => '/usr/share/java/commons-codec-1.3.jar',
 );
 
 
@@ -68,10 +67,10 @@ my %deps_type;
 my %topbuild;
 
 my %lbmodules = (
-	'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test/], 
+	'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test/], 
 	'security' => [qw/gss gsoap-plugin/],
-	'lbjp-common' => [qw/db log maildir server-bones trio jp-interface/],
-	'jobid' => [qw/api-c api-cpp api-java/],
+	'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
+	'jobid' => [qw/api-c api-cpp/],
 	'jp' => [ qw/client doc index primary server-common ws-interface/ ],
 	);
 
@@ -93,6 +92,7 @@ my @opts = (
 	'security-tag=s' => \$sec_tag,
 	'jobid-tag=s' => \$jobid_tag,
 	'help' => \$help,
+	'libdir=s' => \$libdir,
 );
 
 for (@nodes) {
@@ -111,6 +111,7 @@ my @keeparg = @ARGV;
 GetOptions @opts or die "Errors parsing command line\n";
 
 $extern_prefix{'mysql-devel'}=$extern_prefix{mysql} if $extern_prefix{'mysql-devel'} eq '';
+$extern_prefix{'mysql-server'}=$extern_prefix{mysql} if $extern_prefix{'mysql-server'} eq '';
 
 if ($help) { usage(); exit 0; }
 
@@ -293,18 +294,17 @@ sub mode_checkout() {
 BEGIN{
 %need_externs_aux = (
 	'lb.client' => [ qw/cppunit:B classads/ ],
-	'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager/ ],
+	'lb.client-java' => [ qw/ant:B jglobus jdk:B/ ],
 	'lb.common' => [ qw/expat cppunit:B classads/ ],
 	'lb.doc' => [],
-	'lb.logger' => [ qw/cppunit:B log4c/ ],
-	'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql cppunit:B gsoap:B classads voms lcas gridsite log4c/ ],
+	'lb.logger' => [ qw/cppunit:B/ ],
+	'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite/ ],
 	'lb.state-machine' => [ qw/classads/ ],
 	'lb.utils' => [ qw/cppunit:B/ ],
 	'lb.ws-interface' => [],
 	'lb.ws-test' => [ qw/gsoap:B/ ],
 	'lb.types' => [ qw// ],
 	'lbjp-common.db' => [ qw/mysql:R mysql-devel:B/ ],
-	'lbjp-common.log' => [ qw// ],
 	'lbjp-common.maildir' => [ qw// ],
 	'lbjp-common.server-bones' => [ qw// ],
 	'lbjp-common.trio' => [ qw/cppunit:B/ ],
@@ -333,7 +333,6 @@ for my $ext (keys %need_externs_aux) {
 
 %need_jars = (
 	'jobid.api-java' => [ qw/commons-codec/ ],
-	'lb.client-java' => [ qw/commons-lang/ ],
 );
 
 for my $jar (keys %need_jars) {
@@ -351,7 +350,6 @@ for my $jar (keys %need_jars) {
 	/ ],
 	'lb.client-java' => [ qw/
 		lb.types:B
-		lb.ws-interface:B
 		jobid.api-java
 	/ ],
 	'lb.common' => [ qw/
@@ -361,18 +359,17 @@ for my $jar (keys %need_jars) {
 	'lb.doc' => [ qw/lb.types:B/ ],
 	'lb.logger' => [ qw/
 		lbjp-common.trio
-		lbjp-common.log
 		jobid.api-c
 		lb.common
 		security.gss
 	/ ],
 	'lb.server' => [ qw/
 		lb.ws-interface lb.types:B lb.common lb.state-machine
-		lbjp-common.db lbjp-common.server-bones lbjp-common.trio lbjp-common.maildir lbjp-common.log
+		lbjp-common.db lbjp-common.server-bones lbjp-common.trio lbjp-common.maildir
 		jobid.api-c
 		security.gsoap-plugin security.gss
 	/ ],
-	'lb.state-machine' => [ qw/lb.common lbjp-common.jp-interface security.gss/ ],
+	'lb.state-machine' => [ qw/lb.types:B lb.common lbjp-common.jp-interface security.gss/ ],
 	'lb.utils' => [ qw/
 		lbjp-common.jp-interface
 		jobid.api-c
@@ -439,7 +436,7 @@ for my $ext (keys %deps_aux) {
 	jpclient => 'jp.client',
 );
 
-my @t = qw/lb.client-java jobid.api-java lb.types lbjp-common.log/;
+my @t = qw/lb.client-java jobid.api-java lb.types/;
 @topbuild{@t} = (1) x ($#t+1);
 }
 
@@ -457,7 +454,7 @@ sub mkinc
 lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.types lb.common lb.server lb.utils lb.ws-test lb.client-java
 security.gss security.gsoap-plugin
 jobid.api-c jobid.api-cpp jobid.api-java
-lbjp-common.db lbjp-common.log lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
+lbjp-common.db lbjp-common.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface
 jp.client jp.doc jp.index jp.primary jp.server-common jp.ws-interface
 /;
 	@aux{@m} = (1) x ($#m+1);
@@ -491,6 +488,7 @@ PREFIX = $prefix
 stagedir = $stagedir
 thrflavour = $thrflavour
 nothrflavour = $nothrflavour
+libdir = $libdir
 };
 
 	for (@{$need_externs{$short}}) {
@@ -519,7 +517,6 @@ BEGIN{
 		voms=>'org.glite.security.voms-api-cpp',
 		gridsite=>'org.gridsite.shared',
 		lcas=>'org.glite.security.lcas',
-		trustmanager=>'org.glite.security.trustmanager',
 	);
 	%etics_projects = (
 		vdt=>[qw/globus globus_essentials/],
@@ -613,7 +610,7 @@ init = None
 install = make install
 clean = make clean
 test = make check
-configure = cd $confdir && \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --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} --libdir=\${libdir} --module $subsys.$module @copts
 checkstyle = None
 
 [Platform-default:Property]
@@ -672,6 +669,7 @@ General options (defaults in []):
   --thrflavour=flavour
   --nothrflavour=flavour	threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg]
   --listmodules=subsys          list modules of a subsystem
+  --libdir=libdir		typically [lib,lib64] postfix
   
 Mode of operation:
   --mode={checkout|build|etics}	what to do [build]