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

diff --git a/org.glite.lb.glite-LB/configure b/org.glite.lb.glite-LB/configure
index 0ef21e0..89fdb6e 100755 (executable)
--- a/org.glite.lb.glite-LB/configure
+++ b/org.glite.lb.glite-LB/configure
@@ -6,22 +6,6 @@
 # it is copied on tagging 
 
 # $Header$
-#
-# Copyright (c) Members of the EGEE Collaboration. 2004-2010.
-# See http://www.eu-egee.org/partners/ for details on the copyright holders.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 
 use Getopt::Long;
 
@@ -36,16 +20,15 @@ my $mode = 'build';
 my $help = 0;
 my $listmodules;
 my $version;
-my $branch;
 my $output;
 my $lb_tag = '';
 my $lbjp_tag = '';
 my $jp_tag = '';
 my $sec_tag = '';
 my $jobid_tag = '';
-my $libdir = getlibdir();
+my $libdir = 'lib';
 
-my @nodes = qw/client server logger utils client-java doc ws-test db jpprimary jpindex jpclient harvester/;
+my @nodes = qw/client server logger utils doc ws-test db jpprimary jpindex jpclient/;
 my %enable_nodes;
 my %disable_nodes;
 
@@ -55,6 +38,7 @@ my %extern_prefix = (
        cppunit => '/usr',
        expat => '/usr',
        globus => '/opt/globus',
+       jglobus => '/opt/globus',
        gsoap => '/usr',
        mysql => '/usr',
        'mysql-devel' => '',
@@ -62,19 +46,13 @@ my %extern_prefix = (
        voms => '/opt/glite',
        gridsite => '/opt/glite',
        lcas => '/opt/glite',
-       trustmanager => '/opt/glite',
-       utiljava => '/opt/glite',
        ant => '/usr',
        jdk => '/usr',
        libtar => '/usr',
-       axis => '/usr',
-       log4c => '/usr',
-       postgresql => '/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',
 );
 
 
@@ -89,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 harvester yaim glite-LB/], 
+       'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test glite-LB/], 
        '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/ ],
        );
 
