From: František Dvořák Date: Tue, 12 Apr 2011 20:06:07 +0000 (+0000) Subject: Mock build fixes, stage2: X-Git-Tag: glite-jobid-api-c_R_2_0_2_5~10 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=4b79c94726a486890921ef2732a5adf9b2bd0bb5;p=jra1mw.git Mock build fixes, stage2: - revert at3 location detections - fix '--stage=/' behaviour in configure - update dependencies --- diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile index e595101..d0401d7 100644 --- a/org.glite.lb.client-java/Makefile +++ b/org.glite.lb.client-java/Makefile @@ -16,9 +16,8 @@ JAVAC:=${jdk_prefix}/bin/javac JAVAH:=${jdk_prefix}/bin/javah JAVA:=${jdk_prefix}/bin/java -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 +GEN:=${stagedir}${prefix}/sbin/glite-lb-at3 ${top_srcdir}/project/genEventTypes.pl +AT3DIR:=${stagedir}${prefix}/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 1a41076..b7391e1 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -22,8 +22,7 @@ version=${module.version} VERSION_AHEAD=-3 VPATH=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir}/examples:${top_srcdir}/doc -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 +AT3=${stagedir}${prefix}/sbin/glite-lb-at3 GENSAM=${top_srcdir}/examples/gen_sample_job 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} diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile index 4dd06c9..bddaa50 100644 --- a/org.glite.lb.common/Makefile +++ b/org.glite.lb.common/Makefile @@ -19,8 +19,7 @@ jobiddir=${top_srcdir}/../org.glite.jobid.api-c version=${module.version} VPATH=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir}/doc -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 +AT3=${stagedir}${prefix}/sbin/glite-lb-at3 SUFFIXES = .T diff --git a/org.glite.lb.doc/Makefile b/org.glite.lb.doc/Makefile index 7c1abfb..490d011 100644 --- a/org.glite.lb.doc/Makefile +++ b/org.glite.lb.doc/Makefile @@ -23,8 +23,7 @@ LATEX = $(KPATH) latex PDFLATEX = $(KPATH) pdflatex BIBTEX = $(KPATHBIB) bibtex DVIPS = $(KPATH) dvips -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 +AT3=${stagedir}${prefix}/sbin/glite-lb-at3 INSTALL=install default all: generate doc diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index b96d5bc..5cbe9ce 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -58,8 +58,7 @@ 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 -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 +AT3=${stagedir}${prefix}/sbin/glite-lb-at3 SUFFIXES = .T diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile index b770178..0ef00c1 100644 --- a/org.glite.lb.utils/Makefile +++ b/org.glite.lb.utils/Makefile @@ -127,6 +127,6 @@ clean: %.c: %.c.T rm -f $@ - ${AT3} $< >$@ || rm -f $@ + ${AT3} $< >$@ || ( rm -f $@; false ) chmod -w $@ >/dev/null diff --git a/org.glite.lb.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile index dee026f..c148fc3 100644 --- a/org.glite.lb.ws-interface/Makefile +++ b/org.glite.lb.ws-interface/Makefile @@ -18,8 +18,7 @@ version=${module.version} SUFFIXES = .T VPATH=${top_srcdir}/src -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 +AT3=${stagedir}${prefix}/sbin/glite-lb-at3 XSLTPROC:=xsltproc --nonet XMLLINT:=xmllint --nonet TIDY=tidy -i -q --show-warnings no --tidy-mark no --wrap 0 diff --git a/org.glite.lb/configure b/org.glite.lb/configure index 4bbff51..27f197c 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/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/ ], @@ -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') {