lb4vdt stuff and cleanup

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index a4f2d47..270d978 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -67,7 +67,7 @@ DEBUG:=-g -O0 -Wall
 GLOBUSINC:= -I${globus_prefix}/include/${nothrflavour}
 GLOBUSTHRINC:= -I${globus_prefix}/include/${thrflavour}
 
-ifeq (${LB_STANDALONE},yes)
+ifdef LB_STANDALONE
         LB_STANDALONE_FLAGS:=-DLB_STANDALONE
 endif
 
@@ -242,7 +242,11 @@ ${MAN_GZ}: ${MAN}
 default: all
 
 
+ifdef LB_STANDALONE
+compile all: ${LIB} ${THRLIB} ${TOOLS} logevent examples ${MAN_GZ}
+else
 compile all: ${LIB} ${THRLIB} ${TOOLS} logevent ${PLUSLIB} ${THRPLUSLIB} examples ${MAN_GZ}
+endif
 
 examples: ${EXAMPLES} ${EXAMPLES_CL} ${sh_PROGS}
 
@@ -284,7 +288,11 @@ install:
        mkdir -p ${PREFIX}/lib
        mkdir -p ${PREFIX}/share/doc/${package}-${version}
        mkdir -p ${PREFIX}/share/man/man1
+ifdef LB_STANDALONE
+       ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PREFIX}/lib
+else
        ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PLUSLIB} ${THRPLUSLIB} ${PREFIX}/lib
+endif
        ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
        ${INSTALL} -m 644 ${top_srcdir}/doc/README-fake ${top_srcdir}/doc/README-notify ${PREFIX}/share/doc/${package}-${version}
        mkdir -p ${PREFIX}/examples

diff --git a/org.glite.lb.client/project/configure.properties.xml b/org.glite.lb.client/project/configure.properties.xml
index 7fb2f41..afe1490 100644 (file)
--- a/org.glite.lb.client/project/configure.properties.xml
+++ b/org.glite.lb.client/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.5  2006/03/15 18:02:37  akrenek
+       cares
+
        Revision 1.4  2006/03/15 17:59:04  akrenek
        merge 1.5
        
@@ -56,12 +59,12 @@ PREFIX=${install.dir}
 version=${module.version}
 glite_location=${with.glite.location}
 globus_prefix=${with.globus.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
 expat_prefix=${with.expat.prefix}
 mysql_prefix=${with.mysql.prefix}
 mysql_version=${ext.mysql.version}
 cppunit_prefix=${with.cppunit.prefix}
+thrflavour=${with.globus.thr.flavor}
+nothrflavour=${with.globus.nothr.flavor}
                        </echo>
            </target>
        </project>

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index 3fbfa25..a0c32a3 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -34,11 +34,11 @@ DEBUG:=-g -O0 -Wall
 GLOBUSINC:= -I${globus_prefix}/include/${nothrflavour}
 GLOBUSTHRINC:= -I${globus_prefix}/include/${thrflavour}
 
-ifneq (${LB_STANDALONE},yes)
-       JOBID_LIB:=-lglite_wmsutils_cjobid
-else
+ifdef LB_STANDALONE
        JOBID_OBJS:=cjobid.o strmd5.o
        LB_STANDALONE_FLAGS:=-DLB_STANDALONE
+else
+       JOBID_LIB:=-lglite_wmsutils_cjobid
 endif
 
 CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \
@@ -79,8 +79,8 @@ LDFLAGS:=-L${stagedir}/lib \
 EXT_LIBS:= ${EXPAT_LIBS} ${GLOBUS_LIBS} ${JOBID_LIB}
 EXT_THRLIBS:= ${EXPAT_LIBS} ${GLOBUS_THRLIBS} ${JOBID_LIB}
 
-TEST_LIBS:=-L${cppunit}/lib -lcppunit
-TEST_INC:=-I${cppunit}/include
+TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
+TEST_INC:=-I${cppunit_prefix}/include
 
 COMPILE:=libtool --mode=compile ${CC}
 LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} 

diff --git a/org.glite.lb.common/project/configure.properties.xml b/org.glite.lb.common/project/configure.properties.xml
index 979c6f1..2a9c5bc 100644 (file)
--- a/org.glite.lb.common/project/configure.properties.xml
+++ b/org.glite.lb.common/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.4  2006/03/15 17:53:14  akrenek
+       cares
+
        Revision 1.3  2004/08/31 07:57:17  akrenek
        very first unit test
        
@@ -51,9 +54,9 @@ version=${module.version}
 glite_location=${with.glite.location}
 globus_prefix=${with.globus.prefix}
 expat_prefix=${with.expat.prefix}
+cppunit_prefix=${with.cppunit.prefix}
 thrflavour=${with.globus.thr.flavor}
 nothrflavour=${with.globus.nothr.flavor}
-cppunit=${with.cppunit.prefix}
                        </echo>
            </target>
        </project>

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 97b0aa4..365520e 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -33,12 +33,16 @@ GLOBUSINC=-I${globus_prefix}/include/${nothrflavour}
 
 GLOBUSTHRINC=-I${globus_prefix}/include/${thrflavour}
 
