From b752d067ea5c8a546fb3886067ccd4d54b92c358 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Thu, 1 Oct 2009 09:07:30 +0000 Subject: [PATCH] The most recent version copied. Do not modify this instance (RW in ./org.glite.lb). --- org.glite.security.gsoap-plugin/configure | 103 ++++++++++++++++++++++++------ 1 file changed, 84 insertions(+), 19 deletions(-) diff --git a/org.glite.security.gsoap-plugin/configure b/org.glite.security.gsoap-plugin/configure index f6c3ac2..3fbd147 100755 --- a/org.glite.security.gsoap-plugin/configure +++ b/org.glite.security.gsoap-plugin/configure @@ -23,10 +23,11 @@ my $version; my $output; my $lb_tag = ''; my $lbjp_tag = ''; +my $jp_tag = ''; my $sec_tag = ''; my $jobid_tag = ''; -my @nodes = qw/client server logger utils client-java doc ws-test/; +my @nodes = qw/client server logger utils client-java doc ws-test db jpprimary jpindex jpclient/; my %enable_nodes; my %disable_nodes; @@ -38,15 +39,21 @@ my %extern_prefix = ( globus => '/opt/globus', gsoap => '/usr', mysql => '/usr', + 'mysql-devel' => '', 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-1.3.jar', + 'commons-codec' => '/usr/share/java/commons-codec.jar', + 'commons-lang' => '/usr/share/java/commons-lang.jar', ); @@ -63,8 +70,9 @@ my %topbuild; my %lbmodules = ( 'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test/], 'security' => [qw/gss gsoap-plugin/], - 'lbjp-common' => [qw/db maildir server-bones trio jp-interface/], + 'lbjp-common' => [qw/db log maildir server-bones trio jp-interface/], 'jobid' => [qw/api-c api-cpp api-java/], + 'jp' => [ qw/client doc index primary server-common ws-interface/ ], ); @@ -81,6 +89,7 @@ my @opts = ( 'stage=s' => \$stagedir, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, + 'jp-tag=s' => \$jp_tag, 'security-tag=s' => \$sec_tag, 'jobid-tag=s' => \$jobid_tag, 'help' => \$help, @@ -101,6 +110,8 @@ 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 ''; + if ($help) { usage(); exit 0; } if ($listmodules) { @@ -124,7 +135,7 @@ die "--enable-* and --disable-* are mutually exclusive\n" die "--module cannot be used with --enable-* or --disable-*\n" if $module && ($en || $dis); -die "$module: unknown module\n" if $module && ! grep $module,@{$lbmodules{lb}},@{$lbmodules{security}}; +die "$module: unknown module\n" if $module && ! grep $module,@{$lbmodules{lb}},@{$lbmodules{security}},{$lbmodules{jp}}; if ($dis) { for (@nodes) { @@ -150,10 +161,11 @@ my @modules; my %aux; if ($module) { +# push @modules,split(/[,.]+/,$module); push @modules,$module; } else { - @modules = map 'lb.'.($extranodmod{$_} ? $extranodmod{$_} : $_),keys %enable_nodes; + @modules = map(($extranodmod{$_} ? $extranodmod{$_} : 'lb.'.$_),(keys %enable_nodes)); my $n; @@ -219,7 +231,7 @@ sub mode_build { my %ldeps; undef %ldeps; @ldeps{@{$deps{$_}}} = 1; for my $x (split /,/,$staged) { delete $ldeps{$x}; } - my @dnames = keys %ldeps; + my @dnames = $module ? () : keys %ldeps; my $full = full($_); my $build = $topbuild{$_} ? '': '/build'; @@ -248,6 +260,13 @@ sub mode_checkout() { } } } + if ($jp_tag){ + for (@{$lbmodules{'jp'}}){ + if ("jp.".$_ eq $module){ + $tag = '-r '.$jp_tag; + } + } + } if ($sec_tag){ for (@{$lbmodules{security}}){ if ("security.".$_ eq $module){ @@ -274,26 +293,33 @@ sub mode_checkout() { BEGIN{ %need_externs_aux = ( 'lb.client' => [ qw/cppunit:B classads/ ], - 'lb.client-java' => [ qw/ant:B/ ], + 'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager/ ], 'lb.common' => [ qw/expat cppunit:B classads/ ], 'lb.doc' => [], - 'lb.logger' => [ qw/cppunit:B/ ], - 'lb.server' => [ qw/globus expat cares mysql cppunit:B gsoap:B classads voms lcas gridsite/ ], + '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.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/ ], + '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/ ], 'lbjp-common.jp-interface' => [ qw/cppunit:B/ ], - 'security.gss' => [ qw/globus cares cppunit:B/ ], - 'security.gsoap-plugin' => [ qw/cppunit:B globus cares gsoap:B/ ], + 'security.gss' => [ qw/globus_essentials:R globus:B cares cppunit:B/ ], + 'security.gsoap-plugin' => [ qw/cppunit:B globus_essentials:R globus:B cares gsoap:B/ ], 'jobid.api-c' => [ qw/cppunit:B/ ], 'jobid.api-cpp' => [ qw/cppunit:B/ ], 'jobid.api-java' => [ qw/ant:B jdk:B/ ], + 'jp.client' => [ qw/gsoap libtar globus_essentials:R globus:B/ ], + 'jp.doc' => [], + 'jp.index' => [ qw/gsoap globus_essentials:R globus:B/ ], + 'jp.primary' => [ qw/classads gsoap libtar globus_essentials:R globus:B/ ], + 'jp.server-common' => [], + 'jp.ws-interface' => [], ); for my $ext (keys %need_externs_aux) { @@ -307,6 +333,7 @@ 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) { @@ -324,6 +351,7 @@ for my $jar (keys %need_jars) { / ], 'lb.client-java' => [ qw/ lb.types:B + lb.ws-interface:B jobid.api-java / ], 'lb.common' => [ qw/ @@ -333,13 +361,14 @@ 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.db lbjp-common.server-bones lbjp-common.trio lbjp-common.maildir lbjp-common.log jobid.api-c security.gsoap-plugin security.gss / ], @@ -364,6 +393,30 @@ for my $jar (keys %need_jars) { 'jobid.api-java' => [ qw// ], 'lbjp-common.jp-interface' => [ qw/lbjp-common.db jobid.api-c/ ], + + 'jp.client' => [ qw/ + jp.ws-interface + lbjp-common.jp-interface lbjp-common.maildir + jobid.api-c + security.gsoap-plugin + / ], + 'jp.doc' => [ qw// ], + 'jp.index' => [ qw/ + jp.server-common jp.ws-interface + lbjp-common.jp-interface lbjp-common.trio lbjp-common.db lbjp-common.server-bones + security.gsoap-plugin + / ], + 'jp.primary' => [ qw/ + jobid.api-c + jp.server-common jp.ws-interface + lb.state-machine + lbjp-common.jp-interface lbjp-common.trio lbjp-common.db lbjp-common.server-bones + security.gsoap-plugin + / ], + 'jp.server-common' => [ qw/ + lbjp-common.jp-interface lbjp-common.db + / ], + 'jp.ws-interface' => [ qw// ], ); for my $ext (keys %deps_aux) { @@ -378,9 +431,15 @@ for my $ext (keys %deps_aux) { %extrafull = ( gridsite=>'org.gridsite.core'); -# %extranodmod = ( java => 'client-java' ); +#( java => 'client-java' ); +%extranodmod = ( + db => 'lbjp-common.db', + jpprimary => 'jp.primary', + jpindex => 'jp.index', + jpclient => 'jp.client', +); -my @t = qw/lb.client-java jobid.api-java lb.types/; +my @t = qw/lb.client-java jobid.api-java lb.types lbjp-common.log/; @topbuild{@t} = (1) x ($#t+1); } @@ -398,7 +457,8 @@ 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.maildir lbjp-common.server-bones lbjp-common.trio lbjp-common.jp-interface +lbjp-common.db lbjp-common.log 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); @@ -453,14 +513,16 @@ my %etics_externs; my %etics_projects; BEGIN{ %etics_externs = ( - globus=>'vdt_globus_essentials', + globus_essentials=>'vdt_globus_essentials', + globus=>'globus', cares=>'c-ares', 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/], + vdt=>[qw/globus globus_essentials/], 'org.glite'=>[qw/voms gridsite lcas/], ); }; @@ -495,8 +557,10 @@ sub mode_etics { @ge{@{$etics_projects{'org.glite'}}} = (1) x ($#{$etics_projects{'org.glite'}}+1); for (@{$need_externs{"$subsys.$module"}}) { + if ($need_externs_type{"$subsys.$module"}->{$_}=~/B/) { my $eext = $etics_externs{$_} ? $etics_externs{$_} : $_; push @copts,$ge{$_} ? "--with-$_=\${stageDir}" : "--with-$_=\${$eext.location}"; + } } for (@{$need_jars{"$subsys.$module"}}) { @@ -607,7 +671,7 @@ General options (defaults in []): --staged=module,module,... what is already in PREFIX (specify without org.glite.) --thrflavour=flavour --nothrflavour=flavour threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg] - --listmodules=subsys list modules of a subsystem + --listmodules=subsys list modules of a subsystem Mode of operation: --mode={checkout|build|etics} what to do [build] @@ -618,6 +682,7 @@ What to build: @{$lbmodules{lb}},@{$lbmodules{security}} --disable-NODE don't build this node --lb-tag=tag checkout LB modules with specific tag + --jp-tag=tag checkout JP 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 -- 1.8.2.3