From cce8386b2b0661130f359beccf7e26a4abb3f46e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Wed, 10 Dec 2008 13:44:52 +0000 Subject: [PATCH] move Event.h to lb.client, and related changes --- org.glite.lb.client/Makefile | 15 +++++++-------- .../interface/Event.h.T | 0 org.glite.lb.client/interface/Job.h | 3 ++- org.glite.lb.client/interface/ServerConnection.h | 3 ++- org.glite.lb.client/src/Event.cpp.T | 4 ++-- .../src/EventAttrNames.pl | 0 org.glite.lb.common/Makefile | 7 ++++--- 7 files changed, 17 insertions(+), 15 deletions(-) rename {org.glite.lb.common => org.glite.lb.client}/interface/Event.h.T (100%) rename {org.glite.lb.common => org.glite.lb.client}/src/EventAttrNames.pl (100%) diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index e9adfb5..ff7f5d1 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -112,7 +112,7 @@ COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} CXXCOMPILE:=libtool --mode=compile ${CXX} ${CXXFLAGS} LINK:=libtool --mode=link ${CC} ${LDFLAGS} LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} -INSTALL:=libtool --mode=install install +INSTALL?=libtool --mode=install install LIBOBJS:=connection.o consumer.o notification.o prod_proto.o \ producer.o uiwrap.o statistics.o @@ -121,7 +121,7 @@ PLUSOBJS:=Event.o Job.o JobStatus.o Notification.o ServerConnection.o stat_field HDRS:=consumer.h notification.h statistics.h prod_proto.h connection.h \ Job.h Notification.h ServerConnection.h stat_fields.h -GEN_HDRS:=JobStatus.h producer.h +GEN_HDRS:=Event.h JobStatus.h producer.h LIBTHROBJS:=${LIBOBJS:.o=.thr.o} LIBLOBJS:=${LIBOBJS:.o=.lo} @@ -296,13 +296,13 @@ olddoc: generate doxygen C.dox doxygen CPP.dox -Event.cpp: EventAttrNames.pl +Event.h Event.cpp: EventAttrNames.pl -JobStatus.cpp: StatusAttrNames.pl +JobStatus.h JobStatus.cpp: StatusAttrNames.pl -EventAttrNames.pl: - rm -f $@ - ln -s ${stagedir}/share/perl/gLite/LB/$@ $@ +#EventAttrNames.pl: +# rm -f $@ +# ln -s ${stagedir}/share/perl/gLite/LB/$@ $@ dist: distsrc distbin @@ -363,6 +363,5 @@ clean: check_version: ${CHECK_VERSION} ${stagedir}/include/glite/lb/common_version.h -JobStatus.h: StatusAttrNames.pl .PHONY: default all compile examples check stage install clean check_version diff --git a/org.glite.lb.common/interface/Event.h.T b/org.glite.lb.client/interface/Event.h.T similarity index 100% rename from org.glite.lb.common/interface/Event.h.T rename to org.glite.lb.client/interface/Event.h.T diff --git a/org.glite.lb.client/interface/Job.h b/org.glite.lb.client/interface/Job.h index d0df9ce..c1267d2 100644 --- a/org.glite.lb.client/interface/Job.h +++ b/org.glite.lb.client/interface/Job.h @@ -5,12 +5,13 @@ #include "glite/jobid/JobId.h" -#include "glite/lb/Event.h" #ifdef BUILDING_LB_CLIENT +#include "Event.h" #include "JobStatus.h" #include "ServerConnection.h" #else +#include "glite/lb/Event.h" #include "glite/lb/JobStatus.h" #include "glite/lb/ServerConnection.h" #endif diff --git a/org.glite.lb.client/interface/ServerConnection.h b/org.glite.lb.client/interface/ServerConnection.h index 6bc70c9..dba776a 100644 --- a/org.glite.lb.client/interface/ServerConnection.h +++ b/org.glite.lb.client/interface/ServerConnection.h @@ -13,12 +13,13 @@ #include "glite/jobid/JobId.h" -#include "glite/lb/Event.h" #ifdef BUILDING_LB_CLIENT +#include "Event.h" #include "JobStatus.h" #include "consumer.h" #else +#include "glite/lb/Event.h" #include "glite/lb/JobStatus.h" #include "glite/lb/consumer.h" #endif diff --git a/org.glite.lb.client/src/Event.cpp.T b/org.glite.lb.client/src/Event.cpp.T index dabb049..301d645 100644 --- a/org.glite.lb.client/src/Event.cpp.T +++ b/org.glite.lb.client/src/Event.cpp.T @@ -11,7 +11,7 @@ #include "glite/jobid/cjobid.h" -#include "glite/lb/Event.h" +#include "Event.h" #include "glite/lb/events.h" #include "glite/lb/notifid.h" #include "glite/lb/LoggingExceptions.h" @@ -24,7 +24,7 @@ EWL_BEGIN_NAMESPACE; @@@{ -require 'EventAttrNames.pl'; +require '../src/EventAttrNames.pl'; sub typeswitch { my $ftype = shift; diff --git a/org.glite.lb.common/src/EventAttrNames.pl b/org.glite.lb.client/src/EventAttrNames.pl similarity index 100% rename from org.glite.lb.common/src/EventAttrNames.pl rename to org.glite.lb.client/src/EventAttrNames.pl diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile index 6d88518..1532406 100644 --- a/org.glite.lb.common/Makefile +++ b/org.glite.lb.common/Makefile @@ -103,7 +103,7 @@ HDRS:=context.h context-int.h lb_plain_io.h mini_http.h authz.h xml_parse.h \ xml_conversions.h log_proto.h events_parse.h il_string.h il_msg.h \ ulm_parse.h connpool.h notifid.h notif_rec.h padstruct.h \ query_rec.h timeouts.h LoggingExceptions.h CountRef.h ${PERF_HDRS} -GEN_HDRS:=Event.h events.h jobstat.h common_version.h +GEN_HDRS:=events.h jobstat.h common_version.h STATICLIB:=libglite_lb_common_${nothrflavour}.a THRSTATICLIB:=libglite_lb_common_${thrflavour}.a @@ -223,9 +223,12 @@ install: fi ; #??? ${STAGE_PERFTEST} ; mkdir -p ${PREFIX}/share/perl/gLite/LB +<<<<<<< Makefile +======= ${INSTALL} -m 644 ${top_srcdir}/src/EventAttrNames.pl ${PREFIX}/share/perl/gLite/LB mkdir -p ${PREFIX}/share/build/m4 ${INSTALL} -m 644 ${top_srcdir}/m4/*.m4 ${PREFIX}/share/build/m4 +>>>>>>> 1.94 clean: rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/ test_parse il_test parse.cpp events.tex status.tex @@ -259,5 +262,3 @@ il_int_test.o il_string_test.o il_test.o il_msg_test.o parse.o: %.o: %.cpp test_ rm -f $@ ${AT3} $< >$@ || rm -f $@ chmod -w $@ >/dev/null - -Event.h: EventAttrNames.pl -- 1.8.2.3