From: František Dvořák <valtri@civ.zcu.cz>
Date: Fri, 4 Jul 2008 16:12:59 +0000 (+0000)
Subject: Perl generator fixes (minimalistic patch).
X-Git-Tag: merge_316_6_dst~59
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=5544b901373339810be867889892fdffe3692f27;p=jra1mw.git

Perl generator fixes (minimalistic patch).
---

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 2de8600..52cea69 100644
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -248,7 +248,7 @@ perftest_logjobs.o: perftest_logjobs.c
 
 %.h: %.h.T
 	rm -f $@
-	${AT3} $< >$@ || rm -f $@
+	${AT3} $< >$@ || ( rm -f $@; false )
 	chmod -w $@ >/dev/null
 
 %.o: %.cpp
@@ -256,12 +256,12 @@ perftest_logjobs.o: perftest_logjobs.c
 
 %.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
 
 %.sh: %.l gen_begin gen_sample_job
@@ -302,9 +302,9 @@ Event.cpp: EventAttrNames.pl
 
 JobStatus.cpp: StatusAttrNames.pl
 
-EventAttrNames.pl StatusAttrNames.pl:
+EventAttrNames.pl:
 	rm -f $@
-	ln -s ${stagedir}/share/${lbprefix}/at3/$@ $@
+	ln -s ${stagedir}/share/perl/gLite/LB/$@ $@
 
 dist: distsrc distbin
 
@@ -356,7 +356,7 @@ clean:
 	rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h *.dox producer_test notify C/ CPP/
 	rm -rvf ${LIB} ${THRLIB} ${TOOLS} logevent ${PLUSLIB} ${THRPLUSLIB} ${MAN_GZ} ${MAN8_GZ}
 	rm -rvf ${EXAMPLES} ${EXAMPLES_CL} ${EXAMPLES_CL_THR} ${sh_PROGS}
-	rm -f EventAttrNames.pl StatusAttrNames.pl
+	rm -f EventAttrNames.pl
 	rm -vf ${globalprefix} ${lbprefix}
 	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/
 
diff --git a/org.glite.lb.client/src/JobStatus.cpp.T b/org.glite.lb.client/src/JobStatus.cpp.T
index 4ba683c..318667a 100644
--- a/org.glite.lb.client/src/JobStatus.cpp.T
+++ b/org.glite.lb.client/src/JobStatus.cpp.T
@@ -17,7 +17,7 @@ EWL_BEGIN_NAMESPACE;
 
 @@@{
 
-require 'StatusAttrNames.pl';
+require '../src/StatusAttrNames.pl';
 
 sub typeswitch {
         my ($ftype,$ctype,$resc) = @_;
diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index fd46414..d1cba0a 100644
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -215,6 +215,7 @@ install:
 		fi ; \
 		${STAGE_PERFTEST} ; \
 	fi
+	${INSTALL} -m 644 ${top_srcdir}/src/EventAttrNames.pl ${PREFIX}/share/perl/gLite/LB
 
 clean:
 	rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/ test_parse il_test parse.cpp events.tex status.tex
diff --git a/org.glite.lb.types/at3.in b/org.glite.lb.types/at3.in
index b90ac60..544b4c5 100755
--- a/org.glite.lb.types/at3.in
+++ b/org.glite.lb.types/at3.in
@@ -49,7 +49,7 @@ while (<>) {
 		if (/^\@\@\@}$/) {
 			$code .= "1;\n";
 			print "#line $startcode \"$ARGV\"\n/* begin */\n" if $lines;
-			eval $code or warn "eval: $@ at $ARGV:$.\n";
+			eval $code or die "eval: $@ at $ARGV:$.\n";
 			my $nxtline = $.+1;
 			print "/* end */\n#line $nxtline \"$ARGV\"\n" if $lines;
 			undef $code;