From 7241d72a0a674433e0432ae625bfe96def7cb42e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Wed, 16 Feb 2011 10:29:00 +0000 Subject: [PATCH] The most recent version copied. Do not modify this instance (RW in ./org.glite.lb). --- org.glite.lbjp-common.gsoap-plugin/configure | 146 +++++++++++++++++---------- org.glite.lbjp-common.gss/configure | 146 +++++++++++++++++---------- org.glite.lbjp-common.jp-interface/configure | 14 ++- 3 files changed, 188 insertions(+), 118 deletions(-) diff --git a/org.glite.lbjp-common.gsoap-plugin/configure b/org.glite.lbjp-common.gsoap-plugin/configure index 598d569..3258454 100755 --- a/org.glite.lbjp-common.gsoap-plugin/configure +++ b/org.glite.lbjp-common.gsoap-plugin/configure @@ -41,11 +41,12 @@ my $output; my $lb_tag = ''; my $lbjp_tag = ''; my $jp_tag = ''; -my $sec_tag = ''; my $jobid_tag = ''; my $libdir = getlibdir(); +my $projectname; -my @nodes = qw/client server logger utils client-java doc ws-test db jpprimary jpindex jpclient harvester/; + +my @nodes = qw/client server logger logger-msg utils client-java doc ws-test db jpprimary jpindex jpclient harvester/; my %enable_nodes; my %disable_nodes; @@ -55,7 +56,7 @@ my %externs = ( pkg => 'libcares' }, classads => { - prefix=> '/opt/classads', + prefix=> '/usr', pkg => 'classads' }, cppunit => { @@ -70,10 +71,16 @@ my %externs = ( prefix=> '/opt/globus', pkg => 'globus-gssapi-gsi' }, - myproxy => { - prefix=> '/opt/myproxy', + 'myproxy-essentials' => { + prefix=> '/opt/globus', pkg => 'myproxy' }, + 'myproxy-server' => { + prefix=> '/opt/globus', + }, + 'myproxy-client' => { + prefix=> '/opt/globus', + }, gsoap => { prefix=> '/usr', pkg => 'gsoap' @@ -120,7 +127,19 @@ my %externs = ( }, postgresql => { prefix=> '/usr' - } + }, + activemq => { + prefix=>'/opt/activemq-cpp-library', + pkg => 'activemq-cpp' + }, + apr => { + prefix=>'/opt/apr', + pkg => 'apr-1' + }, + aprutil => { + prefix=>'/opt/apr-util', + pkg => 'apr-util-1' + }, ); my %jar = ( @@ -138,10 +157,10 @@ my %extranodmod; my %deps; my %deps_type; my %buildroot; +my (%etics_externs, %etics_projects, %etics_projects_emi, %etics_externs_emi); my %lbmodules = ( - 'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test harvester yaim glite-LB/], - 'security' => [qw/gss gsoap-plugin/], + 'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test harvester yaim glite-LB logger-msg/], 'lbjp-common' => [qw/db log maildir server-bones trio jp-interface gss gsoap-plugin/], 'jobid' => [qw/api-c api-cpp api-java/], 'jp' => [ qw/client doc index primary server-common ws-interface/ ], @@ -165,7 +184,6 @@ my @opts = ( '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, 'libdir=s' => \$libdir, @@ -189,11 +207,17 @@ GetOptions @opts or die "Errors parsing command line\n"; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; +$projectname = $emi ? 'emi' : 'org.glite'; +if ($emi) { + for $_ (keys %etics_externs_emi) { + $etics_externs{$_} = $etics_externs_emi{$_}; + } +} if ($help) { usage(); exit 0; } if ($listmodules) { - my @m = map "org.glite.$listmodules.$_",@{$lbmodules{$listmodules}}; + my @m = map "$projectname.$listmodules.$_",@{$lbmodules{$listmodules}}; print "@m\n"; exit 0; } @@ -213,7 +237,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}},{$lbmodules{jp}}; +die "$module: unknown module\n" if $module && ! grep $module,@{$lbmodules{lb}},{$lbmodules{jp}}; if ($mode eq 'build') { for my $ext (keys %externs) { if (defined $externs{$ext}{withprefix}) { $externs{$ext}{prefix} = $externs{$ext}{withprefix}; } @@ -236,7 +260,7 @@ if ($mode eq 'build') { for my $ext (keys %externs) { $flag=`pkg-config $pkg --libs`; $externs{$ext}{flags} .= "${flagname}_LIBS=$flag" if ($flag); } else { - print "(using default)\n"; + print "(using default $externs{$ext}{prefix})\n"; } } } } @@ -371,13 +395,6 @@ sub mode_checkout() { } } } - if ($sec_tag){ - for (@{$lbmodules{security}}){ - if ("security.".$_ eq $module){ - $tag = '-r '.$sec_tag; - } - } - } if ($jobid_tag){ for (@{$lbmodules{jobid}}){ if ("jobid.".$_ eq $module){ @@ -401,6 +418,7 @@ BEGIN{ 'lb.common' => [ qw/expat cares:B cppunit:B classads/ ], 'lb.doc' => [], 'lb.logger' => [ qw/cppunit:B/ ], + 'lb.logger-msg' => [ qw/cppunit:B activemq apr aprutil/ ], '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/ ], @@ -418,8 +436,6 @@ BEGIN{ 'lbjp-common.jp-interface' => [ qw/cppunit:B log4c:B/ ], 'lbjp-common.gss' => [ qw/globus_essentials:R globus:B cares cppunit:B/ ], 'lbjp-common.gsoap-plugin' => [ qw/cppunit:B globus_essentials:R globus:B cares:B 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:B gsoap:B/ ], 'jobid.api-c' => [ qw/cppunit:B/ ], 'jobid.api-cpp' => [ qw/cppunit:B/ ], 'jobid.api-java' => [ qw/ant:B jdk:B/ ], @@ -430,10 +446,10 @@ BEGIN{ 'jp.server-common' => [], 'jp.ws-interface' => [], 'gridsite.core' => [qw/httpd-devel:B gsoap:B globus:B/ ], - 'px.proxyrenewal' => [ qw/globus:B myproxy voms/ ], - 'px.glite-PX' => [qw/myproxy:R fetchcrl:R gip_service:R bdii:R glite_version:R/], + 'px.proxyrenewal' => [ qw/globus:B globus_essentials:R myproxy-essentials voms/ ], + 'px.glite-PX' => [qw/myproxy-server:R fetchcrl:R gip_service:R bdii:R glite_version:R gpt:R glue_schema:R/], 'px.myproxy-yaim' => [ qw/yaim_core:R/ ], - 'px.myproxy-config' => [], + 'px.myproxy-config' => [ qw/myproxy-client:R/ ], # in myproxy-config.spec ); for my $ext (keys %need_externs_aux) { @@ -480,6 +496,9 @@ for my $jar (keys %need_jars) { lb.common lbjp-common.gss / ], + 'lb.logger-msg' => [ qw/ + lb.logger + / ], '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 @@ -512,8 +531,6 @@ for my $jar (keys %need_jars) { 'lbjp-common.trio' => [ qw// ], 'lbjp-common.gss' => [ qw// ], 'lbjp-common.gsoap-plugin' => [ qw/lbjp-common.gss/ ], - 'security.gss' => [ qw// ], - 'security.gsoap-plugin' => [ qw/security.gss/ ], 'jobid.api-c' => [ qw// ], 'jobid.api-cpp' => [ qw/jobid.api-c/ ], 'jobid.api-java' => [ qw// ], @@ -547,8 +564,8 @@ for my $jar (keys %need_jars) { 'gridsite.core' => [ qw/build.common-cpp:B/ ], 'px.proxyrenewal' => [ qw// ], - 'px.glite-PX' => [qw/px.myproxy-yaim:R/], - 'px.myproxy-yaim' => [], + 'px.glite-PX' => [qw/px.myproxy-yaim:R px.myproxy-config:R/], + 'px.myproxy-yaim' => [ qw/px.myproxy-config:R/ ], 'px.myproxy-config' => [], ); @@ -576,7 +593,7 @@ for my $ext (keys %deps_aux) { 'lb.yaim' => [ qq/glite-yaim-lb/ ], 'px.proxyrenewal' => [ qq/glite-security-proxyrenewal/ ], 'px.myproxy-yaim' => [ qq/glite-yaim-myproxy/ ], - 'px.myproxy-config' => [ qq/myproxy-config/ ], + 'px.myproxy-config' => [ qq/myproxy-config/ ], # in myproxy-config.spec 'lbjp-common.gss' => [ qq/glite-security-gss/ ], 'lbjp-common.gsoap-plugin' => [ qq/glite-security-gsoap-plugin/ ], ); @@ -587,7 +604,6 @@ for my $ext (keys %deps_aux) { 'jobid' => 'org.glite', 'lbjp-common' => 'org.glite', 'gridsite' => 'org', - 'security' => 'org.glite', 'px' => 'org.glite', ); @@ -597,7 +613,6 @@ for my $ext (keys %deps_aux) { 'jobid' => 'glite-', 'lbjp-common' => 'glite-', 'gridsite' => '', - 'security' => 'glite-', 'px' => 'glite-', ); @@ -607,7 +622,6 @@ for my $ext (keys %deps_aux) { 'jobid' => 'emi-', 'lbjp-common' => 'emi-', 'gridsite' => '', - 'security' => 'emi-', 'px' => 'emi-', ); @@ -631,8 +645,8 @@ sub mkinc my %aux; undef %aux; my @m=qw/ -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 lb.harvester lb.yaim lb.glite-LB -security.gss security.gsoap-plugin +lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.logger-msg lb.types lb.common lb.server lb.utils lb.ws-test lb.client-java lb.harvester lb.yaim lb.glite-LB +lbjp-common.gss lbjp-common.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.gss lbjp-common.gsoap-plugin jp.client jp.doc jp.index jp.primary jp.server-common jp.ws-interface @@ -689,13 +703,13 @@ libdir = $libdir close MKINC; } -my %etics_externs; -my %etics_projects; BEGIN{ %etics_externs = ( globus_essentials=>'vdt_globus_essentials', globus=>'globus', - myproxy=>'myproxy', + 'myproxy-essentials'=>'myproxy_essentials', + 'myproxy-server'=>'myproxy_server', + 'myproxy-client'=>'myproxy_client', cares=>'c-ares', voms=>'org.glite.security.voms-api-cpp', gridsite=>'org.gridsite.shared', @@ -711,11 +725,24 @@ BEGIN{ glite_info_templates=>'glite-info-templates', glue_schema=>'glue-schema', yaim_core=>'org.glite.yaim.core', + activemq=>'activemq-cpp-library', + apr=>'apr-dev', + aprutil=>'aprutil-dev', + ); + %etics_externs_emi = ( + globus_essentials=>'globus-gssapi-gsi', + globus=>'globus-gssapi-gsi-devel', + gridsite=>'emi.gridsite.shared', + yaim_core=>'emi.yaim.yaim-core' ); %etics_projects = ( vdt=>[qw/globus globus_essentials myproxy/], 'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/], ); + %etics_projects_emi = ( + vdt=>'externs', + 'org.glite'=>'emi', + ); %platform_properties = ( 'gridsite.core' => { @@ -781,12 +808,14 @@ sub mode_etics { my $conf; my $conftag; - my $confprefix; + my ($confprefix, $nameprefix); $dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n"; - if ($emi) { $confprefix = $emi_conf_prefix{$subsys} } - else { $confprefix = $conf_prefix{$subsys} } + $confprefix = $emi ? $emi_conf_prefix{$subsys} : $conf_prefix{$subsys}; + $nameprefix = $confprefix; + $nameprefix =~ s/-$//; + $nameprefix =~ s/-/\./g; if ($branch) { $conf = "$confprefix${subsys}-${module}_$branch"; @@ -799,9 +828,6 @@ sub mode_etics { # XXX: gridsite hack $conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; } - if ($emi) { - $age = "${age}emi"; - } my $file = $output ? $output : "$conf.ini"; open C,">$file" or die "$file: $!\n"; @@ -841,7 +867,13 @@ sub mode_etics { if ($subsys eq 'gridsite') { if ($module eq 'core') { - my $flags = 'RELEASE_VERSION=${age}.${platformFamily} prefix=${prefix} libdir=${libdir} GSOAPDIR=${gsoap.location} OPENSSL_GLOBUS_FLAGS=-I${globus.location}/include/${globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${globus.location}/${libdir}/ FLAVOR_GLOBUS_EXT=_${globus.dbg.nothr.flavor} HTTPD_FLAGS="-I${httpd-devel.location}/include/httpd -I${httpd-devel.location}/include/apache2 -I${httpd-devel.location}/include/apr-${aprSuffix} -I${httpd-devel.location}/include/pcre"'; + my $flags; + + if ($emi) { + $flags = 'RELEASE_VERSION=${age}.${platformFamily} prefix=${prefix} libdir=${libdir} GSOAPDIR=`pkg-config gsoap --variable=prefix` OPENSSL_GLOBUS_FLAGS=`pkg-config globus-openssl --cflags` OPENSSL_GLOBUS_LIBS=`pkg-config globus-openssl --libs` FLAVOR_GLOBUS_EXT= HTTPD_FLAGS="-I/usr/include/httpd -I/usr/include/apache2 -I/usr/include/apr-${aprSuffix} -I/usr/include/pcre"'; + } else { + $flags = 'RELEASE_VERSION=${age}.${platformFamily} prefix=${prefix} libdir=${libdir} GSOAPDIR=${gsoap.location} OPENSSL_GLOBUS_FLAGS=-I${globus.location}/include/${globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${globus.location}/${libdir}/ FLAVOR_GLOBUS_EXT=_${globus.dbg.nothr.flavor} HTTPD_FLAGS="-I${httpd-devel.location}/include/httpd -I${httpd-devel.location}/include/apache2 -I${httpd-devel.location}/include/apr-${aprSuffix} -I${httpd-devel.location}/include/pcre"'; + } $cmd{compile} = "make $flags build"; $cmd{install} = "make $flags install"; @@ -851,6 +883,10 @@ sub mode_etics { $cmd{packaging} = "echo building nothing, org.gridsite.core make rpm step will create this"; } } + elsif ($subsys eq 'px' and $module eq 'myproxy-config') { + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts"; + $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; + } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts"; @@ -865,23 +901,20 @@ sub mode_etics { $defprops .= $p . ' = ' . $platform_properties{"$subsys.$module"}->{default}->{$p} . "\n"; } - my $checkoutcmd; - if ($conftag eq 'HEAD') { - $checkoutcmd = "cvs -d \${vcsroot} co -A \${moduleName}"; - } else { - $checkoutcmd = "cvs -d \${vcsroot} co -r \${tag} \${moduleName}"; - } + my $checkoutcmd = "cvs -d \${vcsroot} co -d \${moduleName} ".($conftag eq 'HEAD' ? '-A' : '-r ${tag}')." $cvs_prefix{$subsys}.$subsys.$module"; + $checkoutcmd .= "; ln -s \${moduleName} $cvs_prefix{$subsys}.$subsys.$module 2>/dev/null || true" if ($emi); print STDERR "Writing $file\n"; print C qq{ [Configuration-$conf] profile = None -moduleName = $cvs_prefix{$subsys}.$subsys.$module +moduleName = $projectname.$subsys.$module displayName = $conf description = $cvs_prefix{$subsys}.$subsys.$module -projectName = org.glite +projectName = $projectname age = $age deploymentType = None +vcsroot = :pserver:anonymous\@glite.cvs.cern.ch:/cvs/glite tag = $conftag version = $major.$minor.$rev $dwpath @@ -943,6 +976,9 @@ package.SRPMSLocation = ${moduleDir}/RPMTMP/SRPMS my $proj = 'externals'; for my $p (keys %etics_projects) { + if ($emi and defined $etics_projects_emi{$p}) { + $p = $etics_projects_emi{$p}; + } for $m (@{$etics_projects{$p}}) { $proj = $p if $m eq $_; } @@ -954,7 +990,7 @@ package.SRPMSLocation = ${moduleDir}/RPMTMP/SRPMS for (@{$deps{"$subsys.$module"}}) { my $type = $deps_type{"$subsys.$module"}->{$_}; - print C "org.glite|org.glite.$_ = $type\n"; + print C "$projectname|$projectname.$_ = $type\n"; } close C; @@ -969,6 +1005,7 @@ sub gsoap_version { chomp; $gsoap_version = $1 if /The gSOAP Stub and Skeleton Compiler for C and C\+\+ ([.[:digit:][:alpha:]]+)$/; + $gsoap_version = $1 if /The gSOAP code generator for C and C\+\+, soapcpp2 release ([.[:digit:][:alpha:]]+)$/; } close S; return $gsoap_version; @@ -1048,12 +1085,11 @@ Mode of operation: What to build: --module=module build this module only (mostly in-Etics operation) --enable-NODE build this "node" (set of modules) only. Available nodes are - @{$lbmodules{lb}},@{$lbmodules{security}} + @{$lbmodules{lb}} --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 Dependencies: diff --git a/org.glite.lbjp-common.gss/configure b/org.glite.lbjp-common.gss/configure index 598d569..3258454 100755 --- a/org.glite.lbjp-common.gss/configure +++ b/org.glite.lbjp-common.gss/configure @@ -41,11 +41,12 @@ my $output; my $lb_tag = ''; my $lbjp_tag = ''; my $jp_tag = ''; -my $sec_tag = ''; my $jobid_tag = ''; my $libdir = getlibdir(); +my $projectname; -my @nodes = qw/client server logger utils client-java doc ws-test db jpprimary jpindex jpclient harvester/; + +my @nodes = qw/client server logger logger-msg utils client-java doc ws-test db jpprimary jpindex jpclient harvester/; my %enable_nodes; my %disable_nodes; @@ -55,7 +56,7 @@ my %externs = ( pkg => 'libcares' }, classads => { - prefix=> '/opt/classads', + prefix=> '/usr', pkg => 'classads' }, cppunit => { @@ -70,10 +71,16 @@ my %externs = ( prefix=> '/opt/globus', pkg => 'globus-gssapi-gsi' }, - myproxy => { - prefix=> '/opt/myproxy', + 'myproxy-essentials' => { + prefix=> '/opt/globus', pkg => 'myproxy' }, + 'myproxy-server' => { + prefix=> '/opt/globus', + }, + 'myproxy-client' => { + prefix=> '/opt/globus', + }, gsoap => { prefix=> '/usr', pkg => 'gsoap' @@ -120,7 +127,19 @@ my %externs = ( }, postgresql => { prefix=> '/usr' - } + }, + activemq => { + prefix=>'/opt/activemq-cpp-library', + pkg => 'activemq-cpp' + }, + apr => { + prefix=>'/opt/apr', + pkg => 'apr-1' + }, + aprutil => { + prefix=>'/opt/apr-util', + pkg => 'apr-util-1' + }, ); my %jar = ( @@ -138,10 +157,10 @@ my %extranodmod; my %deps; my %deps_type; my %buildroot; +my (%etics_externs, %etics_projects, %etics_projects_emi, %etics_externs_emi); my %lbmodules = ( - 'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test harvester yaim glite-LB/], - 'security' => [qw/gss gsoap-plugin/], + 'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test harvester yaim glite-LB logger-msg/], 'lbjp-common' => [qw/db log maildir server-bones trio jp-interface gss gsoap-plugin/], 'jobid' => [qw/api-c api-cpp api-java/], 'jp' => [ qw/client doc index primary server-common ws-interface/ ], @@ -165,7 +184,6 @@ my @opts = ( '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, 'libdir=s' => \$libdir, @@ -189,11 +207,17 @@ GetOptions @opts or die "Errors parsing command line\n"; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; +$projectname = $emi ? 'emi' : 'org.glite'; +if ($emi) { + for $_ (keys %etics_externs_emi) { + $etics_externs{$_} = $etics_externs_emi{$_}; + } +} if ($help) { usage(); exit 0; } if ($listmodules) { - my @m = map "org.glite.$listmodules.$_",@{$lbmodules{$listmodules}}; + my @m = map "$projectname.$listmodules.$_",@{$lbmodules{$listmodules}}; print "@m\n"; exit 0; } @@ -213,7 +237,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}},{$lbmodules{jp}}; +die "$module: unknown module\n" if $module && ! grep $module,@{$lbmodules{lb}},{$lbmodules{jp}}; if ($mode eq 'build') { for my $ext (keys %externs) { if (defined $externs{$ext}{withprefix}) { $externs{$ext}{prefix} = $externs{$ext}{withprefix}; } @@ -236,7 +260,7 @@ if ($mode eq 'build') { for my $ext (keys %externs) { $flag=`pkg-config $pkg --libs`; $externs{$ext}{flags} .= "${flagname}_LIBS=$flag" if ($flag); } else { - print "(using default)\n"; + print "(using default $externs{$ext}{prefix})\n"; } } } } @@ -371,13 +395,6 @@ sub mode_checkout() { } } } - if ($sec_tag){ - for (@{$lbmodules{security}}){ - if ("security.".$_ eq $module){ - $tag = '-r '.$sec_tag; - } - } - } if ($jobid_tag){ for (@{$lbmodules{jobid}}){ if ("jobid.".$_ eq $module){ @@ -401,6 +418,7 @@ BEGIN{ 'lb.common' => [ qw/expat cares:B cppunit:B classads/ ], 'lb.doc' => [], 'lb.logger' => [ qw/cppunit:B/ ], + 'lb.logger-msg' => [ qw/cppunit:B activemq apr aprutil/ ], '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/ ], @@ -418,8 +436,6 @@ BEGIN{ 'lbjp-common.jp-interface' => [ qw/cppunit:B log4c:B/ ], 'lbjp-common.gss' => [ qw/globus_essentials:R globus:B cares cppunit:B/ ], 'lbjp-common.gsoap-plugin' => [ qw/cppunit:B globus_essentials:R globus:B cares:B 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:B gsoap:B/ ], 'jobid.api-c' => [ qw/cppunit:B/ ], 'jobid.api-cpp' => [ qw/cppunit:B/ ], 'jobid.api-java' => [ qw/ant:B jdk:B/ ], @@ -430,10 +446,10 @@ BEGIN{ 'jp.server-common' => [], 'jp.ws-interface' => [], 'gridsite.core' => [qw/httpd-devel:B gsoap:B globus:B/ ], - 'px.proxyrenewal' => [ qw/globus:B myproxy voms/ ], - 'px.glite-PX' => [qw/myproxy:R fetchcrl:R gip_service:R bdii:R glite_version:R/], + 'px.proxyrenewal' => [ qw/globus:B globus_essentials:R myproxy-essentials voms/ ], + 'px.glite-PX' => [qw/myproxy-server:R fetchcrl:R gip_service:R bdii:R glite_version:R gpt:R glue_schema:R/], 'px.myproxy-yaim' => [ qw/yaim_core:R/ ], - 'px.myproxy-config' => [], + 'px.myproxy-config' => [ qw/myproxy-client:R/ ], # in myproxy-config.spec ); for my $ext (keys %need_externs_aux) { @@ -480,6 +496,9 @@ for my $jar (keys %need_jars) { lb.common lbjp-common.gss / ], + 'lb.logger-msg' => [ qw/ + lb.logger + / ], '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 @@ -512,8 +531,6 @@ for my $jar (keys %need_jars) { 'lbjp-common.trio' => [ qw// ], 'lbjp-common.gss' => [ qw// ], 'lbjp-common.gsoap-plugin' => [ qw/lbjp-common.gss/ ], - 'security.gss' => [ qw// ], - 'security.gsoap-plugin' => [ qw/security.gss/ ], 'jobid.api-c' => [ qw// ], 'jobid.api-cpp' => [ qw/jobid.api-c/ ], 'jobid.api-java' => [ qw// ], @@ -547,8 +564,8 @@ for my $jar (keys %need_jars) { 'gridsite.core' => [ qw/build.common-cpp:B/ ], 'px.proxyrenewal' => [ qw// ], - 'px.glite-PX' => [qw/px.myproxy-yaim:R/], - 'px.myproxy-yaim' => [], + 'px.glite-PX' => [qw/px.myproxy-yaim:R px.myproxy-config:R/], + 'px.myproxy-yaim' => [ qw/px.myproxy-config:R/ ], 'px.myproxy-config' => [], ); @@ -576,7 +593,7 @@ for my $ext (keys %deps_aux) { 'lb.yaim' => [ qq/glite-yaim-lb/ ], 'px.proxyrenewal' => [ qq/glite-security-proxyrenewal/ ], 'px.myproxy-yaim' => [ qq/glite-yaim-myproxy/ ], - 'px.myproxy-config' => [ qq/myproxy-config/ ], + 'px.myproxy-config' => [ qq/myproxy-config/ ], # in myproxy-config.spec 'lbjp-common.gss' => [ qq/glite-security-gss/ ], 'lbjp-common.gsoap-plugin' => [ qq/glite-security-gsoap-plugin/ ], ); @@ -587,7 +604,6 @@ for my $ext (keys %deps_aux) { 'jobid' => 'org.glite', 'lbjp-common' => 'org.glite', 'gridsite' => 'org', - 'security' => 'org.glite', 'px' => 'org.glite', ); @@ -597,7 +613,6 @@ for my $ext (keys %deps_aux) { 'jobid' => 'glite-', 'lbjp-common' => 'glite-', 'gridsite' => '', - 'security' => 'glite-', 'px' => 'glite-', ); @@ -607,7 +622,6 @@ for my $ext (keys %deps_aux) { 'jobid' => 'emi-', 'lbjp-common' => 'emi-', 'gridsite' => '', - 'security' => 'emi-', 'px' => 'emi-', ); @@ -631,8 +645,8 @@ sub mkinc my %aux; undef %aux; my @m=qw/ -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 lb.harvester lb.yaim lb.glite-LB -security.gss security.gsoap-plugin +lb.client lb.doc lb.state-machine lb.ws-interface lb.logger lb.logger-msg lb.types lb.common lb.server lb.utils lb.ws-test lb.client-java lb.harvester lb.yaim lb.glite-LB +lbjp-common.gss lbjp-common.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.gss lbjp-common.gsoap-plugin jp.client jp.doc jp.index jp.primary jp.server-common jp.ws-interface @@ -689,13 +703,13 @@ libdir = $libdir close MKINC; } -my %etics_externs; -my %etics_projects; BEGIN{ %etics_externs = ( globus_essentials=>'vdt_globus_essentials', globus=>'globus', - myproxy=>'myproxy', + 'myproxy-essentials'=>'myproxy_essentials', + 'myproxy-server'=>'myproxy_server', + 'myproxy-client'=>'myproxy_client', cares=>'c-ares', voms=>'org.glite.security.voms-api-cpp', gridsite=>'org.gridsite.shared', @@ -711,11 +725,24 @@ BEGIN{ glite_info_templates=>'glite-info-templates', glue_schema=>'glue-schema', yaim_core=>'org.glite.yaim.core', + activemq=>'activemq-cpp-library', + apr=>'apr-dev', + aprutil=>'aprutil-dev', + ); + %etics_externs_emi = ( + globus_essentials=>'globus-gssapi-gsi', + globus=>'globus-gssapi-gsi-devel', + gridsite=>'emi.gridsite.shared', + yaim_core=>'emi.yaim.yaim-core' ); %etics_projects = ( vdt=>[qw/globus globus_essentials myproxy/], 'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/], ); + %etics_projects_emi = ( + vdt=>'externs', + 'org.glite'=>'emi', + ); %platform_properties = ( 'gridsite.core' => { @@ -781,12 +808,14 @@ sub mode_etics { my $conf; my $conftag; - my $confprefix; + my ($confprefix, $nameprefix); $dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n"; - if ($emi) { $confprefix = $emi_conf_prefix{$subsys} } - else { $confprefix = $conf_prefix{$subsys} } + $confprefix = $emi ? $emi_conf_prefix{$subsys} : $conf_prefix{$subsys}; + $nameprefix = $confprefix; + $nameprefix =~ s/-$//; + $nameprefix =~ s/-/\./g; if ($branch) { $conf = "$confprefix${subsys}-${module}_$branch"; @@ -799,9 +828,6 @@ sub mode_etics { # XXX: gridsite hack $conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; } - if ($emi) { - $age = "${age}emi"; - } my $file = $output ? $output : "$conf.ini"; open C,">$file" or die "$file: $!\n"; @@ -841,7 +867,13 @@ sub mode_etics { if ($subsys eq 'gridsite') { if ($module eq 'core') { - my $flags = 'RELEASE_VERSION=${age}.${platformFamily} prefix=${prefix} libdir=${libdir} GSOAPDIR=${gsoap.location} OPENSSL_GLOBUS_FLAGS=-I${globus.location}/include/${globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${globus.location}/${libdir}/ FLAVOR_GLOBUS_EXT=_${globus.dbg.nothr.flavor} HTTPD_FLAGS="-I${httpd-devel.location}/include/httpd -I${httpd-devel.location}/include/apache2 -I${httpd-devel.location}/include/apr-${aprSuffix} -I${httpd-devel.location}/include/pcre"'; + my $flags; + + if ($emi) { + $flags = 'RELEASE_VERSION=${age}.${platformFamily} prefix=${prefix} libdir=${libdir} GSOAPDIR=`pkg-config gsoap --variable=prefix` OPENSSL_GLOBUS_FLAGS=`pkg-config globus-openssl --cflags` OPENSSL_GLOBUS_LIBS=`pkg-config globus-openssl --libs` FLAVOR_GLOBUS_EXT= HTTPD_FLAGS="-I/usr/include/httpd -I/usr/include/apache2 -I/usr/include/apr-${aprSuffix} -I/usr/include/pcre"'; + } else { + $flags = 'RELEASE_VERSION=${age}.${platformFamily} prefix=${prefix} libdir=${libdir} GSOAPDIR=${gsoap.location} OPENSSL_GLOBUS_FLAGS=-I${globus.location}/include/${globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${globus.location}/${libdir}/ FLAVOR_GLOBUS_EXT=_${globus.dbg.nothr.flavor} HTTPD_FLAGS="-I${httpd-devel.location}/include/httpd -I${httpd-devel.location}/include/apache2 -I${httpd-devel.location}/include/apr-${aprSuffix} -I${httpd-devel.location}/include/pcre"'; + } $cmd{compile} = "make $flags build"; $cmd{install} = "make $flags install"; @@ -851,6 +883,10 @@ sub mode_etics { $cmd{packaging} = "echo building nothing, org.gridsite.core make rpm step will create this"; } } + elsif ($subsys eq 'px' and $module eq 'myproxy-config') { + $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts"; + $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config"; + } else { my $flavours = $emi ? "--thrflavour= --nothrflavour=" : "--thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor}"; $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts"; @@ -865,23 +901,20 @@ sub mode_etics { $defprops .= $p . ' = ' . $platform_properties{"$subsys.$module"}->{default}->{$p} . "\n"; } - my $checkoutcmd; - if ($conftag eq 'HEAD') { - $checkoutcmd = "cvs -d \${vcsroot} co -A \${moduleName}"; - } else { - $checkoutcmd = "cvs -d \${vcsroot} co -r \${tag} \${moduleName}"; - } + my $checkoutcmd = "cvs -d \${vcsroot} co -d \${moduleName} ".($conftag eq 'HEAD' ? '-A' : '-r ${tag}')." $cvs_prefix{$subsys}.$subsys.$module"; + $checkoutcmd .= "; ln -s \${moduleName} $cvs_prefix{$subsys}.$subsys.$module 2>/dev/null || true" if ($emi); print STDERR "Writing $file\n"; print C qq{ [Configuration-$conf] profile = None -moduleName = $cvs_prefix{$subsys}.$subsys.$module +moduleName = $projectname.$subsys.$module displayName = $conf description = $cvs_prefix{$subsys}.$subsys.$module -projectName = org.glite +projectName = $projectname age = $age deploymentType = None +vcsroot = :pserver:anonymous\@glite.cvs.cern.ch:/cvs/glite tag = $conftag version = $major.$minor.$rev $dwpath @@ -943,6 +976,9 @@ package.SRPMSLocation = ${moduleDir}/RPMTMP/SRPMS my $proj = 'externals'; for my $p (keys %etics_projects) { + if ($emi and defined $etics_projects_emi{$p}) { + $p = $etics_projects_emi{$p}; + } for $m (@{$etics_projects{$p}}) { $proj = $p if $m eq $_; } @@ -954,7 +990,7 @@ package.SRPMSLocation = ${moduleDir}/RPMTMP/SRPMS for (@{$deps{"$subsys.$module"}}) { my $type = $deps_type{"$subsys.$module"}->{$_}; - print C "org.glite|org.glite.$_ = $type\n"; + print C "$projectname|$projectname.$_ = $type\n"; } close C; @@ -969,6 +1005,7 @@ sub gsoap_version { chomp; $gsoap_version = $1 if /The gSOAP Stub and Skeleton Compiler for C and C\+\+ ([.[:digit:][:alpha:]]+)$/; + $gsoap_version = $1 if /The gSOAP code generator for C and C\+\+, soapcpp2 release ([.[:digit:][:alpha:]]+)$/; } close S; return $gsoap_version; @@ -1048,12 +1085,11 @@ Mode of operation: What to build: --module=module build this module only (mostly in-Etics operation) --enable-NODE build this "node" (set of modules) only. Available nodes are - @{$lbmodules{lb}},@{$lbmodules{security}} + @{$lbmodules{lb}} --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 Dependencies: diff --git a/org.glite.lbjp-common.jp-interface/configure b/org.glite.lbjp-common.jp-interface/configure index 76e67f9..3258454 100755 --- a/org.glite.lbjp-common.jp-interface/configure +++ b/org.glite.lbjp-common.jp-interface/configure @@ -127,18 +127,19 @@ my %externs = ( }, postgresql => { prefix=> '/usr' - } + }, activemq => { - prefix=>'/opt/activemq-cpp-library' - } + prefix=>'/opt/activemq-cpp-library', + pkg => 'activemq-cpp' + }, apr => { prefix=>'/opt/apr', pkg => 'apr-1' - } + }, aprutil => { prefix=>'/opt/apr-util', pkg => 'apr-util-1' - } + }, ); my %jar = ( @@ -827,9 +828,6 @@ sub mode_etics { # XXX: gridsite hack $conftag = $subsys eq 'gridsite' ? "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : "$conf_prefix{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; } - if ($emi) { - $age = "${age}emi"; - } my $file = $output ? $output : "$conf.ini"; open C,">$file" or die "$file: $!\n"; -- 1.8.2.3