Move to New Template (work in progress)

3 files changed, 328 insertions, 26 deletions

diff --git a/etc/config.cmake b/etc/config.cmake
index 57e379c..99424d9 100644
--- a/etc/config.cmake
+++ b/etc/config.cmake
@@ -18,56 +18,93 @@
 
 # Project Info
 # ------------------
-  set(NAME audio-bindings)
-  set(VERSION "1.0")
-  set(PRETTY_NAME "Audio Bindings")
-  set(DESCRIPTION "Expose ALSA Sound Low+High Level APIs through AGL Framework")
-  set(URL "https://github.com/iotbzh/auto-bindings")
+set(PROJECT_NAME audio-agent)
+set(PROJECT_VERSION "0.1")
+set(PROJECT_PRETTY_NAME "Audio Agent")
+set(PROJECT_DESCRIPTION "Expose ALSA Sound Low+High Level APIs through AGL Framework")
+set(PROJECT_URL "https://github.com/iotbzh/auto-bindings")
+set(PROJECT_ICON "icon.png")
+set(PROJECT_AUTHOR "Fulup, Ar Foll")
+set(PROJECT_AUTHOR_MAIL "fulup@iot.bzh")
+set(PROJECT_LICENCE "APL2.0")
+set(PROJECT_LANGUAGES,"C")
 
 # Compilation Mode (DEBUG, RELEASE)
 # ----------------------------------
-  setc(CMAKE_BUILD_TYPE "DEBUG")
+set(CMAKE_BUILD_TYPE "DEBUG")
+
+# Compiler selection if needed. Overload the detected compiler.
+# -----------------------------------------------
+#set(CMAKE_C_COMPILER "gcc")
+#set(CMAKE_CXX_COMPILER "g++")
 
 # PKG_CONFIG required packages
 # -----------------------------
-  set (PKG_REQUIRED_LIST 
-    alsa
-    json-c
-    afb-daemon
-  )
+set (PKG_REQUIRED_LIST
+	alsa
+	libsystemd
+	afb-daemon
+)
 
 # Static constante definition
 # -----------------------------
-  add_compile_options(-DMAX_SND_CARD=16)
+add_compile_options(-DMAX_SND_CARD=16)
+
+# LANG Specific compile flags set for all build types
+set(CMAKE_C_FLAGS "")
+set(CMAKE_CXX_FLAGS "")
 
 # Print a helper message when every thing is finished
 # ----------------------------------------------------
-  setc(CLOSING_MESSAGE "Test with: afb-daemon --ldpaths=. --port=1234 --roothttp=../htdocs --tracereq=common --token="" --verbose")
+set(CLOSING_MESSAGE "Test with: afb-daemon --ldpaths=. --port=1234 --roothttp=../htdocs --tracereq=common --token='' --verbose")
 
-# (BUG!!!) as PKG_CONFIG_PATH does not work [should be en env variable]
+# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
 # ---------------------------------------------------------------------
