Enable shared libraries for BOINC and local master

Condor does not have a shared library, and shared libraries on the
client side would be problematic ATM. Also add a debug package.

git-svn-id: svn+ssh://cvs.lpds.sztaki.hu/var/lib/svn/szdg/dcapi/trunk@2236 a7169a2c-3604-0410-bc95-c702d8d87f7a
This commit is contained in:
gombasg 2009-09-07 15:37:59 +00:00 committed by Adam Visegradi
parent 8e0c75ade0
commit de84a39d4a
15 changed files with 108 additions and 13 deletions

View File

@ -26,9 +26,9 @@ libdc_boinc_la_SOURCES = \
wu.C
libdc_boinc_la_LIBADD = \
../common/libdc-common-master.la \
$(BOINC_SERVER_LIBS) \
-lm
-lsched -lboinc -lcrypto -luuid -lm
libdc_boinc_la_CPPFLAGS = $(AM_CPPFLAGS) $(BOINC_SERVER_CPPFLAGS)
libdc_boinc_la_LDFLAGS = -version-info 1:0:0 -export-symbols $(top_srcdir)/common/master.sym
libdc_client_boinc_la_SOURCES = \
client.C
@ -36,3 +36,4 @@ libdc_client_boinc_la_LIBADD = \
../common/libdc-common-client.la \
$(BOINC_CLIENT_LIBS)
libdc_client_boinc_la_CPPFLAGS = $(AM_CPPFLAGS) $(BOINC_CPPFLAGS)
libdc_client_boinc_la_LDFLAGS = -static

View File

@ -6,5 +6,6 @@ includedir=@includedir@
Name: DC-API BOINC Client
Description: BOINC client implementation for DC-API
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -ldc-client-boinc @BOINC_CLIENT_LIBS@
Libs: -L${libdir} -ldc-client-boinc
Libs.private: @BOINC_CLIENT_LIBS@
Cflags: -I${includedir}

View File

@ -7,5 +7,6 @@ Name: DC-API BOINC Master
Description: BOINC master implementation for DC-API
Version: @PACKAGE_VERSION@
Requires: glib-2.0 uuid
Libs: -L${libdir} -ldc-boinc @BOINC_SERVER_LIBS@ -lm
Libs: -L${libdir} -ldc-boinc
Libs.private: @BOINC_SERVER_LIBS@ -lm
Cflags: -I${includedir}

View File

@ -2,6 +2,9 @@ noinst_LTLIBRARIES =
AM_CPPFLAGS = -I$(top_srcdir)/include
# Symbol file for the master side
EXTRA_DIST = master.sym
if BUILD_MASTER
noinst_LTLIBRARIES += libdc-common-master.la

42
dcapi/common/master.sym Normal file
View File

@ -0,0 +1,42 @@
DC_getMaxMessageSize
DC_getMaxSubresults
DC_getGridCapabilities
DC_log
DC_vlog
DC_getCfgStr
DC_getCfgInt
DC_getCfgBool
DC_initMaster
DC_setMasterCb
DC_setResultCb
DC_setSubresultCb
DC_setMessageCb
DC_getWUNumber
DC_getClientCfgStr
DC_getClientCfgInt
DC_getClientCfgDouble
DC_getClientCfgBool
DC_processMasterEvents
DC_waitMasterEvent
DC_waitWUEvent
DC_destroyMasterEvent
DC_createWU
DC_addWUInput
DC_addWUOutput
DC_setWUPriority
DC_serializeWU
DC_deserializeWU
DC_getWUState
DC_submitWU
DC_getWUId
DC_getWUTag
DC_cancelWU
DC_suspendWU
DC_resumeWU
DC_destroyWU
DC_sendWUMessage
DC_getResultCapabilities
DC_getResultWU
DC_getResultExit
DC_getResultOutput
DC_getResultCPUTime

View File

@ -36,12 +36,14 @@ libdc_condor_la_SOURCES = condor_master.c \
libdc_condor_la_LIBADD = ../common/libdc-common-master.la \
$(GLIB_LIBS) \
-lcondorapi
libdc_condor_la_LDFLAGS = -static
libdc_client_condor_la_SOURCES = condor_slave.c \
condor_common.c \
condor_utils.c
libdc_client_condor_la_LIBADD = ../common/libdc-common-client.la
libdc_client_condor_la_LDFLAGS = -static
#appdir = $(libdir)/dcapi/condor
#app_PROGRAMS = tss tm

