From 44315d2e99cf702ddb107ba2559d9c1ae953e7d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Thu, 14 Apr 2011 05:13:59 +0000 Subject: [PATCH] Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 1.2.3-5 --- org.glite.lb.types/configure | 15 ++++++++------- org.glite.lb.types/project/ChangeLog | 3 +++ org.glite.lb.types/project/version.properties | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/org.glite.lb.types/configure b/org.glite.lb.types/configure index 4bbff51..a67786b 100755 --- a/org.glite.lb.types/configure +++ b/org.glite.lb.types/configure @@ -237,7 +237,6 @@ my @keeparg = @ARGV; GetOptions @opts or die "Errors parsing command line\n"; $prefix=~s/\/$//; -$stagedir=~s/\/$// if ($stagedir); $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } @@ -310,6 +309,7 @@ if (!$en && !$dis) { for (@nodes) { $enable_nodes{$_} = 1 if ($default_nodes{$_} for (keys %enable_nodes) { delete $enable_nodes{$_} unless $enable_nodes{$_}; } $stagedir = $root unless $stagedir; +$stagedir=~s/\/$// if ($stagedir); if ($mode eq 'build') { for my $ext (keys %externs) { if (defined $externs{$ext} and defined $externs{$ext}{withprefix}) { $externs{$ext}{prefix} = $externs{$ext}{withprefix}; } @@ -523,8 +523,8 @@ BEGIN{ 'lb.doc' => [ qw/tetex-latex:B/ ], 'lb.logger' => [ qw/cppunit:B libtool:B/ ], 'lb.logger-msg' => [ qw/cppunit:B activemq libtool: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 bison:B libtool:B/ ], - 'lb.state-machine' => [ qw/classads libtool: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 bison:B libtool:B libxml2/ ], + 'lb.state-machine' => [ qw/classads libtool:B libxslt:B expat:B/ ], 'lb.utils' => [ qw/cppunit:B libtool:B/ ], 'lb.ws-interface' => [ qw/libxslt:B/ ], 'lb.ws-test' => [ qw/gsoap:B libtool:B/ ], @@ -539,7 +539,7 @@ BEGIN{ 'lbjp-common.gss' => [ qw/globus_essentials:R globus:B cares cppunit:B libtool:B/ ], 'lbjp-common.gsoap-plugin' => [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap gsoapxx libtool:B/ ], 'jobid.api-c' => [ qw/cppunit:B libtool:B openssl:B/ ], - 'jobid.api-cpp' => [ qw/cppunit:B/ ], + 'jobid.api-cpp' => [ qw/cppunit:B libtool:B/ ], 'jobid.api-java' => [ qw/ant:B jdk:B/ ], 'jp.client' => [ qw/gsoap libtar globus_essentials:R globus:B/ ], 'jp.doc' => [], @@ -609,7 +609,7 @@ for my $jar (keys %need_jars) { lbjp-common.jp-interface jobid.api-c lbjp-common.trio lbjp-common.maildir - lb.client lb.state-machine + lb.client lb.state-machine lb.types:B / ], 'lb.ws-test' => [ qw/lbjp-common.gsoap-plugin lb.ws-interface/ ], 'lb.ws-interface' => [ qw/lb.types:B/ ], @@ -1116,8 +1116,9 @@ sub mode_etics { @cmd{qw/configure compile test install packaging clean/} = ('None') x 6; $cmd{clean} = 'make clean'; $cmd{checkout} = "cvs -d \${vcsroot} co -d \${moduleName} ".($conftag eq 'HEAD' ? '-A' : '-r ${tag}')." $cvs_prefix{$subsys}.$subsys.$module 2>/dev/null"; - #$cmd{checkout} = "(test -d \${moduleName}/.git && (cd \${moduleName}; git pull) || git clone http://scientific.zcu.cz/git/jra1mw.git \${moduleName})"; - #$cmd{checkout} .= " && (cd \${moduleName}; git checkout ${tag})" unless ($conftag =~ /HEAD/); + #$cmd{checkout} = "(test -d jra1mw/.git && (cd jra1mw; git pull) || git clone http://scientific.zcu.cz/git/jra1mw.git)"; + #$cmd{checkout} .= " && (cd jra1mw; git checkout \${tag})" unless ($conftag =~ /HEAD/); + #$cmd{checkout} .= " && ln -s jra1mw/$cvs_prefix{$subsys}.$subsys.$module \${moduleName}"; $cmd{tag} = "cvs -d \${vcsroot} tag -R \${tag} ${moduleName}"; if ($subsys eq 'gridsite') { diff --git a/org.glite.lb.types/project/ChangeLog b/org.glite.lb.types/project/ChangeLog index 2a0fc4c..ae9d8f6 100644 --- a/org.glite.lb.types/project/ChangeLog +++ b/org.glite.lb.types/project/ChangeLog @@ -76,3 +76,6 @@ 1.2.3-4 - Module rebuilt +1.2.3-5 +- Module rebuilt + diff --git a/org.glite.lb.types/project/version.properties b/org.glite.lb.types/project/version.properties index 83dafbd..b065640 100644 --- a/org.glite.lb.types/project/version.properties +++ b/org.glite.lb.types/project/version.properties @@ -1,3 +1,3 @@ # $Header$ module.version=1.2.3 -module.age=4 +module.age=5 -- 1.8.2.3