Adding support for creating DEB and RPM packages

Change-Id: If97fbd6df4e3e82b7e251fa2d3f40d3862d1fcc5
Signed-off-by: Mauro Sardara <[email protected]>

diff --git a/libparc/CMakeLists.txt b/libparc/CMakeLists.txt
index 6528d58..70bada4 100644 (file)
--- a/libparc/CMakeLists.txt
+++ b/libparc/CMakeLists.txt
@@ -3,6 +3,9 @@ project(Libparc)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+set(${CMAKE_PROJECT_NAME}_VERSION_MAJOR 1)
+set(${CMAKE_PROJECT_NAME}_VERSION_MINOR 0)
+
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 
@@ -71,3 +74,49 @@ endif()
 
 add_subdirectory(parc)
 add_subdirectory(documentation)
+
+# Generate DEB / RPM packages
+
+option(DEB_PACKAGE "Create deb package" OFF)
+option(RPM_PACKAGE "Create deb package" OFF)
+
+SET(VENDOR "Cisco Systems" CACHE STRING "Vendor")
+SET(CONTACT "[email protected]" CACHE STRING "Contact")
+SET(DISTRIBUTION "xenial" CACHE STRING "Distribution")
+SET(ARCHITECTURE "amd64" CACHE STRING "Architecture")
+SET(PACKAGE_MAINTAINER "Mauro Sardara" CACHE STRING "Maintainer")
+SET(PACKAGE_VERSION "1.0" CACHE STRING "Version")
+SET(BUILD_NUMBER "1" CACHE STRING "Build Number")
+STRING(TOLOWER ${CMAKE_PROJECT_NAME} PACKAGE_NAME)
+
+SET(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+SET(CPACK_PACKAGE_VERSION_MAJOR ${${CMAKE_PROJECT_NAME}_VERSION_MAJOR})
+SET(CPACK_PACKAGE_VERSION_MINOR ${${CMAKE_PROJECT_NAME}_VERSION_MINOR})
+SET(CPACK_PACKAGE_VENDOR ${VENDOR})
+SET(CPACK_PACKAGE_CONTACT ${CONTACT})
+
+if(DEB_PACKAGE)
+    SET(TYPE "DEBIAN")
+    SET(GENERATOR "DEB")
+    SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${BUILD_NUMBER}~${DISTRIBUTION}_${ARCHITECTURE}")
+    SET(CPACK_${TYPE}_PACKAGE_REQUIRES "longbow >= 1.0, libevent-2.0-5, libssl1.0.0")
+elseif(RPM_PACKAGE)
+    SET(TYPE "RPM")
+    SET(GENERATOR "RPM")
+    SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${BUILD_NUMBER}.${DISTRIBUTION}.${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")
+else()
+    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 PARC Library is a C runtime providing an array of features and capabilities for C programs and programmers.")
+
+INCLUDE(CPack)
\ No newline at end of file

diff --git a/libparc/documentation/CMakeLists.txt b/libparc/documentation/CMakeLists.txt
index af99ad9..ced2c4a 100644 (file)
--- a/libparc/documentation/CMakeLists.txt
+++ b/libparc/documentation/CMakeLists.txt
@@ -5,10 +5,10 @@ if(DOXYGEN_FOUND)
   set(GITHUB_REMOTE http://github.com/PARC/Libparc)
   configure_file(libparc.doxygen.in config.doxygen @ONLY)
 
-  install(DIRECTORY images/            DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/images)
-  install(DIRECTORY doxygen-extras/    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/doxygen-extras)
-  install(DIRECTORY examples/          DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/examples)
-  install(FILES DoxygenLayout.xml      DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+  install(DIRECTORY images/            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/libparc/images)
+  install(DIRECTORY doxygen-extras/    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/libparc/doxygen-extras)
+  install(DIRECTORY examples/          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/libparc/examples)
+  install(FILES DoxygenLayout.xml      DESTINATION ${CMAKE_INSTALL_PREFIX}/share/libparc/)
 
   set(HTML_PATH  ${CMAKE_CURRENT_BINARY_DIR}/generated-documentation/html)
 

diff --git a/longbow/CMakeLists.txt b/longbow/CMakeLists.txt
index 46c9fd9..2c40e3c 100644 (file)
--- a/longbow/CMakeLists.txt
+++ b/longbow/CMakeLists.txt
@@ -3,6 +3,9 @@ project(LongBow)
 
 include( CTest )
 
+set(${CMAKE_PROJECT_NAME}_VERSION_MAJOR 1)
+set(${CMAKE_PROJECT_NAME}_VERSION_MINOR 0)
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 set(CMAKE_C_STANDARD 99)
@@ -10,12 +13,12 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-execute_process(COMMAND ${PROJECT_SOURCE_DIR}/cmake/get_version.sh ${PROJECT_SOURCE_DIR} 
-  OUTPUT_VARIABLE RELEASE_VERSION 
+execute_process(COMMAND ${PROJECT_SOURCE_DIR}/cmake/get_version.sh ${PROJECT_SOURCE_DIR}
+  OUTPUT_VARIABLE RELEASE_VERSION
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 execute_process(COMMAND date -u +%Y-%m-%dT%H:%M:%SZ
-  OUTPUT_VARIABLE ISO_DATE 
+  OUTPUT_VARIABLE ISO_DATE
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 MESSAGE( STATUS "Configuring version ${RELEASE_VERSION}" )
@@ -39,7 +42,7 @@ set( PYVERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} )
 
 set( INSTALL_BASE_PYTHON_DIR ${CMAKE_INSTALL_PREFIX}/lib/python${PYVERSION}/site-packages )
 set( INSTALL_PYTHON_DIR ${INSTALL_BASE_PYTHON_DIR}/longbow )
-set( DEPENDENCY_PYTHON_DIR ${DEPENDENCY_DIR}/etc/site-packages ) 
+set( DEPENDENCY_PYTHON_DIR ${DEPENDENCY_DIR}/etc/site-packages )
 set( VERSION ${RELEASE_VERSION} )
 set( DATE ${ISO_DATE} )
 set( UNCRUSTIFY_BIN ${UNCRUSTIFY_BIN} )
@@ -70,4 +73,50 @@ else()
 
   add_subdirectory(src)
   add_subdirectory(documentation)
+
+  # Generate DEB / RPM packages
+
+  option(DEB_PACKAGE "Create deb package" OFF)
+  option(RPM_PACKAGE "Create deb package" OFF)
+
+  SET(VENDOR "Cisco Systems" CACHE STRING "Vendor")
+  SET(CONTACT "[email protected]" CACHE STRING "Contact")
+  SET(DISTRIBUTION "xenial" CACHE STRING "Distribution")
+  SET(ARCHITECTURE "amd64" CACHE STRING "Architecture")
+  SET(PACKAGE_MAINTAINER "Mauro Sardara" CACHE STRING "Maintainer")
+  SET(PACKAGE_VERSION "1.0" CACHE STRING "Version")
+  SET(BUILD_NUMBER "1" CACHE STRING "Build Number")
+  STRING(TOLOWER ${CMAKE_PROJECT_NAME} PACKAGE_NAME)
+
+  SET(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+  SET(CPACK_PACKAGE_VERSION_MAJOR ${${CMAKE_PROJECT_NAME}_VERSION_MAJOR})
+  SET(CPACK_PACKAGE_VERSION_MINOR ${${CMAKE_PROJECT_NAME}_VERSION_MINOR})
+  SET(CPACK_PACKAGE_VENDOR ${VENDOR})
+  SET(CPACK_PACKAGE_CONTACT ${CONTACT})
+
+  if(DEB_PACKAGE)
+    SET(TYPE "DEBIAN")
+    SET(GENERATOR "DEB")
+    SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${BUILD_NUMBER}~${DISTRIBUTION}_${ARCHITECTURE}")
+  elseif(RPM_PACKAGE)
+    SET(TYPE "RPM")
+    SET(GENERATOR "RPM")
+    SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${BUILD_NUMBER}.${DISTRIBUTION}.${ARCHITECTURE}")
+    SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/etc" "/usr/lib/python2.7" "/usr/lib/python2.7/site-packages")
+  else()
+    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_REQUIRES "python >= 2.7.0")
+  SET(CPACK_${TYPE}_PACKAGE_DESCRIPTION "Runtime and testing framework for C applications.")
+
+  INCLUDE(CPack)
+
 endif()
\ No newline at end of file

diff --git a/longbow/documentation/CMakeLists.txt b/longbow/documentation/CMakeLists.txt
index c25ffc1..33f9299 100644 (file)
--- a/longbow/documentation/CMakeLists.txt
+++ b/longbow/documentation/CMakeLists.txt
@@ -5,10 +5,10 @@ if(DOXYGEN_FOUND)
   set(GITHUB_REMOTE http://github.com/PARC/LongBow)
   configure_file(longbow.doxygen.in config.doxygen @ONLY)
 
-  install(DIRECTORY images/            DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/images)
-  install(DIRECTORY doxygen-extras/    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/doxygen-extras)
-  install(DIRECTORY examples/          DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/examples)
-  install(FILES DoxygenLayout.xml      DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+  install(DIRECTORY images/            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/longbow/images)
+  install(DIRECTORY doxygen-extras/    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/longbow/doxygen-extras)
+  install(DIRECTORY examples/          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/longbow/examples)
+  install(FILES DoxygenLayout.xml      DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/longbow)
 
   set(HTML_PATH  ${CMAKE_CURRENT_BINARY_DIR}/generated-documentation/html)
 

diff --git a/longbow/src/python/site-packages/longbow/Language_C.py b/longbow/src/python/site-packages/longbow/Language_C.py
index 8518313..1d97a67 100755 (executable)
--- a/longbow/src/python/site-packages/longbow/Language_C.py
+++ b/longbow/src/python/site-packages/longbow/Language_C.py
@@ -47,8 +47,10 @@ def getLibPathForObject(libraryPath, filename):
     return result
 
 class Module:
-    '''Represent a C language module.
+    '''
+    Represent a C language module.
     A module consists of the file names of the C source, C header file, object file, and an executable file
+    '''
     def __init__(self, srcPath, objectDirs=[]):
         self.path = self.initialzePath(srcPath)
         if not objectDirs: