From 2444347d870e0fa8dcc64e8a9dd38e39efeb9bf0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 16 Oct 2012 10:53:48 +0000 Subject: [PATCH] Using external source packages for EMI-3. --- org.glite.lb/configure | 270 ++++++++++++++++++++++++++++++------------------- 1 file changed, 164 insertions(+), 106 deletions(-) diff --git a/org.glite.lb/configure b/org.glite.lb/configure index d2a4cbe..255b6f2 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -26,6 +26,9 @@ use Getopt::Long; use POSIX qw(locale_h strftime); +#my $default_url = 'http://eticssoft.web.cern.ch/eticssoft/repository/emi/${moduleName}/${version}/src'; +my $default_url = 'http://scientific.zcu.cz/emi/${moduleName}'; + my $pwd = `pwd`; chomp $pwd; my $prefix = '/usr'; my $stagedir = undef; @@ -53,6 +56,10 @@ my $project = 'emi'; my $project_version; my (%projects, %project); my $debug = 0; +my $url = $default_url; +my $url_rpm; +my $url_deb; +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/; @@ -246,6 +253,10 @@ my @opts = ( 'libdir=s' => \$libdir, 'project=s' => \$project, 'debug' => \$debug, + 'url=s' => \$url, + 'url-rpm=s' => \$url_rpm, + 'url-deb=s' => \$url_deb, + 'url-source=s' => \$url_source, ); for (@nodes) { @@ -270,6 +281,13 @@ if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix $sysconfdir=~s/\/$//; $localstatedir=~s/\/$//; if (not $os_type) { $os_type = os_type(); } +if (not $url_rpm) { $url_rpm = $url; } +if (not $url_deb) { $url_deb = $url; } +if (not $url_source) { $url_source = $url; } +$url=~s/\/$//; +$url_rpm=~s/\/$//; +$url_deb=~s/\/$//; +$url_source=~s/\/$//; $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; @@ -1455,6 +1473,13 @@ deb: ${package}-${version}.tar.gz for my $file ("$packageName.spec", "debian.rules", "debian.control", "debian.changelog", "debian.copyright") { if (-f "$abs_srcdir/project/$file") { my $old_ = $_; + my $url_spec = $url_source; + + $url_spec =~ s/\$\{moduleName\}/$project{etics_name}.$subsys.$mod/g; + $url_spec =~ s/\$\{packageName\}/%{name}/g; + $url_spec =~ s/\$\{version\}/%{version}/g; + $url_spec =~ s/\$\{age\}/%{rel}/g; + printf STDERR "Creating $build$file\n" if ($debug);; open DST, ">$build$file"; open SRC, "<$abs_srcdir/project/$file"; @@ -1479,6 +1504,7 @@ deb: ${package}-${version}.tar.gz s/--version\s+\S+\s?//; s/$/ --version $version/; } + if (/^Source:.*/) { s,^(Source:\s*).*?([^/]*)$,\1$url_spec/\2,; } printf DST "%s", "$_"; } close SRC; @@ -1623,7 +1649,7 @@ sub mode_etics { } my $conf; - my $conftag; + my ($vcsroot, $conftag); my ($confprefix, $nameprefix, $packageName); $dwpath = "path = \${projectName}/\${moduleName}/\${version}/\${platformName}/\${packageName}-\${version}-\${age}.tar.gz\n"; @@ -1633,6 +1659,7 @@ sub mode_etics { $nameprefix =~ s/-$//; $nameprefix =~ s/-/\./g; $packageName = "$project{tag_prefix}{$subsys}$subsys-${module}"; + $vcsroot=":pserver:anonymous\@glite.cvs.cern.ch:/cvs/glite"; if ($branch) { $conf = "$confprefix${subsys}-${module}_$branch"; @@ -1681,11 +1708,8 @@ sub mode_etics { } my %cmd; - $cmd_vcs{checkout} = "cvs -d \${vcsroot} co -d \${moduleName} ".($conftag eq 'HEAD' ? '-A' : '-r ${tag}')." $cvs_module 2>/dev/null"; - #$cmd_vcs{checkout} = "((test -d jra1mw/.git && (cd jra1mw; git pull)) || (git clone -q http://scientific.zcu.cz/git/jra1mw.git"; - #$cmd_vcs{checkout} .= " && (cd jra1mw; git checkout -b \${tag} --track origin/\${tag})" unless ($conftag eq /HEAD/); - #$cmd_vcs{checkout} .= ")) && (test -d \${moduleName} || ln -s jra1mw/$cvs_module \${moduleName})"; - $cmd_vcs{tag} = "cvs -d \${vcsroot} tag -R \${tag} ${moduleName}"; + $cmd_vcs{checkout} = 'true'; + $cmd_vcs{tag} = 'None'; $cmd{default}{init} = 'None'; $cmd{default}{configure} = 'None'; @@ -1693,54 +1717,76 @@ sub mode_etics { $cmd{default}{test} = 'None'; $cmd{default}{install} = 'None'; $cmd{default}{packaging} = 'None'; - $cmd{default}{clean} = 'make clean'; + $cmd{default}{clean} = 'None'; if (exists $subpackages{$fmod}) { - $cmd{default}{clean} = 'None'; $cmd{default}{packaging} = "echo building nothing, $subpackages{$fmod} will build this package"; - $cmd_vcs{checkout} = "mkdir -v \${moduleName} 2>/dev/null || true"; - } elsif ($subsys eq 'gridsite') { - $cmd_vcs{tag} = 'None'; + $cmd_vcs{checkout} = "true"; + } elsif (not $branch and ($project ne 'emi' or $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}'; + + $cmd{default}{clean} = 'rm -rf ${package.SRPMSLocation}'; + $cmd{default}{init} = "wget -P \${package.SRPMSLocation} $url_rpm/$pkgName-\${version}-\${age}.src.rpm"; + $cmd{default}{packaging} = 'true'; + + for my $p ('deb5_x86_64_gcc432', 'deb5_ia32_gcc432', 'deb6_x86_64_gcc445', 'deb6_ia32_gcc445') { + for my $c (keys %{$cmd{default}}) { $cmd{$p}{$c} = $cmd{default}{$c}; } + $cmd{$p}{clean} = 'rm -rf ${package.SRPMSLocation}'; + $cmd{$p}{init} = "wget -P \${package.tgzLocation} $url_deb/${pkgName}_\${version}-\${age}.debian.tar.gz $url_deb/${pkgName}_\${version}-\${age}.dsc $url_deb/${pkgName}_\${version}.orig.tar.gz"; + $cmd{$p}{packaging} = 'true'; + } + + $vcsroot = 'None'; + $conftag = 'None'; + } else { + $cmd_vcs{checkout} = "cvs -d \${vcsroot} co -d \${moduleName} ".($conftag eq 'HEAD' ? '-A' : '-r ${tag}')." $cvs_module 2>/dev/null"; + #$cmd_vcs{checkout} = "((test -d jra1mw/.git && (cd jra1mw; git pull)) || (git clone -q http://scientific.zcu.cz/git/jra1mw.git"; + #$cmd_vcs{checkout} .= " && (cd jra1mw; git checkout -b \${tag} --track origin/\${tag})" unless ($conftag eq /HEAD/); + #$cmd_vcs{checkout} .= ")) && (test -d \${moduleName} || ln -s jra1mw/$cvs_module \${moduleName})"; + + if ($subsys eq 'gridsite') { + $cmd{default}{clean} = 'make clean'; - if ($module eq 'core') { - my $flags; + if ($module eq 'core') { + my $flags; - if ($project ne 'glite') { - # don't evaluate pkg-config calls to get them into source package - $flags = 'RELEASE_VERSION=${age} + if ($project ne 'glite') { + # don't evaluate pkg-config calls to get them into source package + $flags = 'RELEASE_VERSION=${age} GSOAPDIR=\`pkg-config gsoap --variable=prefix\` OPENSSL_GLOBUS_FLAGS=\`pkg-config globus-openssl --cflags\` OPENSSL_GLOBUS_LIBS=\`pkg-config globus-openssl --libs\`'; - } else { - $flags = 'RELEASE_VERSION=${age} + } else { + $flags = 'RELEASE_VERSION=${age} GSOAPDIR=${gsoap.location} OPENSSL_GLOBUS_FLAGS=-I${globus.location}/include/${globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${globus.location}/${libdir} HTTPD_FLAGS=-I${httpd-devel.location}/include/httpd -I${httpd-devel.location}/include/apache2 -I${httpd-devel.location}/include/apr-1 -I${httpd-devel.location}/include/apr-1.0 -I${httpd-devel.location}/include/apr-0 -I${httpd-devel.location}/include/pcre'; - } + } - $cmd{default}{configure} = "cat > Makefile.inc </dev/null"; - $cmd{default}{init} = 'echo "/sbin/ldconfig" > project/.post + ); + } + elsif ($module eq '1.5-compat') { + $cmd_vcs{checkout} = "cvs -d \${vcsroot} co -d \${moduleName} ".($conftag eq 'HEAD' ? '-A' : '-r ${tag}')." $cvs_prefix{$subsys}.$subsys.core 2>/dev/null"; + $cmd{default}{init} = 'echo "/sbin/ldconfig" > project/.post echo "/sbin/ldconfig" > project/.postun'; - $cmd{default}{configure} = "cat > src/Makefile.inc <{$pp}}) { - print C $p . ' = ' . $platform_properties{"$subsys.$module"}->{$pp}->{$p} . "\n"; + for my $p (keys %{$platform_properties{"$subsys.$module"}->{$pp}}) { + print C $p . ' = ' . $platform_properties{"$subsys.$module"}->{$pp}->{$p} . "\n"; + } + print C "$package_description$package_summary\n"; } - print C "$package_description$package_summary\n"; } for my $platform ('default', keys %{$project{supported_platforms}}) { my $used = 0; my $output = ''; - for (@{$need_externs{"$subsys.$module"}},@{$need_jars{"$subsys.$module"}}) { - my $eext = $etics_externs{$platform}{$_}; - my $edev = $project{etics_externs_devel}{$platform}{$_}; + # 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 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 $_; + } } - } - 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') { @@ -2139,6 +2193,10 @@ General options (defaults in []): --libdir=libdir typically [lib,lib64] postfix --project=PROJECT build or generate etics for a project (glite/emi1/emi) [emi] --debug print more details + --url URL of all published files [$default_url] + --url-rpm URL of published RPM packages [] + --url-deb URL of published Debian packages [] + --url-source URL of published source tarballs [] Mode of operation: --mode=\{checkout|build|etics\} what to do [build] -- 1.8.2.3