-  setc(CMAKE_INSTALL_PREFIX ${HOME}/opt)
-  setc(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-  setc(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
+set(CMAKE_INSTALL_PREFIX ${HOME}/opt)
+set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
 
 # Optional dependencies order
 # ---------------------------
-  #set(EXTRA_DEPENDENCIES_ORDER target1 target2 ...)
+#set(EXTRA_DEPENDENCIES_ORDER)
 
 # Optional Extra global include path
-# ------------------------------------
-  #set(EXTRA_INCLUDE_DIRS incdir1 incdir2 ...)
+# -----------------------------------
+# set(EXTRA_INCLUDE_DIRS)
 
 # Optional extra libraries
 # -------------------------
-  # set(EXTRA_LINK_LIBRARIES lib1 lib2 ... )
+# set(EXTRA_LINK_LIBRARIES)
 
 # Optional force binding installation
 # ------------------------------------
-  # set(BINDINGS_INSTALL_PREFIX DestinationPath )
+# set(BINDINGS_INSTALL_PREFIX PrefixPath )
 
-# Optional force binding Linking flag
-# ------------------------------------
-  # set(BINDINGS_LINK_FLAG LinkOptions )
+# Optional force widget prefix generation
+# ------------------------------------------------
+# set(WIDGET_PREFIX DestinationPath)
 
+# Optional Widget entry point file.
+# ---------------------------------------------------------
+# This is the file that will be executed, loaded,...
+# at launch time by the application framework
 
+# set(WIDGET_ENTRY_POINT EntryPoint_Path)
+
+# Optional Widget Mimetype specification
+# --------------------------------------------------
+# Choose between :
+# - application/x-executable
+# - application/vnd.agl.url
+# - application/vnd.agl.service
+# - application/vnd.agl.native
+# - text/vnd.qt.qml
+# - application/vnd.agl.qml
+# - application/vnd.agl.qml.hybrid
+# - application/vnd.agl.html.hybrid
+#
+# set(WIDGET_TYPE MimeType)
+
+# Optional force binding Linking flag
+# ------------------------------------
+# set(BINDINGS_LINK_FLAG LinkOptions )
diff --git a/etc/export.map b/etc/export.map
index 52c1b4a..ee2f413 100644
--- a/etc/export.map
+++ b/etc/export.map
@@ -1 +1 @@
-{ global: afbBindingV1*; local: *; };
+{ global: afbBindingV*; local: *; };
diff --git a/etc/macros.cmake b/etc/macros.cmake
new file mode 100644
index 0000000..6e425ac
--- /dev/null
+++ b/etc/macros.cmake
@@ -0,0 +1,265 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+#
+# author: Fulup Ar Foll <fulup@iot.bzh>
+# contrib: Romain Forlot <romain.forlot@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
+
+
+#--------------------------------------------------------------------------
+#  WARNING:
+#     Do not change this cmake template
+#     Customise your preferences in "./etc/config.cmake"
+#--------------------------------------------------------------------------
+
+
+# Generic useful macro
+# -----------------------
+macro(PROJECT_TARGET_ADD TARGET_NAME)
+	set(PROJECT_TARGETS ${PROJECT_TARGETS} ${TARGET_NAME} CACHE INTERNAL PROJECT_TARGETS)
+	set(TARGET_NAME ${TARGET_NAME})
+endmacro(PROJECT_TARGET_ADD)
+
+macro(defstr name value)
+	add_definitions(-D${name}=${value})
+endmacro(defstr)
+
+# WGT packaging
+macro(project_targets_populate)
+	foreach(TARGET ${PROJECT_TARGETS})
+		# Declaration of a custom command that will populate widget tree with the target
+		set(POPULE_WIDGET_TARGET "project_populate_${TARGET}")
+
+		get_target_property(T ${TARGET} LABELS)
+		get_target_property(P ${TARGET} PREFIX)
+		get_target_property(BD ${TARGET} BINARY_DIR)
+		get_target_property(OUT ${TARGET} OUTPUT_NAME)
+
+		if(NOT P)
+                    if (${T} STREQUAL "BINDING")
+                        set(P "lib")
+                    else()
+                        set(P "")
+                    endif()
+		endif()
+
+		if(${T} STREQUAL "BINDING")
+			add_custom_command(OUTPUT ${WIDGET_LIBDIR}/${P}${TARGET}.so
+				DEPENDS ${TARGET}
+				COMMAND mkdir -p ${WIDGET_LIBDIR}
+				COMMAND cp ${BD}/${P}${OUT}.so ${WIDGET_LIBDIR}
+			)
+			add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_LIBDIR}/${P}${TARGET}.so)
+		elseif(${T} STREQUAL "EXECUTABLE")
+			add_custom_command(OUTPUT ${WIDGET_BINDIR}/${P}${TARGET}
+				DEPENDS ${TARGET}
+				COMMAND mkdir -p ${WIDGET_BINDIR}
+				COMMAND cp ${BD}/${P}${OUT} ${WIDGET_BINDIR}
+			)
+			add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_BINDIR}/${P}${TARGET})
+		elseif(${T} STREQUAL "HTDOCS")
+			add_custom_command(OUTPUT ${WIDGET_HTTPDIR}
+				DEPENDS ${TARGET}
+				COMMAND cp -r ${BD}/${P}${OUT} ${WIDGET_HTTPDIR}
+				)
+				add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_HTTPDIR})
+		elseif(${T} STREQUAL "DATA")
+			add_custom_command(OUTPUT ${WIDGET_DATADIR}
+				DEPENDS ${TARGET}
+				COMMAND cp -r ${BD}/${P}${OUT} ${WIDGET_DATADIR}
+				)
+				add_custom_target(${POPULE_WIDGET_TARGET} ALL DEPENDS ${WIDGET_HTTPDIR})
+		else()
+			if(${CMAKE_BUILD_TYPE} MATCHES "[Dd][Ee][Bb][Uu][Gg]")
+				MESSAGE("** This target, ${TARGET}, will be not be included in the package.")
+			endif(${CMAKE_BUILD_TYPE} MATCHES "[Dd][Ee][Bb][Uu][Gg]")
+		endif(${T} STREQUAL "BINDING")
+		PROJECT_TARGET_ADD(${POPULE_WIDGET_TARGET})
+	endforeach()
+endmacro(project_targets_populate)
+
+macro(project_package_build)
+	if("${PROJECT_TARGETS}" MATCHES "project_populate_")
+		if(NOT EXISTS ${WIDGET_DIR}/config.xml.in OR NOT EXISTS ${WIDGET_DIR}/${PROJECT_ICON}.in)
+			configure_file(${PROJECT_WGT_DIR}/config.xml.in ${WIDGET_DIR}/config.xml)
+			file(COPY ${PROJECT_WGT_DIR}/${PROJECT_ICON}.in DESTINATION ${WIDGET_DIR}/${PROJECT_ICON})
+		endif(NOT EXISTS ${WIDGET_DIR}/config.xml.in OR NOT EXISTS ${WIDGET_DIR}/${PROJECT_ICON}.in)
+
+		file(GLOB PROJECT_CONF_FILES "${PROJECT_WGT_DIR}/etc/*")
+		if(${PROJECT_CONF_FILES})
+			file(COPY "${PROJECT_WGT_DIR}/etc/*" DESTINATION ${WIDGET_ETCDIR}/)
+		endif(${PROJECT_CONF_FILES})
+
+		add_custom_command(OUTPUT ${PROJECT_NAME}.wgt
+		DEPENDS ${PROJECT_TARGETS}
+		COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt ${WIDGET_DIR}
+		)
+		add_custom_target(widget DEPENDS ${PROJECT_NAME}.wgt)
+		set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.wgt")
+	else()
+		MESSAGE(FATAL_ERROR "Widget tree empty, please populate it by calling  populate_widget() macro with target you want to include into it.")
+	endif("${PROJECT_TARGETS}" MATCHES "project_populate_")
+endmacro(project_package_build)
+
+macro(project_subdirs_add)
+	if(${ARGV0})
+		file(GLOB filelist "${ARGV0}")
+	else()
+		file(GLOB filelist "*")
+	endif(${ARGV0})
+
+	foreach(filename ${filelist})
+		if(EXISTS "${filename}/CMakeLists.txt")
+			add_subdirectory(${filename})
+		endif(EXISTS "${filename}/CMakeLists.txt")
+	endforeach()
+endmacro(project_subdirs_add)
+
+set(CMAKE_BUILD_TYPE Debug CACHE STRING "the type of build")
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMP0048 1)
+
+# Compiler selection should append before project definition
+# -----------------------------------------------------------
+foreach (GCC_VERSION "6" "5")
+    execute_process(COMMAND gcc-${GCC_VERSION} -dumpversion RESULT_VARIABLE GCCRC OUTPUT_QUIET ERROR_QUIET)
+    if(GCCRC EQUAL 0)
+        set(CMAKE_C_COMPILER   "gcc-${GCC_VERSION}")
+        set(CMAKE_CXX_COMPILER "g++-${GCC_VERSION}")
+        set(CMAKE_C_VERSION ${GCC_VERSION})
+        message(STATUS "gcc/g++ version-${CMAKE_C_VERSION}.x selected")
+        break()
+    endif(GCCRC EQUAL 0)
+endforeach(GCC_VERSION)
+
+# Include project configuration
+# ------------------------------
+include(${CMAKE_CURRENT_SOURCE_DIR}/etc/config.cmake)
+
+project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES})
+message(STATUS "")
+message(STATUS "Project=${PROJECT_NAME}/${PROJECT_VERSION}[${PROJECT_PRETTY_NAME} ${PROJECT_DESCRIPTION}]")
+message(STATUS "")
+
+set(PROJECT_WGT_DIR "packaging/wgt" CACHE PATH "Subpath to the widget directory")
+set(PROJECT_LIBDIR  "libs" CACHE PATH "Subpath to libraries")
+set(PROJECT_RESOURCES "data" CACHE PATH "Subpath to data")
+
+INCLUDE(FindPkgConfig)
+INCLUDE(CheckIncludeFiles)
+INCLUDE(CheckLibraryExists)
+INCLUDE(GNUInstallDirs)
+
+# Default compilation options
+############################################################################
+link_libraries(-Wl,--as-needed -Wl,--gc-sections)
+add_compile_options(-Wall -Wextra -Wconversion)
+add_compile_options(-Wno-unused-parameter) # frankly not using a parameter does it care?
+add_compile_options(-Wno-sign-compare -Wno-sign-conversion)
+add_compile_options(-Werror=maybe-uninitialized)
+add_compile_options(-Werror=implicit-function-declaration)
+add_compile_options(-ffunction-sections -fdata-sections)
+add_compile_options(-fPIC)
+add_compile_options(-g)
+
+set(CMAKE_C_FLAGS_PROFILING   "-g -O2 -pg -Wp,-U_FORTIFY_SOURCE" CACHE STRING "Flags for profiling")
+set(CMAKE_C_FLAGS_DEBUG       "-g -O2 -ggdb -Wp,-U_FORTIFY_SOURCE" CACHE STRING "Flags for debugging")
+set(CMAKE_C_FLAGS_RELEASE     "-O2" CACHE STRING "Flags for releasing")
+set(CMAKE_C_FLAGS_CCOV        "-g -O2 --coverage" CACHE STRING "Flags for coverage test")
+
+set(CMAKE_CXX_FLAGS_PROFILING    "-g -O0 -pg -Wp,-U_FORTIFY_SOURCE")
+set(CMAKE_CXX_FLAGS_DEBUG        "-g -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
+set(CMAKE_CXX_FLAGS_RELEASE      "-g -O2")
+set(CMAKE_CXX_FLAGS_CCOV "-g -O2 --coverage")
+
+set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/Install" CACHE PATH "The path where to install")
+
+# (BUG!!!) as PKG_CONFIG_PATH does not work [should be en env variable]
+set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON CACHE BOOLEAN "Flag for using prefix path")
+
+# Loop on required package and add options
+foreach (PKG_CONFIG ${PKG_REQUIRED_LIST})
+	PKG_CHECK_MODULES(${PKG_CONFIG} REQUIRED ${PKG_CONFIG})
+
+	INCLUDE_DIRECTORIES(${${PKG_CONFIG}_INCLUDE_DIRS})
+	list (APPEND link_libraries ${${PKG_CONFIG}_LIBRARIES})
+	add_compile_options (${${PKG_CONFIG}_CFLAGS})
+endforeach(PKG_CONFIG)
+
+# Optional LibEfence Malloc debug library
+IF(CMAKE_BUILD_TYPE MATCHES DEBUG)
+CHECK_LIBRARY_EXISTS(efence malloc "" HAVE_LIBEFENCE)
+IF(HAVE_LIBEFENCE)
+	MESSAGE(STATUS "Linking with ElectricFence for debugging purposes...")
+	SET(libefence_LIBRARIES "-lefence")
+	list (APPEND link_libraries ${libefence_LIBRARIES})
+ENDIF(HAVE_LIBEFENCE)
+ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG)
+
+# set default include directories
+INCLUDE_DIRECTORIES(${EXTRA_INCLUDE_DIRS})
+
+# If no install dir try to guess some smart default
+if(BINDINGS_INSTALL_PREFIX)
+	set(BINDINGS_INSTALL_DIR ${BINDINGS_INSTALL_PREFIX}/${PROJECT_NAME})
+else()
+	set(BINDINGS_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME})
+endif()
+
+# Define a default package directory
+if(WIDGET_PREFIX)
+	set(WIDGET_DIR ${WIDGET_PREFIX}/package)
+else()
+	set(WIDGET_DIR ${CMAKE_CURRENT_BINARY_DIR}/package)
+endif()
+
+# and their subsequent subdir
+set(WIDGET_BINDIR ${WIDGET_DIR}/bin)
+set(WIDGET_ETCDIR ${WIDGET_DIR}/etc)
+set(WIDGET_LIBDIR ${WIDGET_DIR}/lib)
+set(WIDGET_HTTPDIR ${WIDGET_DIR}/htdocs)
+set(WIDGET_DATADIR ${WIDGET_DIR}/data)
+
+# Default Linkflag
+if(NOT BINDINGS_LINK_FLAG)
+	set(BINDINGS_LINK_FLAG "-Wl,--version-script=${CMAKE_SOURCE_DIR}/etc/export.map")
+endif()
+
+# Add a dummy target to enable global dependency order
+# -----------------------------------------------------
+if(EXTRA_DEPENDENCIES_ORDER)
+	set(DEPENDENCIES_TARGET ${PROJECT_NAME}_extra_dependencies)
+	add_custom_target(${DEPENDENCIES_TARGET} ALL
+		DEPENDS ${EXTRA_DEPENDENCY_ORDER} 
+	)
+endif()
+
+# Cmake does not maintain targets list before 3.7
+# -------------------------------------------------
+if(${CMAKE_VERSION} VERSION_LESS 3.7)
+	set(GLOBAL_TARGET_LIST ${PROJECT_TARGETS})
+else()
+	get_property(GLOBAL_TARGET_LIST GLOBAL PROPERTY GlobalTargetList)
+endif()
+
+# Print developer helper message when everything is done
+# -------------------------------------------------------
+if(CLOSING_MESSAGE AND GLOBAL_TARGET_LIST)
+	add_custom_target(${PROJECT_NAME}_done ALL
+		DEPENDS ${DEPENDENCIES_TARGET} ${GLOBAL_TARGET_LIST}
+		COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}"
+	)
+endif()
+