EMI release polishing:

- project name to Makefiles
- m4 file location
- examples location to $libdir/glite-lb
- sane eticsless build, more nodes

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 49ca0d0..2188305 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -187,6 +187,12 @@ offset=6
 version_info:=-version-info ${shell \
        perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
 
+ifeq (${project},emi)
+m4dir=${PREFIX}${prefix}/share/emi/build/m4
+else
+m4dir=${PREFIX}${prefix}/share/build/m4
+endif
+
 ifdef LB_STANDALONE
 compile all: generate ${c_LIBRARIES} ${TOOLS} logevent notify register_sandbox examples ${MAN_GZ} ${MAN8_GZ}
 else
@@ -336,9 +342,9 @@ install:
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples/
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man1
-       mkdir -p ${DESTDIR}${PREFIX}${prefix}/examples
+       mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man8
-       mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/build/m4
+       mkdir -p ${DESTDIR}${m4dir}
 ifdef LB_STANDALONE
        ${INSTALL} -m 644 ${c_LIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}
 else
@@ -362,9 +368,8 @@ endif
        for p in ${TOOLS} ; do \
                ${INSTALL} -m 755 "$$p" "${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-$$p"; \
        done
-# TODO: restructuring - do we really need binaries of the examples to be installed?
        for p in ${EXAMPLES} ${EXAMPLES_PLUS} ${EXAMPLES_CL} ${EXAMPLES_CL_THR} ${sh_PROGS} ; do \
-               ${INSTALL} -m 755 "$$p" "${DESTDIR}${PREFIX}${prefix}/examples/glite-lb-$$p"; \
+               ${INSTALL} -m 755 "$$p" "${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/glite-lb-$$p"; \
        done
        for p in ${EXAMPLES_SRC} ${EXAMPLES_PLUS_SRC} ${EXAMPLES_CL_SRC} ${EXAMPLES_CL_THR_SRC} ; do \
                ${INSTALL} -m 644 "${top_srcdir}/examples/$$p" "${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples/"; \
@@ -372,11 +377,11 @@ endif
        ${INSTALL} -m 644 ${top_srcdir}/examples/Makefile "${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples/"
        ${INSTALL} -m 644 ${top_srcdir}/examples/README.examples "${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples/"
        ${INSTALL} -m 755 ${top_srcdir}/src/export.sh "${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-export.sh"
-       ${INSTALL} -m 755 ${top_srcdir}/examples/notify.pl ${DESTDIR}${PREFIX}${prefix}/examples/glite-lb-notify.pl
-       ${INSTALL} -m 755 ${top_srcdir}/examples/sandbox_transfers.sh ${DESTDIR}${PREFIX}${prefix}/examples/glite-lb-sandbox_transfers.sh
+       ${INSTALL} -m 755 ${top_srcdir}/examples/notify.pl ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/glite-lb-notify.pl
+       ${INSTALL} -m 755 ${top_srcdir}/examples/sandbox_transfers.sh ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/glite-lb-sandbox_transfers.sh
        ${INSTALL} -m 644 ${MAN_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man1
        ${INSTALL} -m 644 ${MAN8_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man8
-       ${INSTALL} -m 644 ${top_srcdir}/m4/glite_lb.m4 ${DESTDIR}${PREFIX}${prefix}/share/build/m4/
+       ${INSTALL} -m 644 ${top_srcdir}/m4/glite_lb.m4 ${DESTDIR}${m4dir}/
 
 clean:
        rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h *.dox producer_test notify C/ CPP/

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 9866245..8229648 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -115,8 +115,8 @@ default_commonlib=${NOTHRLTLIB}
 endif
 
 ifdef LB_PERF
-STAGE_PERFTEST=mkdir -p ${DESTDIR}${PREFIX}${prefix}/examples/perftest; \
-               ${INSTALL} -m 644 ${top_srcdir}/examples/*.log ${DESTDIR}${PREFIX}${prefix}/examples/perftest; \
+STAGE_PERFTEST=mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/perftest; \
+               ${INSTALL} -m 644 ${top_srcdir}/examples/*.log ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/perftest; \
                mkdir -p ${DESTDIR}${PREFIX}${prefix}/sbin; ${INSTALL} -m 755 ${top_srcdir}/src/perftest_common.sh ${DESTDIR}${PREFIX}${prefix}/sbin
 else
 STAGE_PERFTEST=true

diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile
index e2e1fda..d0c2583 100644 (file)
--- a/org.glite.lb.harvester/Makefile
+++ b/org.glite.lb.harvester/Makefile
@@ -60,14 +60,14 @@ stage: compile
        $(MAKE) install PREFIX=${stagedir}
 
 install: compile
-       -mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin ${DESTDIR}${PREFIX}${prefix}/examples \
+       -mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples \
                ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} \
                ${DESTDIR}${PREFIX}${prefix}/share/man/man8 \
                ${DESTDIR}${PREFIX}${sysconfdir}/init.d \
                ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb
        ${INSTALL} -m 755 harvester ${DESTDIR}${PREFIX}${prefix}/bin/glite-lb-harvester
-       ${INSTALL} -m 755 harvester-dbg ${DESTDIR}${PREFIX}${prefix}/examples/glite-lb-harvester-dbg
-       ${INSTALL} -m 755 ${top_srcdir}/examples/test.sh ${DESTDIR}${PREFIX}${prefix}/examples/glite-lb-harvester-test.sh
+       ${INSTALL} -m 755 harvester-dbg ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/glite-lb-harvester-dbg
+       ${INSTALL} -m 755 ${top_srcdir}/examples/test.sh ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/glite-lb-harvester-test.sh
        ${INSTALL} -m 444 ${top_srcdir}/examples/test.sql ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb/harvester-test-dbsetup.sql
        ${INSTALL} -m 444 ${top_srcdir}/doc/README ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        ${INSTALL} -m 444 glite-lb-harvester.8 ${DESTDIR}${PREFIX}${prefix}/share/man/man8

diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile
index 6426284..ef8f78d 100644 (file)
--- a/org.glite.lb.ws-test/Makefile
+++ b/org.glite.lb.ws-test/Makefile
@@ -70,9 +70,9 @@ check:
        @echo "No test"
 
 install:
-       mkdir -p ${DESTDIR}${PREFIX}${prefix}/examples/
+       mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/
        for f in ${CEXAMPLES}; do \
-               ${INSTALL} -m 755 $$f ${DESTDIR}${PREFIX}${prefix}/examples/glite-lb-$$f; \
+               ${INSTALL} -m 755 $$f ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/glite-lb-$$f; \
        done
 
 clean:

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 6c9dbc4..0279f57 100755 (executable)
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -27,8 +27,8 @@ use Getopt::Long;
 
 my $pwd = `pwd`; chomp $pwd;
 my $prefix = '/usr';
-my $stagedir = $pwd.'/stage';
-my $root = '';
+my $stagedir = undef;
+my $root = $pwd.'/stage';
 my $sysroot = '';
 my $sysconfdir;
 my $staged;
@@ -47,9 +47,10 @@ my $jp_tag = '';
 my $jobid_tag = '';
 my $libdir = getlibdir();
 my $projectname;
+my $project = '';
 
 
-my @nodes = qw/client server logger logger-msg 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 glite-LB glite-PX/;
 my %enable_nodes;
 my %disable_nodes;
 
@@ -179,7 +180,7 @@ my %lbmodules = (
 
 
 my @opts = (
-       'prefix=s' => \$prefix,
+       'prefix:s' => \$prefix,
        'staged=s' => \$staged,
        'module=s' => \$module,
        'thrflavour:s' => \$thrflavour,
@@ -200,6 +201,7 @@ my @opts = (
        'help' => \$help,
        'libdir=s' => \$libdir,
        'emi' => \$emi,
+       'project=s' => \$project,
 );
 
 for (@nodes) {
@@ -225,7 +227,8 @@ $sysconfdir=~s/\/$//;
 
 $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 (!$project) { $project = $emi ? 'emi' : 'glite'; }
+$projectname = ($project eq 'emi') ? 'emi' : 'org.glite';
 if ($emi) {
        for $_ (keys %etics_externs_emi) {
                $etics_externs{$_} = $etics_externs_emi{$_};
@@ -293,7 +296,7 @@ if (!$en && !$dis) { $enable_nodes{$_} = 1 for (@nodes) } ;
 
 for (keys %enable_nodes) { delete $enable_nodes{$_} unless $enable_nodes{$_}; }
 
-$stagedir = $root.$prefix unless $stagedir;
+$stagedir = $root unless $stagedir;
 
 if ($mode eq 'build') {
        print "Writing config.status\n";
@@ -382,7 +385,7 @@ sub mode_build {
                my $full = full($_);
                my $build = $buildroot{$_};
        
-               print MAK "$_: @dnames\n\tcd $full/$build && \${MAKE} && \${MAKE} install DESTDIR=$stagedir\n\n";
+               print MAK "$_: @dnames\n\tcd $full/$build && \${MAKE} && \${MAKE} install\n\n";
        }
        
        close MAK;
@@ -696,7 +699,8 @@ px.proxyrenewal px.myproxy-yaim px.glite-PX px.myproxy-config
 
        print "Creating $full/$buildroot{$_}/Makefile.inc\n";
 
-       print MKINC qq{PREFIX = $root
+       print MKINC qq{project = $project
+PREFIX = $root
 prefix = $prefix
 stagedir = $stagedir
 sysroot = $sysroot
@@ -905,7 +909,7 @@ sub mode_etics {
                }
        }
        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{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts";
                $cmd{packaging} = "make rpm package=".$confprefix."$subsys-myproxy-config";
        }
        else {
@@ -914,7 +918,7 @@ sub mode_etics {
                my $sysconfdir = ' --sysconfdir=/etc';
                # exception for yaims in EMI for now: prefix /opt/glite
                if ($emi and ($module =~ /yaim/ or $module =~ /^glite-/)) { $localprefix = '/opt/glite'; $sysconfdir = ''; }
-               $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=${localprefix} --stage=\${stageDir} --sysroot=\${package.prefix}$sysconfdir --libdir=\${libdir} --module $subsys.$module @copts";
+               $cmd{configure} = "cd $confdir && /usr/bin/perl \${moduleName}/configure $flavours --root=\${prefix} --prefix=${localprefix} --stage=\${stageDir} --sysroot=\${package.prefix}$sysconfdir --libdir=\${libdir}  --project=\${projectName} --module $subsys.$module @copts";
                $cmd{compile} = 'make';
                $cmd{test} = 'make check';
                $cmd{install} = 'make install';