RC3 mock build fixes and updates:

- at3 and check_version utilities path
- missing dependencies
- jdk -> java-devel
- gridsite updates

diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index 6fca0ec..8c43ae1 100644 (file)
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -16,8 +16,9 @@ JAVAC:=${jdk_prefix}/bin/javac
 JAVAH:=${jdk_prefix}/bin/javah
 JAVA:=${jdk_prefix}/bin/java
 
-GEN:=${stagedir}${prefix}/sbin/glite-lb-at3 ${top_srcdir}/project/genEventTypes.pl
-AT3DIR:=${stagedir}${prefix}/share/glite-lb/at3
+at3prefix=$(shell at3dir=${prefix}/share/glite-lb/at3; if test -d ${stagedir}$$at3dir; then echo ${stagedir}${prefix}; else echo ${prefix}; fi)
+GEN:=${at3prefix}/sbin/glite-lb-at3 ${top_srcdir}/project/genEventTypes.pl
+AT3DIR:=${at3prefix}/share/glite-lb/at3
 axis_classpath:=$(shell ls -1 ${axis_prefix}/lib/*.jar 2>/dev/null | tr '\012' :)
 trustmanager_classpath:=$(shell ls -1 ${trustmanager_prefix}/share/java/glite-security-trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager-axis.jar ${stagedir}${prefix}/share/java/trustmanager.jar ${stagedir}${prefix}/share/java/trustmanager-axis.jar 2>/dev/null | tr '\012' :)
 

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 391f84c..1a41076 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -22,9 +22,11 @@ version=${module.version}
 VERSION_AHEAD=-3
 
 VPATH=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir}/examples:${top_srcdir}/doc
-AT3=${stagedir}${prefix}/sbin/glite-lb-at3
+at3prefix=$(shell at3dir=${prefix}/share/glite-lb/at3; if test -d ${stagedir}$$at3dir; then echo ${stagedir}${prefix}; else echo ${prefix}; fi)
+AT3=${at3prefix}/sbin/glite-lb-at3
 GENSAM=${top_srcdir}/examples/gen_sample_job
-CHECK_VERSION:=VERSION=${version} VERSION_AHEAD=${VERSION_AHEAD} perl ${stagedir}${prefix}/sbin/glite-lb-check_version.pl
+check_version_pl=$(shell sbin_dir=${stagedir}${prefix}/sbin; if test -f $${sbin_dir}/glite-lb-check_version.pl; then echo $${sbin_dir}; else echo ${prefix}/sbin; fi)/glite-lb-check_version.pl
+CHECK_VERSION:=VERSION=${version} VERSION_AHEAD=${VERSION_AHEAD} perl ${check_version_pl}
 
 SUFFIXES = .T .l
 

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 281f142..4dd06c9 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -19,7 +19,8 @@ jobiddir=${top_srcdir}/../org.glite.jobid.api-c
 version=${module.version}
 
 VPATH=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir}/doc
-AT3=${stagedir}${prefix}/sbin/glite-lb-at3
+at3prefix=$(shell at3dir=${prefix}/share/glite-lb/at3; if test -d ${stagedir}$$at3dir; then echo ${stagedir}${prefix}; else echo ${prefix}; fi)
+AT3=${at3prefix}/sbin/glite-lb-at3
 
 SUFFIXES = .T
 
@@ -252,20 +253,20 @@ il_int_test.o il_string_test.o il_test.o il_msg_test.o parse.o: %.o: %.cpp test_
 
 %.h: %.h.T
        rm -f $@
-       ${AT3} $< >$@ || rm -f $@
+       ${AT3} $< >$@ || ( rm -f $@; false )
        chmod -w $@ >/dev/null
 
 %.c: %.c.T
        rm -f $@
-       ${AT3} $< >$@ || rm -f $@
+       ${AT3} $< >$@ || ( rm -f $@; false )
        chmod -w $@ >/dev/null
 
 %.cpp: %.cpp.T
        rm -f $@
-       ${AT3} $< >$@ || rm -f $@
+       ${AT3} $< >$@ || ( rm -f $@; false )
        chmod -w $@ >/dev/null
 
 %.tex: %.tex.T
        rm -f $@
-       ${AT3} $< >$@ || rm -f $@
+       ${AT3} $< >$@ || ( rm -f $@; false )
        chmod -w $@ >/dev/null

diff --git a/org.glite.lb.doc/Makefile b/org.glite.lb.doc/Makefile
index a019e6f..7c1abfb 100644 (file)
--- a/org.glite.lb.doc/Makefile
+++ b/org.glite.lb.doc/Makefile
@@ -23,7 +23,8 @@ LATEX = $(KPATH) latex
 PDFLATEX = $(KPATH) pdflatex
 BIBTEX = $(KPATHBIB) bibtex
 DVIPS = $(KPATH) dvips
-AT3=${stagedir}${prefix}/sbin/glite-lb-at3
+at3prefix=$(shell at3dir=${prefix}/share/glite-lb/at3; if test -d ${stagedir}$$at3dir; then echo ${stagedir}${prefix}; else echo ${prefix}; fi)
+AT3=${at3prefix}/sbin/glite-lb-at3
 INSTALL=install
 
 default all: generate doc
@@ -49,7 +50,7 @@ doc: LBUG.pdf LBAG.pdf LBDG.pdf LBTP.pdf LBTG.pdf
 
 %.tex: %.tex.T
        rm -f $@
-       ${AT3} $< >$@ || rm -f $@
+       ${AT3} $< >$@ || ( rm -f $@; false )
        chmod -w $@ >/dev/null
 
 ver.tex:

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 4c6174a..57c667d 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -58,7 +58,8 @@ ifeq ($(gsoap_version),2.7.0)
 else
        VPATH=${top_srcdir}/interface:${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/doc:${top_srcdir}/examples:${top_srcdir}/project
 endif
-AT3=${stagedir}${prefix}/sbin/glite-lb-at3
+at3prefix=$(shell at3dir=${prefix}/share/glite-lb/at3; if test -d ${stagedir}$$at3dir; then echo ${stagedir}${prefix}; else echo ${prefix}; fi)
+AT3=${at3prefix}/sbin/glite-lb-at3
 
 SUFFIXES = .T 
 
@@ -278,7 +279,7 @@ test_coverage:
 
 lb_xml_parse.c: lb_xml_parse.c.T
        rm -f $@
-       ${AT3} $< >$@ || rm -f $@
+       ${AT3} $< >$@ || ( rm -f $@; false )
        chmod -w $@ >/dev/null
 
 ${GSOAP_FILES_PREFIX}H.h ${GSOAP_FILES_PREFIX}C.c ${GSOAP_FILES_PREFIX}Server.c ${GSOAP_FILES_PREFIX}Client.c ${GSOAP_FILES_PREFIX}ServerLib.c ${GSOAP_FILES_PREFIX}ClientLib.c LoggingAndBookkeeping.nsmap: LB.xh
@@ -381,7 +382,7 @@ clean:
 
 %.c: %.c.T
        rm -f $@
-       ${AT3} $< >$@ || rm -f $@
+       ${AT3} $< >$@ || ( rm -f $@; false )
        chmod -w $@ >/dev/null
 
 %.o: %.y
@@ -393,7 +394,7 @@ clean:
 
 %.cpp: %.cpp.T
        rm -f $@
-       ${AT3} $< >$@ || rm -f $@
+       ${AT3} $< >$@ || ( rm -f $@; false )
        chmod -w $@ >/dev/null
 
 %.o %.lo: %.c

diff --git a/org.glite.lb.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile
index 68ea67b..4dd4539 100644 (file)
--- a/org.glite.lb.ws-interface/Makefile
+++ b/org.glite.lb.ws-interface/Makefile
@@ -18,7 +18,8 @@ version=${module.version}
 SUFFIXES = .T
 
 VPATH=${top_srcdir}/src
-AT3=${stagedir}${prefix}/sbin/glite-lb-at3
+at3prefix=$(shell at3dir=${prefix}/share/glite-lb/at3; if test -d ${stagedir}$$at3dir; then echo ${stagedir}${prefix}; else echo ${prefix}; fi)
+AT3=${at3prefix}/sbin/glite-lb-at3
 XSLTPROC:=xsltproc --nonet
 XMLLINT:=xmllint --nonet
 TIDY=tidy -i -q --show-warnings no --tidy-mark no --wrap 0
@@ -65,7 +66,7 @@ clean:
 
 %.xml: %.xml.T
        rm -f $@
-       ${AT3} $< >$@ || rm -f $@
+       ${AT3} $< >$@ || ( rm -f $@; false )
        chmod -w $@ >/dev/null
 
 ${WSDL}: %.wsdl: %.xml puke-wsdl.xsl

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index e5cd7ee..4bbff51 100755 (executable)
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -526,7 +526,7 @@ BEGIN{
        '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.utils' => [ qw/cppunit:B libtool:B/ ],
-       'lb.ws-interface' => [],
+       'lb.ws-interface' => [ qw/libxslt:B/ ],
        'lb.ws-test' => [ qw/gsoap:B libtool:B/ ],
        'lb.types' => [ qw// ],
        'lb.harvester' => [ qw/docbook-utils:B libtool:B/ ],
@@ -538,7 +538,7 @@ BEGIN{
        'lbjp-common.jp-interface' => [ qw/cppunit:B log4c:B libtool:B/ ],
        '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/ ],
+       'jobid.api-c' =>  [ qw/cppunit:B libtool:B openssl:B/ ],
        'jobid.api-cpp' =>  [ qw/cppunit:B/ ],
        'jobid.api-java' =>  [ qw/ant:B jdk:B/ ],
        'jp.client' => [ qw/gsoap libtar globus_essentials:R globus:B/ ],
@@ -551,7 +551,7 @@ BEGIN{
        'gridsite.commands' => [ qw/curl:R openssl:R/ ],
        'gridsite.apache' => [ qw/libxml2:R openssl:R curl:R/ ],
        'gridsite.shared' => [ qw/libxml2:R openssl:R/ ],
-       'gridsite.devel' => [],
+       'gridsite.devel' => [ qw// ],
        'gridsite.slashgrid' => [ qw/curl:R fuse-libs:R fuse:R/],
        'gridsite.services' => [ qw/curl:R gsoap:R/ ],
        'gridsite.service-clients' => [ qw/curl:R gsoap:R gsoapxx:R/ ],
@@ -624,6 +624,11 @@ for my $jar (keys %need_jars) {
                lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java: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.logger-msg:R
+       / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.log' => [ qw// ],
@@ -662,17 +667,18 @@ for my $jar (keys %need_jars) {
        'jp.ws-interface' => [ qw// ],
 
        'gridsite.core' => [ qw// ],
-       'gridsite.commands' => [ qw/gridsite.shared:R/ ],
-       'gridsite.apache' => [ qw/gridsite.shared:R/ ],
-       'gridsite.shared' => [ qw// ],
-       'gridsite.devel' => [ qw/gridsite.shared:R/ ],
-       'gridsite.slashgrid' => [ qw/gridsite.shared:R/],
-       'gridsite.services' => [ qw/gridsite.shared:R/ ],
-       'gridsite.service-clients' => [ qw/gridsite.shared:R/ ],
-       'gridsite.gsexec' => [ qw// ],
+       'gridsite.commands' => [ qw/gridsite.core:B gridsite.shared:R/ ],
+       'gridsite.apache' => [ qw/gridsite.core:B gridsite.shared:R/ ],
+       'gridsite.shared' => [ qw/gridsite.core:B / ],
+       'gridsite.devel' => [ qw/gridsite.core:B gridsite.shared:R/ ],
+       'gridsite.slashgrid' => [ qw/gridsite.core:B gridsite.shared:R/],
+       'gridsite.services' => [ qw/gridsite.core:B gridsite.shared:R/ ],
+       'gridsite.service-clients' => [ qw/gridsite.core:B gridsite.shared:R/ ],
+       'gridsite.gsexec' => [ qw/gridsite.core:B/ ],
 
        'px.proxyrenewal' => [ qw// ],
        'px.glite-PX' => [qw/px.myproxy-yaim:R/],
+       'px.emi-px' => [qw/px.myproxy-yaim:R/],
        'px.myproxy-yaim' => [ qw// ],
        'px.myproxy-config' => [],
 );
@@ -811,7 +817,7 @@ for my $ext (keys %deps_aux) {
                        yaim_bdii=>'emi.bdii.yaim-bdii',
                        gip_release=>'emi.bdii.glite-info-provider-release',
                        gip_service=>'emi.bdii.glite-info-provider-service',
-                       bdii=>'emi.bdii.bdii-core',
+                       bdii=>'emi.bdii.core',
                        glite_version=>'emi.misc.glite-version',
                        glue_schema=>'emi.bdii.glue-schema',
                        trustmanager=>'emi.java-security.trustmanager',
@@ -820,6 +826,7 @@ for my $ext (keys %deps_aux) {
                        lcas=>'emi.sac.lcas',
                        gsoapxx=>'-',
                        build_common_cpp=>'emi.misc.glite.build-common-cpp',
+                       jdk=>'java',
                },
                etics_externs_devel => {
                        cares => 'c-ares-devel',
@@ -835,6 +842,7 @@ for my $ext (keys %deps_aux) {
                        libxml2 => 'libxml2-devel',
                        openssl => 'openssl-devel',
                        gridsite=>'emi.gridsite.devel',
+                       jdk=>'java-devel',
                },
                etics_projects => {
                        'emi'=>[qw/voms voms-devel gridsite lcas gip_release gip_service bdii glite_version glue_schema yaim_core yaim_bdii trustmanager trustmanager_axis/],
@@ -1129,7 +1137,9 @@ sub mode_etics {
                        $cmd{compile} = "echo 'make $flags' > build.sh\n\tmake $flags build";
                        $cmd{clean} = "rm -rvf build.sh; $cmd{clean}";
                        $cmd{install} = "make $prefix $flags install";
-                       $cmd{packaging} = "make $prefix $flags rpm";
+                       $cmd{packaging} = "mkdir ${moduleDir}/src/tgz
+       make $prefix $flags rpm && \
+       cp ${moduleDir}/RPMTMP/SOURCES/gridsite-${version}.src.tar.gz ${moduleDir}/src/tgz";
                }
                else {
                        $cmd{clean} = 'None';
@@ -1195,8 +1205,8 @@ checkstyle = None
 [Platform-default:Property]
 $buildroot
 aprSuffix = 0
-package.RPMSLocation = \${moduleDir}/$cvs_prefix{$subsys}.$subsys.$module/RPMTMP/RPMS
-package.SRPMSLocation = \${moduleDir}/$cvs_prefix{$subsys}.$subsys.$module/RPMTMP/SRPMS
+package.RPMSLocation = \${moduleDir}/RPMTMP/RPMS
+package.SRPMSLocation = \${moduleDir}/RPMTMP/SRPMS
 package.preserve.libtool = false
 $package_description$package_summary$defprops};
 
@@ -1217,8 +1227,8 @@ $package_description$package_summary$defprops};
                for my $p (keys %{$platform_properties{"$subsys.$module"}->{$pp}}) {
                        print C $p . ' = ' . $platform_properties{"$subsys.$module"}->{$pp}->{$p} . "\n";
                }
-               print C "package.RPMSLocation = \${moduleDir}/$cvs_prefix{$subsys}.$subsys.$module/RPMTMP/RPMS
-package.SRPMSLocation = \${moduleDir}/$cvs_prefix{$subsys}.$subsys.$module/RPMTMP/SRPMS\n";
+               print C "package.RPMSLocation = \${moduleDir}/RPMTMP/RPMS
+package.SRPMSLocation = \${moduleDir}/RPMTMP/SRPMS\n";
                print C "$package_description$package_summary\n";
        }