@@ -106,7 +84,6 @@ my @opts = (
        'mode=s' => \$mode,
        'listmodules=s' => \$listmodules,
        'version=s' => \$version,
-       'branch=s' => \$branch,
        'output=s' => \$output,
        'stage=s' => \$stagedir,
        'lb-tag=s' => \$lb_tag,
@@ -144,8 +121,8 @@ if ($listmodules) {
        exit 0;
 }
 
-warn "$0: --version, --branch and --output make sense only in --mode=etics\n"
-       if ($version || $output || $branch) && $mode ne 'etics';
+warn "$0: --version and --output make sense only in --mode=etics\n"
+       if ($version || $output) && $mode ne 'etics';
 
 my $en;
 for (keys %enable_nodes) { $en = 1 if $enable_nodes{$_}; }
@@ -317,8 +294,8 @@ sub mode_checkout() {
 BEGIN{
 %need_externs_aux = (
        'lb.client' => [ qw/cppunit:B classads/ ],
-       'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager utiljava/ ],
-       'lb.common' => [ qw/expat cares:B cppunit:B classads/ ],
+       'lb.client-java' => [ qw/ant:B jglobus jdk:B/ ],
+       '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:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite/ ],
@@ -327,17 +304,14 @@ BEGIN{
        'lb.ws-interface' => [],
        'lb.ws-test' => [ qw/gsoap:B/ ],
        'lb.types' => [ qw// ],
-       'lb.harvester' => [ qw/postgresql:R/ ],
-       'lb.yaim' => [ qw/yaim_core:R/ ],
-       'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R/ ],
-       'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
-       'lbjp-common.log' => [ qw/log4c/ ],
+       'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R yaim:R/ ],
+       'lbjp-common.db' => [ qw/mysql:R mysql-devel:B/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
        'lbjp-common.trio' => [ qw/cppunit:B/ ],
-       'lbjp-common.jp-interface' => [ qw/cppunit:B log4c:B/ ],
+       'lbjp-common.jp-interface' => [ qw/cppunit: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/ ],
+       '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/ ],
@@ -360,7 +334,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) {
@@ -378,7 +351,6 @@ for my $jar (keys %need_jars) {
        / ],
        'lb.client-java' => [ qw/
                lb.types:B
-               lb.ws-interface:B
                jobid.api-java
        / ],
        'lb.common' => [ qw/
@@ -388,14 +360,13 @@ 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
        / ],
@@ -409,18 +380,13 @@ for my $jar (keys %need_jars) {
        'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
        'lb.ws-interface' => [ qw/lb.types:B/ ],
        'lb.types' => [ qw// ],
-       'lb.harvester' => [ qw/
-               jobid.api-c lbjp-common.trio lbjp-common.db lb.common lb.client
-               security.gss lbjp-common.log
-       / ],
-       'lb.yaim' => [ qw// ],
        'lb.glite-LB' => [ qw/
                lb.logger:R lb.server:R lb.utils:R lb.doc:R
-               lb.ws-test:R lb.harvester:R lb.yaim:R
+               lb.ws-test:R
        / ],
-       'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ],
+       'lbjp-common.db' => [ qw/lbjp-common.trio/ ],
        'lbjp-common.maildir' => [ qw// ],
-       'lbjp-common.server-bones' => [ qw/lbjp-common.log/ ],
+       'lbjp-common.server-bones' => [ qw// ],
        'lbjp-common.trio' => [ qw// ],
        'security.gss' =>  [ qw// ],
        'security.gsoap-plugin' =>  [ qw/security.gss/ ],
@@ -490,10 +456,10 @@ 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
+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);
@@ -558,6 +524,7 @@ BEGIN{
                lcas=>'org.glite.security.lcas',
                trustmanager=>'org.glite.security.trustmanager',
                utiljava=>'org.glite.security.util-java',
+               yaim=>'org.glite.yaim.lb',
                gpt=>'gpt',
                fetchcrl=>'fetch-crl',
                gip_release=>'glite-info-provider-release',
@@ -566,11 +533,10 @@ BEGIN{
                glite_version=>'glite-version',
                glite_info_templates=>'glite-info-templates',
                glue_schema=>'glue-schema',
-               yaim_core=>'org.glite.yaim.core',
        );
        %etics_projects = (
                vdt=>[qw/globus globus_essentials/],
-               'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/],
+               'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim/],
        );
 };
 
@@ -616,51 +582,15 @@ sub mode_etics {
                push @copts,"--with-$_ \${$eext.location}/$_*.jar";
        }
 
-       my $conf;
-       my $conftag;
-
-       if ($branch) {
-               $conf = "glite-${subsys}-${module}_$branch"; 
-               $conftag = $branch; 
-               $dwpath = ""; }
-       else {
-               $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}"; 
-               $conftag = $conf; 
-               $dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n"; }
-#      my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
+
+       my $conf = "glite-$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
        my $file = $output ? $output : "$conf.ini";
        open C,">$file" or die "$file: $!\n";
 
-       my $buildroot = $topbuild{"$subsys.$module"} ? '' : "build.root = build";
+       my $buildroot = $topbuild{"$subsys.$module"} ? '' : "build.root = build\n";
 
        my $confdir = $topbuild{"$subsys.$module"} ? '..' : '../..';
 
-       my $package_description = "";
-       my $package_summary = "";
-
-       if (-e "org.glite.$subsys.$module/project/package.description") {
-               open V, "org.glite.$subsys.$module/project/package.description";
-               $package_description = join ("", <V>);
-               close V;
-               chomp $package_description;
-               $package_description =~ s/\n/\\n/g; 
-               $package_description = "package.description = $package_description";
-       } 
-       else { 
-               print STDERR "package.description not found for $subsys.$module!\n"; }
-
-       if (-e "org.glite.$subsys.$module/project/package.summary") {
-               open V, "org.glite.$subsys.$module/project/package.summary";
-               $package_summary = join ("", <V>);
-               close V;
-               chomp $package_summary;
-               $package_summary =~ s/\n/\\n/g; 
-               $package_summary = "package.summary = $package_summary";
-       } 
-       else { 
-               print STDERR "package.summary not found for $subsys.$module!\n"; }
-
-
        print STDERR "Writing $file\n";
        print C qq{
 [Configuration-$conf]
@@ -671,9 +601,10 @@ description = org.glite.$subsys.$module
 projectName = org.glite
 age = $age
 deploymentType = None
-tag = $conftag
+tag = $conf
 version = $major.$minor.$rev
-$dwpath
+path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz
+
 [Platform-default:VcsCommand]
 displayName = None
 description = None
@@ -700,8 +631,6 @@ checkstyle = None
 
 [Platform-default:Property]
 $buildroot
-$package_description
-$package_summary
 
 [Platform-default:DynamicDependency]
 
@@ -742,55 +671,6 @@ sub gsoap_version {
        return $gsoap_version;
 }
 
-sub getlibdir {
-       if ( -e "/etc/debian_version") { # We are on Debian
-               $lib64="lib";
-               $lib32="lib32"; }
-       else { # Another distribution
-               $lib64="lib64";
-               $lib32="lib";   }
-        $libdir=$lib32;
-
-        open INP, "uname -s | "; # Check kernel name
-        $kname= <INP>;
-        chomp($kname);
-        close INP;
-
-        if ( $kname == "Linux") {
-                $arch = ("x86_64\npowerpc\nppc64\n");
-
-                open INP, "uname -p | "; # Check processor type
-                $procname= <INP>;
-                chomp($procname);
-                close INP;
-
-                if ($arch =~/^$procname\n/) {
-                        return ($lib64); }
-
-                open INP, "uname -m | "; # Check machine hardware
-                $machname= <INP>;
-                chomp($machname);
-                close INP;
-
-                if ($arch =~/^$machname\n/) {
-                        return ($lib64); }
-
-                # special cases (hyperlink lib64, Debian)
-                if (-l "/usr/lib64") {
-                        $libdir=$lib32; }
-
-                # if /usr/lib64 doesn't exist at all (AIX)
-                unless ( -e "/usr/lib64" ) {
-                        $libdir=$lib32; }
-        }
-
-        if ( $kname == "SunOS") {
-                if (-e "/usr/lib/64") {
-                $libdir="lib/64"; }
-        }
-
-        return $libdir;
-}
 
 sub usage {
        my @ext = keys %extern_prefix;

diff --git a/org.glite.lb.logger/configure b/org.glite.lb.logger/configure
index b3a5b00..89fdb6e 100755 (executable)
--- a/org.glite.lb.logger/configure
+++ b/org.glite.lb.logger/configure
@@ -67,7 +67,7 @@ my %deps_type;
 my %topbuild;
 
 my %lbmodules = (
-       'lb' => [ qw/client 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 glite-LB/], 
        'security' => [qw/gss gsoap-plugin/],
        'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
        'jobid' => [qw/api-c api-cpp/],
@@ -304,6 +304,7 @@ BEGIN{
        'lb.ws-interface' => [],
        'lb.ws-test' => [ qw/gsoap:B/ ],
        'lb.types' => [ qw// ],
+       'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R yaim:R/ ],
        'lbjp-common.db' => [ qw/mysql:R mysql-devel:B/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -345,7 +346,7 @@ for my $jar (keys %need_jars) {
        'lb.client' => [ qw/
                lb.types:B lb.common
                lbjp-common.trio
-               jobid.api-cpp jobid.api-c
+               jobid.api-cpp:B jobid.api-c
                security.gss
        / ],
        'lb.client-java' => [ qw/
@@ -353,7 +354,7 @@ for my $jar (keys %need_jars) {
                jobid.api-java
        / ],
        'lb.common' => [ qw/
-               jobid.api-cpp jobid.api-c
+               jobid.api-cpp:B jobid.api-c
                lb.types:B lbjp-common.trio security.gss
        / ],
        'lb.doc' => [ qw/lb.types:B/ ],
@@ -379,6 +380,10 @@ for my $jar (keys %need_jars) {
        'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
        'lb.ws-interface' => [ qw/lb.types:B/ ],
        'lb.types' => [ qw// ],
+       'lb.glite-LB' => [ qw/
+               lb.logger:R lb.server:R lb.utils:R lb.doc:R
+               lb.ws-test:R
+       / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -517,10 +522,21 @@ BEGIN{
                voms=>'org.glite.security.voms-api-cpp',
                gridsite=>'org.gridsite.shared',
                lcas=>'org.glite.security.lcas',
+               trustmanager=>'org.glite.security.trustmanager',
+               utiljava=>'org.glite.security.util-java',
+               yaim=>'org.glite.yaim.lb',
+               gpt=>'gpt',
+               fetchcrl=>'fetch-crl',
+               gip_release=>'glite-info-provider-release',
+               gip_service=>'glite-info-provider-service',
+               bdii=>'bdii',
+               glite_version=>'glite-version',
+               glite_info_templates=>'glite-info-templates',
+               glue_schema=>'glue-schema',
        );
        %etics_projects = (
                vdt=>[qw/globus globus_essentials/],
-               'org.glite'=>[qw/voms gridsite lcas/],
+               'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim/],
        );
 };
 

diff --git a/org.glite.lb.server/configure b/org.glite.lb.server/configure
index b3a5b00..89fdb6e 100755 (executable)
--- a/org.glite.lb.server/configure
+++ b/org.glite.lb.server/configure
@@ -67,7 +67,7 @@ my %deps_type;
 my %topbuild;
 
 my %lbmodules = (
-       'lb' => [ qw/client 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 glite-LB/], 
        'security' => [qw/gss gsoap-plugin/],
        'lbjp-common' => [qw/db maildir server-bones trio jp-interface/],
        'jobid' => [qw/api-c api-cpp/],
@@ -304,6 +304,7 @@ BEGIN{
        'lb.ws-interface' => [],
        'lb.ws-test' => [ qw/gsoap:B/ ],
        'lb.types' => [ qw// ],
+       'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R yaim:R/ ],
        'lbjp-common.db' => [ qw/mysql:R mysql-devel:B/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -345,7 +346,7 @@ for my $jar (keys %need_jars) {
        'lb.client' => [ qw/
                lb.types:B lb.common
                lbjp-common.trio
-               jobid.api-cpp jobid.api-c
+               jobid.api-cpp:B jobid.api-c
                security.gss
        / ],
        'lb.client-java' => [ qw/
@@ -353,7 +354,7 @@ for my $jar (keys %need_jars) {
                jobid.api-java
        / ],
        'lb.common' => [ qw/
-               jobid.api-cpp jobid.api-c
+               jobid.api-cpp:B jobid.api-c
                lb.types:B lbjp-common.trio security.gss
        / ],
        'lb.doc' => [ qw/lb.types:B/ ],
@@ -379,6 +380,10 @@ for my $jar (keys %need_jars) {
        'lb.ws-test' => [ qw/security.gsoap-plugin lb.ws-interface/ ],
        'lb.ws-interface' => [ qw/lb.types:B/ ],
        'lb.types' => [ qw// ],
+       'lb.glite-LB' => [ qw/
+               lb.logger:R lb.server:R lb.utils:R lb.doc:R
+               lb.ws-test:R
+       / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -517,10 +522,21 @@ BEGIN{
                voms=>'org.glite.security.voms-api-cpp',
                gridsite=>'org.gridsite.shared',
                lcas=>'org.glite.security.lcas',
+               trustmanager=>'org.glite.security.trustmanager',
+               utiljava=>'org.glite.security.util-java',
+               yaim=>'org.glite.yaim.lb',
+               gpt=>'gpt',
+               fetchcrl=>'fetch-crl',
+               gip_release=>'glite-info-provider-release',
+               gip_service=>'glite-info-provider-service',
+               bdii=>'bdii',
+               glite_version=>'glite-version',
+               glite_info_templates=>'glite-info-templates',
+               glue_schema=>'glue-schema',
        );
        %etics_projects = (
                vdt=>[qw/globus globus_essentials/],
-               'org.glite'=>[qw/voms gridsite lcas/],
+               'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim/],
        );
 };