*.la
*.swp
.libs
-conf.mk
.deps
config.log
config.h
transport/transport_rta/test/test_multi_connections
transport/transport_rta/test/rtatest
transport/transport_rta/test/test_bent_pipe
-transport/transport_rta/test/test_multi_connections
transport/transport_rta/test/x
transport/transport_rta/test/y
transport/transport_rta/tlv/test/x
option(DEB_PACKAGE "Create deb package" OFF)
option(RPM_PACKAGE "Create deb package" OFF)
-SET(VENDOR "Cisco Systems" CACHE STRING "Vendor")
-SET(DISTRIBUTION "xenial" CACHE STRING "Distribution")
-SET(ARCHITECTURE "amd64" CACHE STRING "Architecture")
-SET(PACKAGE_MAINTAINER "Mauro Sardara (
[email protected])" CACHE STRING "Maintainer")
-SET(BUILD_NUMBER "1" CACHE STRING "Build Number")
-STRING(TOLOWER ${CMAKE_PROJECT_NAME} PACKAGE_NAME)
-
-SET(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
-SET(CPACK_PACKAGE_VENDOR ${VENDOR})
-SET(CPACK_PACKAGE_CONTACT ${CONTACT})
+set(VENDOR "Cisco Systems" CACHE STRING "Vendor")
+set(DISTRIBUTION "xenial" CACHE STRING "Distribution")
+set(ARCHITECTURE "amd64" CACHE STRING "Architecture")
+set(PACKAGE_MAINTAINER "Mauro Sardara (
[email protected])" CACHE STRING "Maintainer")
+string(TOLOWER ${CMAKE_PROJECT_NAME} PACKAGE_NAME)
+set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+set(CPACK_PACKAGE_VENDOR ${VENDOR})
+set(CPACK_PACKAGE_CONTACT ${CONTACT})
+set(CPACK_COMPONENTS_ALL library headers documentation)
# Get the version
execute_process(COMMAND bash ${CMAKE_SOURCE_DIR}/scripts/version
- OUTPUT_VARIABLE PACKAGE_VERSION)
-string(STRIP ${PACKAGE_VERSION} PACKAGE_VERSION)
+ OUTPUT_VARIABLE PACKAGE_VERSION)
+
+if (PACKAGE_VERSION)
+ string(STRIP ${PACKAGE_VERSION} PACKAGE_VERSION)
+else()
+ set(PACKAGE_VERSION 1.0)
+endif()
if(DEB_PACKAGE)
- SET(TYPE "DEBIAN")
- SET(GENERATOR "DEB")
- SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}_${PACKAGE_VERSION}_${ARCHITECTURE}")
- SET(CPACK_${TYPE}_PACKAGE_DEPENDS "longbow (>= 1.0), libevent-2.0-5, libssl1.0.0, libparc (>= 1.0), libccnx-common (>= 1.0)")
+ set(TYPE "DEBIAN")
+ set(GENERATOR "DEB")
+
+ set(CPACK_${TYPE}_LIBRARY_PACKAGE_NAME "${PACKAGE_NAME}")
+ set(CPACK_${TYPE}_HEADERS_PACKAGE_NAME "${PACKAGE_NAME}-dev")
+ set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_NAME "${PACKAGE_NAME}-doc")
+
+ set(CPACK_${TYPE}_LIBRARY_FILE_NAME "${PACKAGE_NAME}_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
+ set(CPACK_${TYPE}_HEADERS_FILE_NAME "${PACKAGE_NAME}-dev_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
+ set(CPACK_${TYPE}_DOCUMENTATION_FILE_NAME "${PACKAGE_NAME}-doc_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
+
+ set(CPACK_DEBIAN_LIBRARY_PACKAGE_SHLIBDEPS ON)
+
+ set(CPACK_${TYPE}_LIBRARY_PACKAGE_DEPENDS "longbow (>= 1.0), libevent-2.0-5, libssl1.0.0, libparc (>= 1.0), libccnx-common (>= 1.0)")
+ set(CPACK_${TYPE}_HEADERS_PACKAGE_DEPENDS "libccnx-transport-rta (>= 1.0), libccnx-common-dev (>= 1.0), libparc-dev (>= 1.0), longbow-dev (>= 1.0)")
+ set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_DEPENDS "")
elseif(RPM_PACKAGE)
- SET(TYPE "RPM")
- SET(GENERATOR "RPM")
- SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}.${ARCHITECTURE}")
- SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/etc" "/usr/lib/python2.7" "/usr/lib/python2.7/site-packages")
- SET(CPACK_${TYPE}_PACKAGE_REQUIRES "longbow >= 1.0, libevent >= 2.0, openssl >= 1.0, libparc >= 1.0, libccnx-common >= 1.0")
+ set(TYPE "RPM")
+ set(GENERATOR "RPM")
+
+ set(CPACK_${TYPE}_LIBRARY_PACKAGE_NAME "${PACKAGE_NAME}")
+ set(CPACK_${TYPE}_HEADERS_PACKAGE_NAME "${PACKAGE_NAME}-devel")
+ set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_NAME "${PACKAGE_NAME}-doc")
+
+ set(CPACK_${TYPE}_LIBRARY_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
+ set(CPACK_${TYPE}_HEADERS_FILE_NAME "${PACKAGE_NAME}-devel-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
+ set(CPACK_${TYPE}_DOCUMENTATION_FILE_NAME "${PACKAGE_NAME}-doc-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
+
+ set(CPACK_${TYPE}_LIBRARY_PACKAGE_AUTOREQ ON)
+
+ set(CPACK_${TYPE}_LIBRARY_PACKAGE_REQUIRES "longbow >= 1.0, libevent >= 2.0, openssl >= 1.0, libparc >= 1.0, libccnx-common >= 1.0")
+ set(CPACK_${TYPE}_HEADERS_PACKAGE_REQUIRES "libccnx-transport-rta >= 1.0, libccnx-common-devel >= 1.0, libparc-devel >= 1.0, longbow-devel >= 1.0")
+ set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_REQUIRES "")
+
+ set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/etc" "/usr/lib/python2.7" "/usr/lib/python2.7/site-packages")
else()
- RETURN()
+ return()
endif()
-SET(CPACK_GENERATOR ${GENERATOR})
-SET(CPACK_${TYPE}_PACKAGE_MAINTAINER ${PACKAGE_MAINTAINER})
-SET(CPACK_${TYPE}_PACKAGE_NAME ${PACKAGE_NAME})
-SET(CPACK_${TYPE}_PACKAGE_VERSION ${PACKAGE_VERSION})
-SET(CPACK_${TYPE}_PACKAGE_ARCHITECTURE ${ARCHITECTURE})
-SET(CPACK_${TYPE}_PACKAGE_RELEASE 1)
-SET(CPACK_${TYPE}_PACKAGE_VENDOR ${VENDOR})
-SET(CPACK_${TYPE}_PACKAGE_DESCRIPTION "The CCNx RTA Stack implementation.")
-SET(CPACK_${TYPE}_PACKAGE_HOMEPAGE "https://wiki.fd.io/view/Ccnxlib")
-
-INCLUDE(CPack)
+set(CPACK_GENERATOR ${GENERATOR})
+set(CPACK_${GENERATOR}_COMPONENT_INSTALL ON)
+set(CPACK_${TYPE}_PACKAGE_MAINTAINER ${PACKAGE_MAINTAINER})
+set(CPACK_${TYPE}_PACKAGE_NAME ${PACKAGE_NAME})
+set(CPACK_${TYPE}_PACKAGE_VERSION ${PACKAGE_VERSION})
+set(CPACK_${TYPE}_PACKAGE_ARCHITECTURE ${ARCHITECTURE})
+set(CPACK_${TYPE}_PACKAGE_RELEASE 1)
+set(CPACK_${TYPE}_PACKAGE_VENDOR ${VENDOR})
+set(CPACK_${TYPE}_PACKAGE_DESCRIPTION "The CCNx RTA Stack implementation.")
+set(CPACK_${TYPE}_PACKAGE_HOMEPAGE "https://wiki.fd.io/view/Ccnxlib")
+
+include(CPack)
# Define a few configuration variables that we want accessible in the software
set(CCNX_API_CONTROL_HEADERS
- ccnxControlAPI_About.h
- cpi_Acks.h
- cpi_Address.h
- cpi_AddressList.h
- cpi_CancelFlow.h
- cpi_Connection.h
- cpi_ConnectionEthernet.h
- cpi_ConnectionList.h
- cpi_ControlMessage.h
- cpi_ControlFacade.h
- cpi_Forwarding.h
- cpi_Interface.h
- cpi_InterfaceSet.h
- cpi_InterfaceGeneric.h
- cpi_InterfaceEthernet.h
- cpi_InterfaceType.h
- cpi_InterfaceIPTunnel.h
- cpi_InterfaceIPTunnelList.h
- cpi_InterfaceLocal.h
- cpi_Listener.h
- cpi_NameRouteType.h
- cpi_ManageLinks.h
- cpi_ManageCaches.h
- cpi_ManageWldr.h
- cpi_RouteEntry.h
- cpi_RouteEntryList.h
- cpi_NameRouteProtocolType.h
- cpi_ForwardingStrategy.h
+ ccnxControlAPI_About.h
+ cpi_Acks.h
+ cpi_Address.h
+ cpi_AddressList.h
+ cpi_CancelFlow.h
+ cpi_Connection.h
+ cpi_ConnectionEthernet.h
+ cpi_ConnectionList.h
+ cpi_ControlMessage.h
+ cpi_ControlFacade.h
+ cpi_Forwarding.h
+ cpi_Interface.h
+ cpi_InterfaceSet.h
+ cpi_InterfaceGeneric.h
+ cpi_InterfaceEthernet.h
+ cpi_InterfaceType.h
+ cpi_InterfaceIPTunnel.h
+ cpi_InterfaceIPTunnelList.h
+ cpi_InterfaceLocal.h
+ cpi_Listener.h
+ cpi_NameRouteType.h
+ cpi_ManageLinks.h
+ cpi_ManageCaches.h
+ cpi_ManageWldr.h
+ cpi_RouteEntry.h
+ cpi_RouteEntryList.h
+ cpi_NameRouteProtocolType.h
+ cpi_ForwardingStrategy.h
controlPlaneInterface.h
-)
+)
-set(CCNX_API_CONTROL_SOURCE_FILES
- ccnxControlAPI_About.c
- cpi_Acks.c
- cpi_Address.c
- cpi_AddressList.c
- cpi_CancelFlow.c
- cpi_Connection.c
- cpi_ConnectionEthernet.c
- cpi_ConnectionList.c
- cpi_ControlMessage.c
- cpi_ControlFacade.c
- cpi_Forwarding.c
- cpi_Interface.c
- cpi_InterfaceSet.c
- cpi_InterfaceGeneric.c
- cpi_InterfaceEthernet.c
- cpi_InterfaceIPTunnel.c
- cpi_InterfaceIPTunnelList.c
- cpi_InterfaceType.c
- cpi_Listener.c
- cpi_NameRouteType.c
- cpi_ManageLinks.c
- cpi_ManageCaches.c
- cpi_ManageWldr.c
- cpi_NameRouteProtocolType.c
- cpi_RouteEntry.c
- cpi_RouteEntryList.c
- cpi_ForwardingStrategy.c
+set(CCNX_API_CONTROL_SOURCE_FILES
+ ccnxControlAPI_About.c
+ cpi_Acks.c
+ cpi_Address.c
+ cpi_AddressList.c
+ cpi_CancelFlow.c
+ cpi_Connection.c
+ cpi_ConnectionEthernet.c
+ cpi_ConnectionList.c
+ cpi_ControlMessage.c
+ cpi_ControlFacade.c
+ cpi_Forwarding.c
+ cpi_Interface.c
+ cpi_InterfaceSet.c
+ cpi_InterfaceGeneric.c
+ cpi_InterfaceEthernet.c
+ cpi_InterfaceIPTunnel.c
+ cpi_InterfaceIPTunnelList.c
+ cpi_InterfaceType.c
+ cpi_Listener.c
+ cpi_NameRouteType.c
+ cpi_ManageLinks.c
+ cpi_ManageCaches.c
+ cpi_ManageWldr.c
+ cpi_NameRouteProtocolType.c
+ cpi_RouteEntry.c
+ cpi_RouteEntryList.c
+ cpi_ForwardingStrategy.c
controlPlaneInterface.c
)
source_group(Sources FILES ${CCNX_API_CONTROL_SOURCE_FILES})
source_group(Sources FILES ${CCNX_API_CONTROL_HEADERS})
-set_target_properties(ccnx_api_control.shared PROPERTIES
+set_target_properties(ccnx_api_control.shared PROPERTIES
C_STANDARD 99
- SOVERSION 1
+ SOVERSION 1
VERSION 1.0
OUTPUT_NAME ccnx_api_control )
)
foreach(lib ${libccnx_api_control_libraries})
- install(TARGETS ${lib} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+ install(TARGETS ${lib} COMPONENT library LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
set_property(TARGET ${lib} PROPERTY C_STANDARD 99)
endforeach()
-install(FILES ${CCNX_API_CONTROL_HEADERS} DESTINATION include/ccnx/api/control )
-
+install(FILES ${CCNX_API_CONTROL_HEADERS} DESTINATION include/ccnx/api/control COMPONENT headers)
+
add_subdirectory(test)
# Define a few configuration variables that we want accessible in the software
set(CCNX_API_NOTIFY_HEADERS
- ccnxNotifyAPI_About.h
- notify_Status.h
+ ccnxNotifyAPI_About.h
+ notify_Status.h
notify_Timer.h
-)
+)
-set(CCNX_API_NOTIFY_SOURCE_FILES
- ccnxNotifyAPI_About.c
+set(CCNX_API_NOTIFY_SOURCE_FILES
+ ccnxNotifyAPI_About.c
notify_Status.c
)
source_group(Sources FILES ${CCNX_API_NOTIFY_SOURCE_FILES})
source_group(Sources FILES ${CCNX_API_NOTIFY_HEADERS})
-set_target_properties(ccnx_api_notify.shared PROPERTIES
+set_target_properties(ccnx_api_notify.shared PROPERTIES
C_STANDARD 99
- SOVERSION 1
+ SOVERSION 1
VERSION 1.0
OUTPUT_NAME ccnx_api_notify )
)
foreach(lib ${libccnx_api_notify_libraries})
- install(TARGETS ${lib} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+ install(TARGETS ${lib} COMPONENT library LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
set_property(TARGET ${lib} PROPERTY C_STANDARD 99)
endforeach()
-install(FILES ${CCNX_API_NOTIFY_HEADERS} DESTINATION include/ccnx/api/notify )
-
+install(FILES ${CCNX_API_NOTIFY_HEADERS} DESTINATION include/ccnx/api/notify COMPONENT headers)
+
#add_subdirectory(test)
)
foreach(lib ${libccnx_transport_rta_libraries})
- install(TARGETS ${lib} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+ install(TARGETS ${lib} COMPONENT library LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
set_property(TARGET ${lib} PROPERTY C_STANDARD 99)
endforeach()
-install(FILES ${BASE_HDRS} DESTINATION include/ccnx/transport )
-install(FILES ${COMMON_HDRS} DESTINATION include/ccnx/transport/common )
-install(FILES ${TEST_TOOLS_HDRS} DESTINATION include/ccnx/transport/test_tools )
-install(FILES ${RTA_CORE_HDRS} DESTINATION include/ccnx/transport/transport_rta )
-install(FILES ${RTA_CONFIG_HDRS} DESTINATION include/ccnx/transport/transport_rta/config )
-install(FILES ${RTA_COMMANDS_HDRS} DESTINATION include/ccnx/transport/transport_rta/commands )
+install(FILES ${BASE_HDRS} DESTINATION include/ccnx/transport COMPONENT headers)
+install(FILES ${COMMON_HDRS} DESTINATION include/ccnx/transport/common COMPONENT headers)
+install(FILES ${TEST_TOOLS_HDRS} DESTINATION include/ccnx/transport/test_tools COMPONENT headers)
+install(FILES ${RTA_CORE_HDRS} DESTINATION include/ccnx/transport/transport_rta COMPONENT headers)
+install(FILES ${RTA_CONFIG_HDRS} DESTINATION include/ccnx/transport/transport_rta/config COMPONENT headers)
+install(FILES ${RTA_COMMANDS_HDRS} DESTINATION include/ccnx/transport/transport_rta/commands COMPONENT headers)
add_subdirectory(common/test)
add_subdirectory(transport_rta/test)
APT_PATH=`which apt-get` || true
apt_get=${APT_PATH:-"/usr/local/bin/apt-get"}
-BUILD_TOOLS_UBUNTU="build-essential cmake"
+BUILD_TOOLS_UBUNTU="build-essential doxygen"
LIBSSL_LIBEVENT_UBUNTU="libevent-dev libssl-dev"
-DEPS_UBUNTU="$LIBSSL_LIBEVENT_UBUNTU longbow libparc libccnx-common"
+DEPS_UBUNTU="$LIBSSL_LIBEVENT_UBUNTU longbow-dev libparc-dev libccnx-common-dev"
BUILD_TOOLS_GROUP_CENTOS="'Development Tools'"
-BUILD_TOOLS_SINGLE_CENTOS="cmake"
LIBSSL_LIBEVENT_CENTOS="libevent-devel openssl-devel"
-DEPS_CENTOS="$LIBSSL_LIBEVENT_CENTOS longbow libparc libccnx-common"
+DEPS_CENTOS="$LIBSSL_LIBEVENT_CENTOS longbow-devel libparc-devel libccnx-common-devel"
-# Parameters:
-# $1 = Distribution [Trusty / CentOS]
-#
update_cmake_repo() {
- DISTRIBUTION=$1
+ cat /etc/resolv.conf
+ echo "nameserver 8.8.8.8" | sudo tee -a /etc/resolv.conf
+ cat /etc/resolv.conf
- if [ "$DISTRIBUTION" == "trusty" ]; then
- sudo ${apt_get} install -y --allow-unauthenticated software-properties-common
- sudo add-apt-repository --yes ppa:george-edison55/cmake-3.x
- elif [ "$DISTRIBUTION" == "CentOS" ]; then
- sudo cat << EOF > cmake.repo
-[cmake-repo]
-name=Repo for cmake3
-baseurl=http://mirror.ghettoforge.org/distributions/gf/el/7/plus/x86_64/
-enabled=1
-gpgcheck=0
-EOF
- sudo cat << EOF > jsoncpp.repo
-[jsoncp-repo]
-name=Repo for jsoncpp
-baseurl=http://dl.fedoraproject.org/pub/epel/7/x86_64/
-enabled=1
-gpgcheck=0
-EOF
- sudo mv cmake.repo /etc/yum.repos.d/cmake.repo
- sudo mv jsoncpp.repo /etc/yum.repos.d/jsoncpp.repo
- fi
+ CMAKE_INSTALL_SCRIPT_URL="https://cmake.org/files/v3.8/cmake-3.8.0-Linux-x86_64.sh"
+ CMAKE_INSTALL_SCRIPT="/tmp/install_cmake.sh"
+ curl ${CMAKE_INSTALL_SCRIPT_URL} > ${CMAKE_INSTALL_SCRIPT}
+
+ sudo mkdir -p /opt/cmake
+ sudo bash ${CMAKE_INSTALL_SCRIPT} --skip-license --prefix=/opt/cmake
+ export PATH=/opt/cmake/bin:$PATH
}
# Parameters:
DISTRIB_ID=$1
DISTRIB_CODENAME=$2
- if [ "$DISTRIB_ID" == "Ubuntu" ]; then
- if [ "$DISTRIB_CODENAME" == "trusty" ]; then
- update_cmake_repo $DISTRIB_CODENAME
- fi
-
- update_fdio_repo $DISTRIB_ID $DISTRIB_CODENAME
+ update_cmake_repo
+ update_fdio_repo $DISTRIB_ID $DISTRIB_CODENAME
+ if [ "$DISTRIB_ID" == "Ubuntu" ]; then
sudo ${apt_get} update || true
-
- elif [ "$DISTRIB_ID" == "CentOS" ]; then
- update_cmake_repo $DISTRIB_ID
- update_fdio_repo $DISTRIB_ID $DISTRIB_CODENAME
fi
}
echo $BUILD_TOOLS_UBUNTU $DEPS_UBUNTU | xargs sudo ${apt_get} install -y --allow-unauthenticated
elif [ $DISTRIB_ID == "CentOS" ]; then
echo $BUILD_TOOLS_GROUP_CENTOS | xargs sudo yum groupinstall -y --nogpgcheck
- echo $BUILD_TOOLS_SINGLE_CENTOS | xargs sudo yum install -y --nogpgcheck
echo $DEPS_CENTOS | xargs sudo yum install -y --nogpgcheck || true
fi
Code Review / cicn.git / commitdiff