Mercurial > hg > freeDiameter

changeset 561:1cb9352359f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More cleanups in the packaging. Also removed rgw_common.so which was quite useless
author Sebastien Decugis <sdecugis@nict.go.jp>
date Thu, 16 Sep 2010 13:53:19 +0900
parents d300c5213e45
children e837ef4bdf35
files CMakeLists.txt contrib/debian/control contrib/debian/freediameter-radius-gateway.install extensions/app_radgw/CMakeLists.txt freeDiameter/CMakeLists.txt include/freeDiameter/CMakeLists.txt
diffstat 6 files changed, 23 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Sep 15 18:58:39 2010 +0900
+++ b/CMakeLists.txt	Thu Sep 16 13:53:19 2010 +0900
@@ -63,6 +63,9 @@
 # Check that flex is at least 2.5.20 to support bison-bridge
 # how to do the check with cmake???
 
+# Add this to workaround an apparent bug in FreeBSD cmake (already defined in Linux)
+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
+
 # Location for the include files
 INCLUDE_DIRECTORIES(include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include)
@@ -72,5 +75,5 @@
 SUBDIRS(libfreeDiameter)
 SUBDIRS(freeDiameter)
 
-# Extensions (there is no point in freeDiameter without any extension)
+# Extensions (there is no use of freeDiameter without any extension)
 SUBDIRS(extensions)
--- a/contrib/debian/control	Wed Sep 15 18:58:39 2010 +0900
+++ b/contrib/debian/control	Thu Sep 16 13:53:19 2010 +0900
@@ -88,7 +88,7 @@
 
 Package: freediameter-radius-gateway
 Architecture: any
-Depends: ${misc:Depends}, freediameter-dictionary-rfc4072 (= ${binary:Version}), freediameter-dictionary-rfc4740 (= ${binary:Version})
+Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), freediameter-dictionary-rfc4072 (= ${binary:Version}), freediameter-dictionary-rfc4740 (= ${binary:Version})
 Description: RADIUS/Diameter extensible gateway.
  This freeDiameter extension implements a RADIUS to Diameter
  gateway. It allows a RADIUS client to connect to a Diameter
@@ -118,6 +118,7 @@
 Package: freediameter-accounting-server
 Architecture: any
 Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libpq5
+Suggests: freediameter-dictionary-rfc4072
 Description: freeDiameter simple Accounting server.
  This freeDiameter extension implements the Diameter Base 
  Accounting application. It saves the accounting records
@@ -130,10 +131,13 @@
  .
  This extension requires a configuration file.
  See app_acct.conf.sample for more details.
+ .
+ You may find some useful resources to parse the saved records
+ in the contrib/app_acct_tools folder in source package.
 
 Package: freediameter-eap-server
 Architecture: any
-Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), mysql-client, freediameter-dictionary-rfc4072 (= ${binary:Version})
+Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libmysqlclient16, freediameter-dictionary-rfc4072 (= ${binary:Version})
 Description: freeDiameter Diameter EAP server implementation.
  This freeDiameter extension implements a Diameter EAP server. 
  It supports EAP-MD5 and EAP-TLS methods currently.
@@ -148,7 +152,7 @@
 
 Package: freediameter-sip-server
 Architecture: any
-Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), mysql-client, freediameter-dictionary-rfc4740 (= ${binary:Version})
+Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libmysqlclient16, freediameter-dictionary-rfc4740 (= ${binary:Version})
 Description: freeDiameter Diameter SIP server implementation.
  This freeDiameter extension implements a Diameter SIP server.
  See http://www.freediameter.net/trac/wiki/app_sip.fdx for
