From f6a274d72c4fcfb0b0d1ef8b57a998060f45f949 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Fri, 18 Jan 2013 09:31:24 +0000 Subject: [PATCH] Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 1.3.2-2 --- org.glite.jobid.api-java/configure | 118 ++++++++++++--------- org.glite.jobid.api-java/project/ChangeLog | 3 + .../project/version.properties | 2 +- 3 files changed, 71 insertions(+), 52 deletions(-) diff --git a/org.glite.jobid.api-java/configure b/org.glite.jobid.api-java/configure index 9198b38..a024047 100755 --- a/org.glite.jobid.api-java/configure +++ b/org.glite.jobid.api-java/configure @@ -63,7 +63,7 @@ my $url_source; my $pkg_config_env = (defined $ENV{PKG_CONFIG_PATH}) ? "$ENV{PKG_CONFIG_PATH}:" : ''; my @nodes = qw/client server logger logger-msg nagios utils client-java doc ws-test db jpprimary jpindex jpclient harvester lb px proxyrenewal canl/; -my @default_nodes = qw/lb px proxyrenewal nagios canl/; +my @default_nodes = qw/lb px proxyrenewal nagios canl client-java/; my %enable_nodes; my %disable_nodes; my %default_nodes; @default_nodes{@default_nodes} = (1) x ($#default_nodes + 1); @@ -192,11 +192,11 @@ my (%etics_externs, %etics_projects); # additional modules from $project{modules} are automatically added # my %lbmodules = ( - 'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test harvester yaim logger-msg nagios client-devel client-progs common-devel logger-devel state-machine-devel/], + 'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test harvester yaim logger-msg nagios client-devel client-progs common-devel logger-devel state-machine-devel/], 'lbjp-common' => [qw/db log maildir server-bones trio jp-interface gss gsoap-plugin db-devel log-devel maildir-devel server-bones-devel trio-devel jp-interface-devel gss-devel gsoap-plugin-devel/], - 'jobid' => [qw/api-c api-c-devel api-cpp api-cpp-devel api-java/], + 'jobid' => [qw/api-c api-c-devel api-cpp api-cpp-devel/], 'jp' => [ qw/client doc index primary server-common ws-interface/ ], - 'gridsite' => [ qw/apache libs commands core devel slashgrid services service-clients gsexec/ ], + 'gridsite' => [ qw/apache libs commands core devel services service-clients/ ], 'px' => [ qw/proxyrenewal myproxy-yaim proxyrenewal-devel proxyrenewal-progs/ ], 'canl' => [ qw/c c-devel/ ], ); @@ -225,6 +225,13 @@ my %subpackages = ( 'px.proxyrenewal-devel' => 'px.proxyrenewal', 'px.proxyrenewal-progs' => 'px.proxyrenewal', 'canl.c-devel' => 'canl.c', + 'gridsite.apache' => 'gridsite.core', + 'gridsite.shared' => 'gridsite.core', + 'gridsite.commands' => 'gridsite.core', + 'gridsite.devel' => 'gridsite.core', + 'gridsite.libs' => 'gridsite.core', + 'gridsite.services' => 'gridsite.core', + 'gridsite.service-clients' => 'gridsite.core', ); my @opts = ( @@ -249,6 +256,7 @@ my @opts = ( 'jp-tag=s' => \$jp_tag, 'jobid-tag=s' => \$jobid_tag, 'canl-tag=s' => \$canl_tag, + 'px-tag=s' => \$px_tag, 'help' => \$help, 'libdir=s' => \$libdir, 'project=s' => \$project, @@ -304,7 +312,7 @@ if ($project =~ /^([^0-9]*)(.*)$/) { %project = %{$projects{$project}}; $project_version = $project{current_version} unless $project_version; if ($project ne 'emi' or $project_version <= 1) { - $lbmodules{'gridsite'} = [ qw/apache shared commands core devel slashgrid services service-clients gsexec/ ]; + $lbmodules{'gridsite'} = [ qw/apache shared commands core devel services service-clients/ ]; } for my $platform (keys %{$project{etics_externs}}) { for $_ (keys %{$project{etics_externs}{$platform}}) { @@ -332,6 +340,9 @@ if ($project eq 'emi') { $extranodmod{lb} = 'lb.emi-lb'; $extranodmod{px} = 'px.emi-px'; } +if ($project ne 'emi' or $project_version <= 2) { + $project{modules}{gridsite} = [ qw/slashgrid gsexec/ ]; +} for $_ (keys %{$project{modules}}) { push @{$lbmodules{$_}},@{$project{modules}{$_}}; } @@ -346,7 +357,7 @@ if ($listmodules) { if (exists $lbmodules{$listmodules}) { @m = map exists $subpackages{$listmodules . '.' . $_} ? "" : "$name_prefix.$listmodules.$_",@{$lbmodules{$listmodules}}; } else { - if ($project eq 'emi' and $project_version == 1) { + if ($project eq 'emi' and $project_version == 1 and $listmodules ne 'gridsite.core') { # no sub-packages in EMI-1 } else { for my $sub (keys %subpackages) { @@ -592,6 +603,13 @@ sub mode_checkout() { } } } + if ($px_tag) { + for (@{$lbmodules{'px'}}){ + if ("px.".$_ eq $module){ + $tag = '-r '.$px_tag; + } + } + } #if (grep {"lb.".$_ eq $module} @{$lbmodules{lb}}){ # print "found"; #} @@ -649,7 +667,7 @@ BEGIN{ 'jp.primary' => [ qw/classads:B gsoap libtar globus_essentials:R globus:B mysql-server:R pkgconfig:B/ ], 'jp.server-common' => [], 'jp.ws-interface' => [], - 'gridsite.core' => [ qw/httpd-devel:B gsoap:B globus:B curl:B doxygen:B fuse-devel:B libxml2:B openssl:B doxygen:B pkgconfig:B/ ], + 'gridsite.core' => [ qw/httpd-devel:B gsoap:B globus:B curl:B doxygen:B libxml2:B openssl:B doxygen:B pkgconfig:B libtool:B/ ], 'gridsite.commands' => [ qw/curl:R openssl:R/ ], 'gridsite.apache' => [ qw/libxml2:R openssl:R curl:R/ ], 'gridsite.libs' => [ qw/libxml2:R openssl:R/ ], @@ -731,12 +749,12 @@ for my $jar (keys %need_jars) { '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.client-java:R + lb.ws-test:R lb.harvester:R lb.yaim:R lb.logger-msg:R / ], 'lb.emi-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.client-java:R + lb.ws-test:R lb.harvester:R lb.yaim:R lb.logger-msg:R / ], 'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ], @@ -776,7 +794,7 @@ for my $jar (keys %need_jars) { / ], 'jp.ws-interface' => [ qw// ], - 'gridsite.core' => [ qw// ], + 'gridsite.core' => [ qw/canl.c:B/ ], 'gridsite.commands' => [ qw/gridsite.core:B/ ], 'gridsite.apache' => [ qw/gridsite.core:B/ ], 'gridsite.libs' => [ qw/gridsite.core:B / ], @@ -1410,7 +1428,7 @@ version=${module.version} ${package}-${version}.tar.gz: rm -rf dist - for dist in ${SOURCES} ${SOURCES_EXEC} configure project/ChangeLog project/debian.* project/*.spec project/package.* project/version.properties; do \ + for dist in ${SOURCES} ${SOURCES_EXEC} configure project/ChangeLog project/debian.* project/*.spec project/package.* project/version.properties LICENSE; do \ dir=${package}-${version}/`dirname $$dist`; \ mkdir -p dist/$$dir || :; \ install -m 0644 ${top_srcdir}/$$dist dist/$$dir; \ @@ -1543,7 +1561,7 @@ deb: ${package}-${version}.tar.gz $file="${build}debian/compat"; if (not -f $file) { `echo "7" > $file` } $file="${build}debian/changelog"; if (not -f $file) { open FH, ">$file" or die $!; - print FH qq{$packageName ($major.$minor.$rev-$age) unstable; urgency=low + print FH qq{$packageName ($major.$minor.$rev-$age) stable; urgency=low * Automatically generated package @@ -1723,7 +1741,7 @@ sub mode_etics { if (exists $subpackages{$fmod}) { $cmd{default}{packaging} = "echo building nothing, $subpackages{$fmod} will build this package"; $cmd_vcs{checkout} = "true"; - } elsif (not $branch and ($project ne 'emi' or $project_version >= 3)) { + } elsif ($project eq 'emi' and $project_version >= 3) { # for non-branched configuration for EMI-3 do the build from external source package my $pkgName = $fmod eq 'gridsite.core' ? 'gridsite' : '${packageName}'; @@ -1888,7 +1906,7 @@ checkstyle = None } # no platform properties since EMI-3 - if ($branch or $project ne 'emi' or $project_version <= 2) { + if ($project ne 'emi' or $project_version <= 2) { print C qq{[Platform-default:Property] $buildroot $package_description$package_summary$defprops}; @@ -1922,47 +1940,47 @@ $package_description$package_summary$defprops}; my $used = 0; my $output = ''; - # build dependencies needed only for EMI <= 2 - if ($branch or $project ne 'emi' or $project_version <= 2) { - for (@{$need_externs{"$subsys.$module"}},@{$need_jars{"$subsys.$module"}}) { - my $eext = $etics_externs{$platform}{$_}; - my $edev = $project{etics_externs_devel}{$platform}{$_}; + for (@{$need_externs{"$subsys.$module"}},@{$need_jars{"$subsys.$module"}}) { + my $eext = $etics_externs{$platform}{$_}; + my $edev = $project{etics_externs_devel}{$platform}{$_}; - # for the default platform using package of the same - # name for runtime dependency - if (not $eext) { - if ($platform eq 'default') { + # for the default platform using package of the same + # name for runtime dependency + if (not $eext) { + if ($platform eq 'default') { #print "default runtime $_ on default\n"; - $eext = $_; } - else { + $eext = $_; } + else { #print "no runtime $_ on $platform\n"; - $eext = '-'; } - } - if ($eext eq '-' and $edev eq '-') { + $eext = '-'; } + } + if ($eext eq '-' and $edev eq '-') { #print "skipping $_ on $platform\n"; - next; - } + next; + } - my $proj = 'externals'; - for my $p (keys %etics_projects) { - for $m (@{$etics_projects{$p}}) { - $proj = $p if $m eq $_; - } + my $proj = 'externals'; + for my $p (keys %etics_projects) { + for $m (@{$etics_projects{$p}}) { + $proj = $p if $m eq $_; } + } + + # external dependencies only for EMI <= 2 + if ($proj eq 'externals' and $project eq 'emi' and $project_version >= 3) { next; } - my $type = $need_externs_type{"$subsys.$module"}->{$_}; + my $type = $need_externs_type{"$subsys.$module"}->{$_}; - if ($edev) { - if ($type eq 'B') { - # no runtime - change to devel pkg - $eext = $edev; - } elsif ($type eq 'BR' or $type eq 'RB') { - # additional devel pkg - if ($edev ne '-') { $output .= "$proj|$edev = B\n"; } - } + if ($edev) { + if ($type eq 'B') { + # no runtime - change to devel pkg + $eext = $edev; + } elsif ($type eq 'BR' or $type eq 'RB') { + # additional devel pkg + if ($edev ne '-') { $output .= "$proj|$edev = B\n"; } } - if ($eext ne '-') { $output .= "$proj|$eext = $type\n"; } } + if ($eext ne '-') { $output .= "$proj|$eext = $type\n"; } } if ($platform eq 'default') { @@ -2159,13 +2177,10 @@ sub os_type { close FH; if (/Debian|Ubuntu/i) { return "debian"; } - elsif (/Scientific|Redhat|Centos/i) { return "redhat"; } - elsif (/Fedora/i) { - $ver = `rpm -q --queryformat '%{version}' fedora-release 2>/dev/null`; - if ($ver and $ver >= 15) { return "fedora"; } + elsif (/Scientific|Redhat|Centos|Fedora/i) { + `pkg-config --exists systemd`; + if ($? == 0) { return "fedora"; } else { return "redhat"; } - } else { - return "redhat"; } } @@ -2211,6 +2226,7 @@ What to build: --lbjp-common-tag=tag checkout lbjp-common modules with specific tag --jobid-tag=tag checkout jobid modules with specific tag --canl-tag=tag checkout canl modules with specific tag + --px-tag=tag checkout px modules with specific tag Dependencies (summary of what will be used is always printed): --with-EXTERNAL=PATH where to look for an external [autodetect] diff --git a/org.glite.jobid.api-java/project/ChangeLog b/org.glite.jobid.api-java/project/ChangeLog index 098b7d5..35f88b9 100644 --- a/org.glite.jobid.api-java/project/ChangeLog +++ b/org.glite.jobid.api-java/project/ChangeLog @@ -74,3 +74,6 @@ - Preparation for major version bump. - Preparation for Fedora & EPEL packaging +1.3.2-2 +- Module rebuilt + diff --git a/org.glite.jobid.api-java/project/version.properties b/org.glite.jobid.api-java/project/version.properties index 232e00d..d8ba0f2 100644 --- a/org.glite.jobid.api-java/project/version.properties +++ b/org.glite.jobid.api-java/project/version.properties @@ -1,3 +1,3 @@ # : /cvs/glite/org.glite.jobid.api-java/project/version.properties,v 1.5 2009/01/20 17:25:13 akrenek Exp $ module.version=1.3.2 -module.age=1 +module.age=2 -- 1.8.2.3