+ifdef LB_STANDALONE
+       LB_STANDALONE_FLAGS:=-DLB_STANDALONE
+endif
+
 DEBUG:=-g -O0
 CFLAGS:=${DEBUG} \
        -I${stagedir}/include -I${top_srcdir}/src \
        -D_GNU_SOURCE \
        ${COVERAGE_FLAGS} \
-       ${VERSION}
+       ${VERSION} ${LB_STANDALONE_FLAGS}
 
 LDFLAGS:=-L${stagedir}/lib \
        ${COVERAGE_FLAGS} 

diff --git a/org.glite.lb.logger/project/configure.properties.xml b/org.glite.lb.logger/project/configure.properties.xml
index 6918019..3279d84 100644 (file)
--- a/org.glite.lb.logger/project/configure.properties.xml
+++ b/org.glite.lb.logger/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.3  2006/03/15 18:25:31  akrenek
+       cares
+
        Revision 1.2  2004/08/31 13:44:44  mvocu
        * added cppunit
        
@@ -53,10 +56,10 @@ PREFIX=${install.dir}
 version=${module.version}
 glite_location=${with.glite.location}
 globus_prefix=${with.globus.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
 expat_prefix=${with.expat.prefix}
 cppunit_prefix=${with.cppunit.prefix}
+thrflavour=${with.globus.thr.flavor}
+nothrflavour=${with.globus.nothr.flavor}
                        </echo>
            </target>
        </project>

diff --git a/org.glite.lb.proxy/Makefile b/org.glite.lb.proxy/Makefile
index ef0cffd..a8d4f7d 100644 (file)
--- a/org.glite.lb.proxy/Makefile
+++ b/org.glite.lb.proxy/Makefile
@@ -28,13 +28,17 @@ YACC=bison -y
 VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/examples:${top_srcdir}/project
 AT3=perl -I${top_srcdir}/project ${top_srcdir}/project/at3
 
-TEST_LIBS:=-L${cppunit}/lib -lcppunit
-TEST_INC:=-I${cppunit}/include
+TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
+TEST_INC:=-I${cppunit_prefix}/include
 
 SUFFIXES = .T 
 
 DEBUG:=-g -O0 -Wall
 
+ifdef LB_STANDALONE
+       LB_STANDALONE_FLAGS:=-DLB_STANDALONE
+endif
+
 CFLAGS:= ${DEBUG} \
        -DVERSION=\"${version}\" \
        -I${stagedir}/include -I${top_srcdir}/src -I. \
@@ -44,7 +48,7 @@ CFLAGS:= ${DEBUG} \
        -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
        -I${globus_prefix}/include/${nothrflavour} \
        -I${gridsite_prefix}/include -I${globus_prefix}/include/${nothrflavour}/openssl \
-       -D_GNU_SOURCE
+       -D_GNU_SOURCE ${LB_STANDALONE_FLAGS}
 
 
 LINK:=libtool --mode=link ${CC} ${LDFLAGS} 

diff --git a/org.glite.lb.proxy/project/configure.properties.xml b/org.glite.lb.proxy/project/configure.properties.xml
index 42628fe..dec83a3 100644 (file)
--- a/org.glite.lb.proxy/project/configure.properties.xml
+++ b/org.glite.lb.proxy/project/configure.properties.xml
@@ -42,14 +42,14 @@ PREFIX=${install.dir}
 version=${module.version}
 glite_location=${with.glite.location}
 globus_prefix=${with.globus.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
 expat_prefix=${with.expat.prefix}
 mysql_prefix=${with.mysql.prefix}
 mysql_version=${ext.mysql.version}
-cppunit=${with.cppunit.prefix}
 gridsite_prefix=${with.gridsite.prefix}
 gsoap_prefix=${with.gsoap.prefix}
+cppunit_prefix=${with.cppunit.prefix}
+thrflavour=${with.globus.thr.flavor}
+nothrflavour=${with.globus.nothr.flavor}
                        </echo>
            </target>
        </project>

diff --git a/org.glite.lb.server-bones/Makefile b/org.glite.lb.server-bones/Makefile
index 2387bf3..321765d 100644 (file)
--- a/org.glite.lb.server-bones/Makefile
+++ b/org.glite.lb.server-bones/Makefile
@@ -15,7 +15,7 @@ globus_prefix=/opt/globus
 nothrflavour=gcc32
 thrflavour=gcc32pthr
 expat_prefix=/opt/expat
-ares_prefix=/opt/ares
+cares_prefix=/opt/c-ares
 
 CC=gcc
 

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 987f564..298a0d2 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -18,6 +18,7 @@ expat_prefix=/opt/expat
 cares_prefix=/opt/c-ares
 gsoap_prefix=/opt/gsoap
 classads_prefix=/opt/classads
+voms_prefix=/opt/voms
 
 -include Makefile.inc
 -include ../project/version.properties
@@ -28,6 +29,11 @@ default all: compile
 
 GLITE_LB_SERVER_WITH_WS=yes
 
+ifdef LB_STANDALONE
+       LB_STANDALONE_FLAGS:=-DLB_STANDALONE
+       GLITE_LB_SERVER_WITH_WS=no
+endif
+
 ifeq ($(GLITE_LB_SERVER_WITH_WS),yes)
        WS_CFLAGS=-DGLITE_LB_SERVER_WITH_WS 
        NSMAP=LoggingAndBookkeeping.nsmap
@@ -47,9 +53,6 @@ else
 endif
 AT3=perl -I${top_srcdir}/project ${top_srcdir}/project/at3
 
-TEST_LIBS:=-L${cppunit}/lib -lcppunit
-TEST_INC:=-I${cppunit}/include
-
 SUFFIXES = .T 
 
 DEBUG:=-g -O0 -Wall
@@ -66,14 +69,15 @@ CFLAGS:= \
        -I${cares_prefix}/include \
        -I${gsoap_prefix}/include -I${gsoap_prefix}/ \
        -I${classads_prefix}/include \
+       -I${voms_prefix}/include \
        ${COVERAGE_FLAGS} \
        -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql \
        -I${globus_prefix}/include/${nothrflavour} \
        $(GRIDSITE_CFLAGS) \
-       -D_GNU_SOURCE
+       -D_GNU_SOURCE ${LB_STANDALONE_FLAGS}
 
-TEST_LIBS:=-L${cppunit}/lib -lcppunit
-TEST_INC:=-I${cppunit}/include
+TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
+TEST_INC:=-I${cppunit_prefix}/include
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
 LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib  ${LDFLAGS} 
@@ -114,6 +118,7 @@ endif
 ifeq (${nothrflavour},gcc32dbg)
        vomsflavour :=
 endif
+VOMS_LIBS:=-L${voms_prefix}/lib -lvomsc${vomsflavour}
 
 #EXT_LIBS:= \
 #      ${mysqlib} -lmysqlclient -lz\
@@ -130,7 +135,7 @@ EXT_LIBS:=  \
        ${mysqlib} -lmysqlclient -lz\
        ${GRIDSITE_LIBS} \
        ${classadslib} \
-       -lvomsc${vomsflavour}
+       ${VOMS_LIBS}
 
 SRVBONES_LIB:= -L${stagedir}/lib -lglite_lb_server_bones
 COMMON_LIBS:= -L${stagedir}/lib -lglite_lb_common_${nothrflavour} -lglite_security_gss_${nothrflavour}

diff --git a/org.glite.lb.server/project/configure.properties.xml b/org.glite.lb.server/project/configure.properties.xml
index 5a2df46..3a73336 100644 (file)
--- a/org.glite.lb.server/project/configure.properties.xml
+++ b/org.glite.lb.server/project/configure.properties.xml
@@ -20,6 +20,11 @@
 
        Revision history:
        $Log$
+       Revision 1.11  2006/03/17 11:47:02  zsalvet
+       Adapt RGMA export file format and file handling to lcg-mon-job-status
+       use. Socket notification code is still available and is nonblocking now.
+       C ClassAd API is used to retrieve VO from JDL.
+
        Revision 1.10  2006/03/15 18:13:51  akrenek
        cares
        
@@ -95,16 +100,16 @@ PREFIX=${install.dir}
 version=${module.version}
 glite_location=${with.glite.location}
 globus_prefix=${with.globus.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
 expat_prefix=${with.expat.prefix}
 cares_prefix=${with.c-ares.prefix}
 mysql_prefix=${with.mysql.prefix}
 mysql_version=${ext.mysql.version}
-cppunit=${with.cppunit.prefix}
+cppunit_prefix=${with.cppunit.prefix}
 gsoap_prefix=${with.gsoap.prefix}
 gsoap_version=${ext.gsoap.version}
 classads_prefix=${with.classads.prefix}
+thrflavour=${with.globus.thr.flavor}
+nothrflavour=${with.globus.nothr.flavor}
                        </echo>
            </target>
        </project>

diff --git a/org.glite.lb.utils/project/configure.properties.xml b/org.glite.lb.utils/project/configure.properties.xml
index 9329814..68882d7 100644 (file)
--- a/org.glite.lb.utils/project/configure.properties.xml
+++ b/org.glite.lb.utils/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
         Revision history:
         $Log$
+        Revision 1.2  2006/03/15 18:32:35  akrenek
+        cares
+
         Revision 1.1.1.1  2005/09/30 15:17:04  jpospi
         New org.glite.lb.utils component
 
@@ -42,14 +45,14 @@ PREFIX=${install.dir}
 version=${module.version}
 glite_location=${with.glite.location}
 globus_prefix=${with.globus.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
 expat_prefix=${with.expat.prefix}
 mysql_prefix=${with.mysql.prefix}
 mysql_version=${ext.mysql.version}
-cppunit=${with.cppunit.prefix}
 gsoap_prefix=${with.gsoap.prefix}
 gsoap_version=${ext.gsoap.version}
+cppunit_prefix=${with.cppunit.prefix}
+thrflavour=${with.globus.thr.flavor}
+nothrflavour=${with.globus.nothr.flavor}
                        </echo>
        </target>
 </project>