--- a/contrib/debian/freediameter-radius-gateway.install	Wed Sep 15 18:58:39 2010 +0900
+++ b/contrib/debian/freediameter-radius-gateway.install	Thu Sep 16 13:53:19 2010 +0900
@@ -1,3 +1,2 @@
 usr/lib/freeDiameter/app_radgw.fdx
 usr/lib/freeDiameter/*.rgwx
-usr/lib/rgw_common.*
--- a/extensions/app_radgw/CMakeLists.txt	Wed Sep 15 18:58:39 2010 +0900
+++ b/extensions/app_radgw/CMakeLists.txt	Thu Sep 16 13:53:19 2010 +0900
@@ -12,27 +12,6 @@
 ENDIF (NOT CMAKE_BUILD_TYPE MATCHES "Debug")
 
 
-########### Utility library #############
-# utility libray for the extension and its plugins
-# See rgw_common.h for detail
-
-SET( RG_COMMON_SRC
-	radius.c
-	md5.c
-	rgw_msg_codes.c
-	rgw_msg_attrtype.c
-)
-SET( RG_COMMON_HEADER
-	rgw_common.h
-	radius.h
-	md5.h
-	hostap_compat.h
-)
-ADD_LIBRARY(rgw_common SHARED ${RG_COMMON_SRC})
-SET_TARGET_PROPERTIES(rgw_common PROPERTIES PREFIX "" )
-
-
-
 ########### Main app_radgw extension #############
 
 # Parser files
@@ -42,6 +21,10 @@
 
 # List of source files
 SET( RGW_DEFAULT_SRC
+	radius.c
+	md5.c
+	rgw_msg_codes.c
+	rgw_msg_attrtype.c
 	rgw_main.c
 	lex.rgw_conf.c
 	rgw_conf.tab.c
@@ -52,10 +35,15 @@
 	rgw_worker.c
 )
 
+SET( RG_COMMON_HEADER
+	rgw_common.h
+	radius.h
+	md5.h
+	hostap_compat.h
+)
+
 # Compile these files as a freeDiameter extension.
 FD_ADD_EXTENSION(app_radgw ${RGW_DEFAULT_SRC} ${RG_COMMON_HEADER})
-TARGET_LINK_LIBRARIES(app_radgw rgw_common)
-
 
 
 ########### RADIUS/Diameter translation agent plugins (support for RADIUS protocol) ############
@@ -66,7 +54,6 @@
   ADD_LIBRARY(${PLGNAME} MODULE ${ARGN})
   SET_TARGET_PROPERTIES(${PLGNAME} PROPERTIES PREFIX "" )
   SET_TARGET_PROPERTIES(${PLGNAME} PROPERTIES SUFFIX ".rgwx" )
-  TARGET_LINK_LIBRARIES(${PLGNAME} rgw_common)
   INSTALL(TARGETS ${PLGNAME}
 	LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
 	COMPONENT freeDiameter-radius-gateway)
@@ -125,8 +112,4 @@
 	LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
 	COMPONENT freeDiameter-radius-gateway)
 	
-INSTALL(TARGETS rgw_common
-	LIBRARY DESTINATION ${INSTALL_LIBRARY_SUFFIX}
-	COMPONENT freeDiameter-radius-gateway)
-
 # Note that all compiled plugins are added by the RGWX_ADD_PLUGIN macro in the component freeDiameter-radius-gateway as well.
--- a/freeDiameter/CMakeLists.txt	Wed Sep 15 18:58:39 2010 +0900
+++ b/freeDiameter/CMakeLists.txt	Thu Sep 16 13:53:19 2010 +0900
@@ -67,9 +67,6 @@
 SET_TARGET_PROPERTIES(freeDiameterd PROPERTIES 
 	VERSION ${FD_PROJECT_VERSION_MAJOR}.${FD_PROJECT_VERSION_MINOR}.${FD_PROJECT_VERSION_REV})
 
-# Add this to workaround an apparent bug in FreeBSD cmake (already defined in Linux)
-SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
-
 # The link command
 LINK_DIRECTORIES(${CURRENT_BINARY_DIR}/../libfreeDiameter)
 TARGET_LINK_LIBRARIES(freeDiameterd libfreeDiameter ${FD_LIBS})
--- a/include/freeDiameter/CMakeLists.txt	Wed Sep 15 18:58:39 2010 +0900
+++ b/include/freeDiameter/CMakeLists.txt	Thu Sep 16 13:53:19 2010 +0900
@@ -112,6 +112,7 @@
 # Save some variables for the other directories
 SET(FD_LIBS  ${FD_LIBS}  PARENT_SCOPE)
 SET(LFD_LIBS ${LFD_LIBS} PARENT_SCOPE)
+SET(CMAKE_THREAD_LIBS_INIT ${CMAKE_THREAD_LIBS_INIT} PARENT_SCOPE)
 
 ####
 ## INSTALL section ##
"Welcome to our mercurial repository"