View File

@ -1,3 +1,10 @@
dcapi (0.9-21) unstable; urgency=low
* Add shared library packages for the BOINC and local server-side API.
* Add a debug package.
-- Gábor Gombás <gombasg@sztaki.hu> Mon, 07 Sep 2009 17:16:04 +0200
dcapi (0.9-20) unstable; urgency=low
* Include the Condor license in the libdcapi-condor-dev package.

View File

@ -17,6 +17,22 @@ Description: Distributed Computing Platform API - Development files
.
This package contains the header files.
Package: libdcapi-dbg
Section: debug
Priority: extra
Architecture: all
Description: Distributed Computing Platform API - Debugging symbols
This package contains debugging symbols needed for properly debugging the
library with gdb.
Package: libdcapi-boinc1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
Description: Distributed Computing Platform API - BOINC backend
This package contains the BOINC backend of the Distributed Computing
Platform API.
Package: libdcapi-boinc-dev
Section: libdevel
Priority: extra
@ -41,6 +57,14 @@ Description: Distributed Computing Platform API - Development files
.
This package contains the Condor backend.
Package: libdcapi-local1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
Description: Distributed Computing Platform API - Local backend
This package contains the local backend of the Distributed Computing
Platform API.
Package: libdcapi-local-dev
Section: libdevel
Priority: extra

View File

@ -1,2 +1,5 @@
debian/tmp/usr/lib/libdc*-boinc.a
debian/tmp/usr/lib/pkgconfig/dcapi-boinc*.pc
debian/tmp/usr/lib/libdc-boinc.a
debian/tmp/usr/lib/libdc-boinc.so
debian/tmp/usr/lib/libdc-client-boinc.a
debian/tmp/usr/lib/pkgconfig/dcapi-boinc-client.pc
debian/tmp/usr/lib/pkgconfig/dcapi-boinc-master.pc

View File

@ -0,0 +1,2 @@
debian/tmp/usr/lib/libdc-boinc.so.1.0.0
debian/tmp/usr/lib/libdc-boinc.so.1

View File

@ -1,2 +1,4 @@
debian/tmp/usr/lib/libdc-*condor.a
debian/tmp/usr/lib/pkgconfig/dcapi-condor*.pc
debian/tmp/usr/lib/libdc-client-condor.a
debian/tmp/usr/lib/libdc-condor.a
debian/tmp/usr/lib/pkgconfig/dcapi-condor-client.pc
debian/tmp/usr/lib/pkgconfig/dcapi-condor-master.pc

View File

@ -1,2 +1,5 @@
debian/tmp/usr/lib/libdc*-local.a
debian/tmp/usr/lib/pkgconfig/dcapi-local*.pc
debian/tmp/usr/lib/libdc-client-local.a
debian/tmp/usr/lib/libdc-local.a
debian/tmp/usr/lib/libdc-local.so
debian/tmp/usr/lib/pkgconfig/dcapi-local-client.pc
debian/tmp/usr/lib/pkgconfig/dcapi-local-master.pc

View File

@ -0,0 +1,2 @@
debian/tmp/usr/lib/libdc-local.so.1.0.0
debian/tmp/usr/lib/libdc-local.so.1

View File

@ -35,8 +35,7 @@ binary: configure
--enable-backend-local \
--with-condor-headers=/usr/include/condor \
--with-html-dir=/usr/share/doc/libdcapi-doc \
--disable-shared \
--disable-java \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
dh $@ --after dh_auto_configure -X.svn
dh $@ --after dh_auto_configure -X.svn --dbg-package=libdcapi-dbg

View File

@ -27,13 +27,16 @@ libdc_local_la_SOURCES = \
local_utils.c \
local_common.c \
local_wu.c
libdc_local_la_LIBADD = ../common/libdc-common-master.la $(GLIB_LIBS)
libdc_local_la_LIBADD = ../common/libdc-common-master.la $(GLIB_LIBS) -luuid
libdc_local_la_LDFLAGS = -version-info 1:0:0 -export-symbols $(top_srcdir)/common/master.sym
libdc_client_local_la_SOURCES = \
local_client.c \
local_utils.c \
local_common.c
libdc_client_local_la_LIBADD = ../common/libdc-common-client.la
libdc_client_local_la_LDFLAGS = -static
#appdir = $(libdir)/dcapi/local
#app_PROGRAMS = lss lm