Navigation

Changeset 313:6fd1e6f56af5 in freeDiameter


Ignore:
Timestamp:
May 19, 2010, 11:08:05 AM (14 years ago)
Author:
Sebastien Decugis <sdecugis@nict.go.jp>
Branch:
default
Phase:
public
Message:

Completed initial debianization

Files:
18 edited

Legend:

Unmodified
Added
Removed

  • CMakeLists.txt

    r310 r313  
    2424SET(DEFAULT_CONF_PATH ${CMAKE_INSTALL_PREFIX}/etc/freeDiameter CACHE PATH "Default location of freeDiameter configuration files")
    2525
    26 SET(INSTALL_DOCUMENTATION_PATH  ${CMAKE_INSTALL_PREFIX}/doc/freeDiameter        CACHE PATH "Directory where the documentation is installed.")
    27 SET(INSTALL_HEADERS_PATH        ${CMAKE_INSTALL_PREFIX}/include/freeDiameter    CACHE PATH "Directory where the headers are installed.")
    28 SET(INSTALL_EXTENSIONS_PATH     ${CMAKE_INSTALL_PREFIX}/lib/freeDiameter        CACHE PATH "Directory where the extensions are installed / searched.")
    29 SET(INSTALL_DAEMON_PATH         ${CMAKE_INSTALL_PREFIX}/bin                     CACHE PATH "Directory where the daemon binary is installed.")
    30 SET(INSTALL_LIBRARY_PATH        ${CMAKE_INSTALL_PREFIX}/lib                     CACHE PATH "Directory where the libfreeDiameter library is installed.")
     26SET(INSTALL_HEADERS_SUFFIX              include/freeDiameter    CACHE PATH "Directory where the headers are installed (relative to CMAKE_INSTALL_PREFIX).")
     27SET(INSTALL_EXTENSIONS_SUFFIX           lib/freeDiameter        CACHE PATH "Directory where the extensions are installed / searched (relative to CMAKE_INSTALL_PREFIX).")
     28SET(INSTALL_DAEMON_SUFFIX               bin                     CACHE PATH "Directory where the daemon binary is installed (relative to CMAKE_INSTALL_PREFIX).")
     29SET(INSTALL_LIBRARY_SUFFIX              lib                     CACHE PATH "Directory where the libfreeDiameter library is installed (relative to CMAKE_INSTALL_PREFIX).")
    3130
    3231# All source code should be POSIX 200112L compatible, but some other extensions might be used, so:
    … …  
    5958# Extensions (there is no point in freeDiameter without any extension)
    6059SUBDIRS(extensions)
    61 
    62 
    63 ####
    64 ## INSTALL section ##
    65 
    66 INSTALL(FILES README LICENSE doc/freediameter.conf.sample
    67         DESTINATION ${INSTALL_DOCUMENTATION_PATH}
    68         COMPONENT freeDiameter-daemon)
    69 
    70 
    71 
    72 ####
    73 ## Packaging section ##
    74 
    75 # Default: build a debian package
    76 SET(CPACK_GENERATOR DEB)
    77 
    78 # Parameters for the package
    79 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
    80 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "freeDiameter: a Diameter implementation (protocol for Authentication, Authorization and Accounting, evolution of RADIUS)")
    81 SET(CPACK_PACKAGE_VENDOR "This is open software")
    82 SET(CPACK_PACKAGE_VERSION_MAJOR "${FD_PROJECT_VERSION_MAJOR}")
    83 SET(CPACK_PACKAGE_VERSION_MINOR "${FD_PROJECT_VERSION_MINOR}")
    84 SET(CPACK_PACKAGE_VERSION_PATCH "${FD_PROJECT_VERSION_REV}")
    85 
    86 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
    87 SET(CPACK_PACKAGE_CONTACT "Sebastien Decugis <sdecugis@nict.go.jp>")
    88 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
    89 
    90 SET(CPACK_COMPONENTS_ALL
    91         freeDiameter-common
    92         freeDiameter-daemon
    93         freeDiameter-dictionary-RFC4005
    94         freeDiameter-dictionary-RFC4072
    95         freeDiameter-radius-gateway
    96         freeDiameter-accounting-server
    97         freeDiameter-dev
    98         freeDiameter-debug-tools
    99         )
    100        
    101 # freeDiameter-common
    102 SET( CPACK_COMPONENT_FREEDIAMETER-COMMON_DISPLAY_NAME "freeDiameter library" )
    103 SET( CPACK_COMPONENT_FREEDIAMETER-COMMON_DESCRIPTION "The library needed by all freeDiameter components" )
    104 SET( CPACK_COMPONENT_FREEDIAMETER-COMMON_REQUIRED ON)
    105 
    106 # freeDiameter-daemon
    107 SET( CPACK_COMPONENT_FREEDIAMETER-DAEMON_DISPLAY_NAME "freeDiameter daemon binary" )
    108 SET( CPACK_COMPONENT_FREEDIAMETER-DAEMON_DESCRIPTION "The daemon providing Diameter Base Protocol support" )
    109 SET( CPACK_COMPONENT_FREEDIAMETER-DAEMON_DEPENDS freeDiameter-common)
    110 
    111 # freeDiameter-dictionary-RFC4005
    112 SET( CPACK_COMPONENT_FREEDIAMETER-DICTIONARY-RFC4005_DISPLAY_NAME "freeDiameter RFC4005 (NASREQ) dictionary" )
    113 SET( CPACK_COMPONENT_FREEDIAMETER-DAEMON_DESCRIPTION "An extension to the daemon's dictionary, providing commands and AVPs for NASREQ application" )
    114 SET( CPACK_COMPONENT_FREEDIAMETER-DAEMON_DEPENDS freeDiameter-daemon)
    115 
    116 # freeDiameter-dictionary-RFC4072
    117 SET( CPACK_COMPONENT_FREEDIAMETER-DICTIONARY-RFC4072_DISPLAY_NAME "freeDiameter RFC4072 (EAP) dictionary" )
    118 SET( CPACK_COMPONENT_FREEDIAMETER-DAEMON_DESCRIPTION "An extension to the daemon's dictionary, providing commands and AVPs for Diameter EAP application" )
    119 SET( CPACK_COMPONENT_FREEDIAMETER-DAEMON_DEPENDS freeDiameter-dictionary-RFC4005)
    120 
    121 # freeDiameter-radius-gateway
    122 SET( CPACK_COMPONENT_FREEDIAMETER-RADIUS-GATEWAY_DISPLAY_NAME "RADIUS/Diameter gateway extension for freeDiameter" )
    123 SET( CPACK_COMPONENT_FREEDIAMETER-RADIUS-GATEWAY_DESCRIPTION "This extension provides translation of RADIUS client messages to Diameter servers" )
    124 SET( CPACK_COMPONENT_FREEDIAMETER-RADIUS-GATEWAY_DEPENDS freeDiameter-dictionary-RFC4072)
    125 
    126 # freeDiameter-accounting-server
    127 SET( CPACK_COMPONENT_FREEDIAMETER-ACCOUNTING-SERVER_DISPLAY_NAME "Accounting server extension for freeDiameter" )
    128 SET( CPACK_COMPONENT_FREEDIAMETER-ACCOUNTING-SERVER_DESCRIPTION "This extension provides a simple configurable Diameter Base Accounting implementation" )
    129 SET( CPACK_COMPONENT_FREEDIAMETER-ACCOUNTING-SERVER_DEPENDS freeDiameter-daemon)
    130 
    131 # freeDiameter-dev
    132 SET( CPACK_COMPONENT_FREEDIAMETER-DEV_DISPLAY_NAME "freeDiameter headers" )
    133 SET( CPACK_COMPONENT_FREEDIAMETER-DEV_DESCRIPTION "Install the headers if you plan to develop new freeDiameter extensions" )
    134 SET( CPACK_COMPONENT_FREEDIAMETER-DEV_DEPENDS freeDiameter-common)
    135 
    136 # freeDiameter-debug-tools
    137 SET( CPACK_COMPONENT_FREEDIAMETER-DEBUG-TOOLS_DISPLAY_NAME "freeDiameter debug tools" )
    138 SET( CPACK_COMPONENT_FREEDIAMETER-DEBUG-TOOLS_DESCRIPTION "A set of tools meant for debugging freeDiameter" )
    139 SET( CPACK_COMPONENT_FREEDIAMETER-DEBUG-TOOLS_DEPENDS freeDiameter-daemon)
    140 
    141 # This is not working well at this time (may 2010), so leave it commented out for the moment.
    142 # INCLUDE(CPack)
    143 
    144 

  • INSTALL.Ubuntu

    r311 r313  
    6262      -DDEFAULT_CONF_PATH:PATH=/etc/freeDiameter \
    6363      -DCMAKE_INSTALL_PREFIX:PATH=/usr \
    64       -DINSTALL_DOCUMENTATION_PATH:PATH=/usr/share/doc/freeDiameter \
     64      -DINSTALL_DOCUMENTATION_SUFFIX:PATH=share/doc/freeDiameter \
    6565      -DBUILD_APP_ACCT:BOOL=ON \
    6666      -DBUILD_APP_RADGW:BOOL=ON \

  • debian/control

    r312 r313  
    33Priority: optional
    44Maintainer: Sebastien Decugis <sdecugis@nict.go.jp>
    5 Build-Depends: debhelper (>=7.0.50~),
     5Build-Depends: debhelper ( >= 7),
    66 cmake, make, gcc, bison, flex,
    77 libsctp-dev, libgnutls-dev, libgcrypt-dev, libpq-dev
    8 Standards-Version: 3.8.4
     8Standards-Version: 3.8.3
    99Homepage: http://aaa.koganei.wide.ad.jp
    1010
    … …  
    1919 See 'freeDiameter-dev' package to retrieve the API for the library.
    2020
    21 Package: freediameter-daemon
    22 Architecture: any
    23 Depends: ${shlibs:Depends}, ${misc:Depends}, freediameter-common (= ${binary:Version})
    24 Suggests: ssl-cert, freediameter-dictionary-RFC4005, freediameter-dictionary-RFC4072
    25 Description: The freeDiameter daemon.
    26  The freeDiameter daemon provides support for the Diameter
    27  Base Protocol. Without any extension, the daemon can only
    28  be used as a Diameter routing agent. You probably want to
    29  install some freeDiameter extension to extend its features.
    30  .
    31  The daemon is shipped with a small set of extensions, for
    32  example to configure the routing behavior. See the
    33  documentation for more details.
    34 
    3521Package: freediameter-dev
    3622Architecture: any
    … …  
    3824Description: This package provides the development files for freeDiameter.
    3925
     26Package: freediameter-daemon
     27Architecture: any
     28Depends: ${shlibs:Depends}, ${misc:Depends}, freediameter-common (= ${binary:Version})
     29Suggests: ssl-cert, freediameter-dictionary-rfc4005, freediameter-dictionary-rfc4072
     30Description: The freeDiameter daemon.
     31 The freeDiameter daemon provides support for the Diameter
     32 Base Protocol. Without any extension, the daemon can only
     33 be used as a Diameter routing agent. You probably want to
     34 install some freeDiameter extension(s) to extend its
     35 features.
     36 .
     37 The daemon is shipped with a small set of extensions, for
     38 example to configure the routing behavior. See the
     39 examples for more details.
     40
    4041Package: freediameter-debug-tools
    4142Architecture: any
    42 Depends: freediameter-daemon (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
     43Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version})
    4344Description: freeDiameter debug tools.
    4445 This package provides useful tools to help tracking
    4546 problems in freeDiameter installation.
    4647
    47 Package: freediameter-dictionary-RFC4005
     48Package: freediameter-dictionary-rfc4005
    4849Architecture: any
    49 Depends: ${shlibs:Depends}, ${misc:Depends}, freediameter-daemon (= ${binary:Version})
     50Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version})
    5051Description: RFC4005 (NASREQ) dictionary support.
    5152 This freeDiameter extension provides the dictionary support
    … …  
    5859 This extension does not require a configuration file.
    5960
    60 Package: freediameter-dictionary-RFC4072
     61Package: freediameter-dictionary-rfc4072
    6162Architecture: any
    62 Depends: ${shlibs:Depends}, ${misc:Depends}, freediameter-dictionary-RFC4005 (= ${binary:Version})
     63Depends: ${misc:Depends}, freediameter-dictionary-rfc4005 (= ${binary:Version})
    6364Description: RFC4072 (Diameter EAP) dictionary support.
    6465 This freeDiameter extension provides the dictionary support
    … …  
    7172 This extension does not require a configuration file.
    7273
     74Package: freediameter-radius-gateway
     75Architecture: any
     76Depends: ${misc:Depends}, freediameter-dictionary-rfc4072 (= ${binary:Version})
     77Description: RADIUS/Diameter extensible gateway.
     78 This freeDiameter extension implements a RADIUS to Diameter
     79 gateway. It allows a RADIUS client to connect to a Diameter
     80 server.
     81 .
     82 The support for specific Diameter applications and/or RADIUS
     83 extensions is provided in the gateway by the use of plugins.
     84 Currently, the following plugins are available:
     85  - echodrop.rgwx : drop or echo a RADIUS attribute.
     86                    The attribute is not converted to Diameter.
     87                    See echodrop.rgwx.conf.sample for details.
     88  - auth.rgwx : Convert Access-Request to Diameter AAR or DER.
     89                Requests For Comments: RADIUS: 2865, 3162, 2868,
     90                2869, 3579; Diameter: 4005, 4072.
     91  - acct.rgwx : Converts Accounting-Request (2866) to Diameter
     92                ACR (3588).
     93 .
     94 In order to use this extension, your main freeDiameter
     95 configuration file must contain a LoadExtension directive.
     96 See freeDiameter documentation for more details.
     97 .
     98 This extension requires a configuration file.
     99 See app_radgw.conf.sample for more details.
     100
    73101Package: freediameter-accounting-server
    74102Architecture: any
    75 Depends: freediameter-daemon (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
     103Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libpq5
    76104Description: freeDiameter simple Accounting server.
    77105 This freeDiameter extension implements the Diameter Base

  • extensions/_sample/CMakeLists.txt

    r305 r313  
    1818## INSTALL section ##
    1919
    20 INSTALL(TARGETS dbg_sample
    21         LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    22         COMPONENT freeDiameter-debug-tools)
     20# Uncomment the following lines to have the extension installed
     21# INSTALL(TARGETS dbg_sample
     22#       LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
     23#       COMPONENT freeDiameter-debug-tools)

  • extensions/acl_wl/CMakeLists.txt

    r305 r313  
    3535# We install with the daemon component because it is a base feature.
    3636INSTALL(TARGETS acl_wl
    37         LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
     37        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
    3838        COMPONENT freeDiameter-daemon)
    39 
    40 INSTALL(FILES ../../doc/acl_wl.conf.sample
    41         DESTINATION ${INSTALL_DOCUMENTATION_PATH}
    42         COMPONENT freeDiameter-daemon)

  • extensions/app_acct/CMakeLists.txt

    r305 r313  
    3535
    3636INSTALL(TARGETS app_acct
    37         LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
     37        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
    3838        COMPONENT freeDiameter-accounting-server)
    39 
    40 INSTALL(FILES ../../doc/app_acct.conf.sample
    41         DESTINATION ${INSTALL_DOCUMENTATION_PATH}
    42         COMPONENT freeDiameter-accounting-server)

  • extensions/app_radgw/CMakeLists.txt

    r305 r313  
    6969  TARGET_LINK_LIBRARIES(${PLGNAME} rgw_common)
    7070  INSTALL(TARGETS ${PLGNAME}
    71         LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
     71        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
    7272        COMPONENT freeDiameter-radius-gateway)
    7373ENDMACRO(RGWX_ADD_PLUGIN)
    … …  
    115115
    116116INSTALL(TARGETS app_radgw
    117         LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
     117        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
    118118        COMPONENT freeDiameter-radius-gateway)
    119119
    120 INSTALL(FILES ../../doc/app_radgw.conf.sample
    121         DESTINATION ${INSTALL_DOCUMENTATION_PATH}
    122         COMPONENT freeDiameter-radius-gateway)
    123 
    124 
    125120# Note that all compiled plugins are added by the RGWX_ADD_PLUGIN macro in the component freeDiameter-radius-gateway as well.

  • extensions/dbg_monitor/CMakeLists.txt

    r305 r313  
    88
    99INSTALL(TARGETS dbg_monitor
    10         LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
     10        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
    1111        COMPONENT freeDiameter-debug-tools)
    1212

  • extensions/dbg_rt/CMakeLists.txt

    r305 r313  
    1010
    1111INSTALL(TARGETS dbg_rt
    12         LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
     12        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
    1313        COMPONENT freeDiameter-debug-tools)

  • extensions/dict_eap/CMakeLists.txt

    r305 r313  
    1010
    1111INSTALL(TARGETS dict_eap
    12         LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
     12        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
    1313        COMPONENT freeDiameter-dictionary-RFC4072)

  • extensions/dict_nasreq/CMakeLists.txt

    r305 r313  
    1010
    1111INSTALL(TARGETS dict_nasreq
    12         LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
     12        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
    1313        COMPONENT freeDiameter-dictionary-RFC4005)

  • extensions/rt_default/CMakeLists.txt

    r305 r313  
    4949# We install with the daemon component because it is a base feature.
    5050INSTALL(TARGETS rt_default
    51         LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
     51        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
    5252        COMPONENT freeDiameter-daemon)
    53 
    54 INSTALL(FILES ../../doc/rt_default.conf.sample
    55         DESTINATION ${INSTALL_DOCUMENTATION_PATH}
    56         COMPONENT freeDiameter-daemon)
    57 

  • extensions/test_acct/CMakeLists.txt

    r305 r313  
    99
    1010INSTALL(TARGETS test_acct
    11         LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
     11        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
    1212        COMPONENT freeDiameter-debug-tools)
    1313

  • extensions/test_app/CMakeLists.txt

    r305 r313  
    2727
    2828INSTALL(TARGETS test_app
    29         LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
     29        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
    3030        COMPONENT freeDiameter-debug-tools)
    31 
    32 INSTALL(FILES ../../doc/test_app.conf.sample
    33         DESTINATION ${INSTALL_DOCUMENTATION_PATH}
    34         COMPONENT freeDiameter-debug-tools)

  • extensions/test_rt_any/CMakeLists.txt

    r305 r313  
    1010
    1111INSTALL(TARGETS test_rt_any
    12         LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
     12        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
    1313        COMPONENT freeDiameter-debug-tools)

  • freeDiameter/CMakeLists.txt

    r305 r313  
    8383
    8484INSTALL(TARGETS freeDiameterd
    85         RUNTIME DESTINATION ${INSTALL_DAEMON_PATH}
     85        RUNTIME DESTINATION ${INSTALL_DAEMON_SUFFIX}
    8686        COMPONENT freeDiameter-daemon)

  • include/freeDiameter/CMakeLists.txt

    r305 r313  
    9191
    9292##########################
    93 # rename this var for the file
    94 SET(DEFAULT_EXTENSIONS_PATH ${INSTALL_EXTENSIONS_PATH})
     93# Create the absolute path for searching extensions
     94SET(DEFAULT_EXTENSIONS_PATH ${CMAKE_INSTALL_PREFIX}/${INSTALL_EXTENSIONS_SUFFIX})
    9595
    9696##########################
    … …  
    107107# The headers from this directory are required to develop new extensions for freeDiameter.
    108108INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/freeDiameter-host.h libfreeDiameter.h freeDiameter.h extension.h
    109         DESTINATION ${INSTALL_HEADERS_PATH}
     109        DESTINATION ${INSTALL_HEADERS_SUFFIX}
    110110        COMPONENT freeDiameter-dev)
    111111

  • libfreeDiameter/CMakeLists.txt

    r305 r313  
    3434
    3535INSTALL(TARGETS libfreeDiameter
    36         LIBRARY DESTINATION ${INSTALL_LIBRARY_PATH}
     36        LIBRARY DESTINATION ${INSTALL_LIBRARY_SUFFIX}
    3737        COMPONENT freeDiameter-common)
    3838
Note: See TracChangeset for help on using the changeset viewer.