diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | conf.d/config.cmake | 2 | ||||
| m--------- | conf.d/templates | 0 | ||||
| -rw-r--r-- | conf.d/templates/cmake/common.cmake | 383 | ||||
| -rw-r--r-- | conf.d/templates/cmake/export.map | 1 | ||||
| -rw-r--r-- | conf.d/templates/gdb/gdb-on-target.in | 17 | ||||
| -rw-r--r-- | conf.d/templates/rpm/rpm-config.spec.in | 52 | ||||
| -rw-r--r-- | conf.d/templates/ssh/start-on-target.in | 28 |
8 files changed, 4 insertions, 482 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..6548d32 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "conf.d/templates"] + path = conf.d/templates + url = https://gerrit.automotivelinux.org/gerrit/p/apps/app-templates.git diff --git a/conf.d/config.cmake b/conf.d/config.cmake index 3e1f637..1bca0a3 100644 --- a/conf.d/config.cmake +++ b/conf.d/config.cmake @@ -107,7 +107,7 @@ set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib) # - application/vnd.agl.qml.hybrid # - application/vnd.agl.html.hybrid # -# set(WIDGET_TYPE MimeType) +set(WIDGET_TYPE application/vnd.agl.service) # Optional force binding Linking flag # ------------------------------------ diff --git a/conf.d/templates b/conf.d/templates new file mode 160000 +Subproject cc640c4cfed7d4a35cbbdbb23e09b9e76c88902 diff --git a/conf.d/templates/cmake/common.cmake b/conf.d/templates/cmake/common.cmake deleted file mode 100644 index b46e809..0000000 --- a/conf.d/templates/cmake/common.cmake +++ /dev/null @@ -1,383 +0,0 @@ -########################################################################### -# 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_property(GLOBAL APPEND PROPERTY PROJECT_TARGETS ${TARGET_NAME}) - set(TARGET_NAME ${TARGET_NAME}) -endmacro(PROJECT_TARGET_ADD) - -macro(PROJECT_PKGDEP_ADD PKG_NAME) - set_property(GLOBAL APPEND PROPERTY PROJECT_PKG_DEPS ${PKG_NAME}) -endmacro(PROJECT_PKGDEP_ADD) - -# Check GCC minimal version version -if (gcc_minimal_version) - message ("-- Check gcc_minimal_version (found gcc version ${CMAKE_C_COMPILER_VERSION}) (found g++ version ${CMAKE_CXX_COMPILER_VERSION})") -if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${gcc_minimal_version} OR CMAKE_C_COMPILER_VERSION VERSION_LESS ${gcc_minimal_version}) - message(FATAL_ERROR "**** FATAL: Require at least gcc-${gcc_minimal_version} please set CMAKE_C[XX]_COMPILER") -endif() -endif(gcc_minimal_version) - -macro(defstr name value) - add_definitions(-D${name}=${value}) -endmacro(defstr) - - - -# Pre-packaging -macro(project_targets_populate) - - # Default Widget default directory - set(PACKAGE_BINDIR ${PROJECT_PKG_DIR}/bin) - set(PACKAGE_ETCDIR ${PROJECT_PKG_DIR}/etc) - set(PACKAGE_LIBDIR ${PROJECT_PKG_DIR}/lib) - set(PACKAGE_HTTPDIR ${PROJECT_PKG_DIR}/htdocs) - set(PACKAGE_DATADIR ${PROJECT_PKG_DIR}/data) - - add_custom_target(populate) - get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS) - foreach(TARGET ${PROJECT_TARGETS}) - get_target_property(T ${TARGET} LABELS) - if(T) - # Declaration of a custom command that will populate widget tree with the target - set(POPULATE_PACKAGE_TARGET "populate_${TARGET}") - - get_target_property(P ${TARGET} PREFIX) - get_target_property(BD ${TARGET} BINARY_DIR) - get_target_property(OUT ${TARGET} OUTPUT_NAME) - - if(P MATCHES "NOTFOUND$") - if (${T} STREQUAL "BINDING") - set(P "lib") - else() - set(P "") - endif() - endif() - - if(${T} STREQUAL "BINDING") - add_custom_command(OUTPUT ${PACKAGE_LIBDIR}/${P}${TARGET}.so - DEPENDS ${TARGET} - COMMAND mkdir -p ${PACKAGE_LIBDIR} - COMMAND cp ${BD}/${P}${OUT}.so ${PACKAGE_LIBDIR} - ) - add_custom_target(${POPULATE_PACKAGE_TARGET} DEPENDS ${PACKAGE_LIBDIR}/${P}${TARGET}.so) - add_dependencies(populate ${POPULATE_PACKAGE_TARGET}) - elseif(${T} STREQUAL "EXECUTABLE") - add_custom_command(OUTPUT ${PACKAGE_BINDIR}/${P}${TARGET} - DEPENDS ${TARGET} - COMMAND mkdir -p ${PACKAGE_BINDIR} - COMMAND cp ${BD}/${P}${OUT} ${PACKAGE_BINDIR} - ) - add_custom_target(${POPULATE_PACKAGE_TARGET} DEPENDS ${PACKAGE_BINDIR}/${P}${TARGET}) - add_dependencies(populate ${POPULATE_PACKAGE_TARGET}) - elseif(${T} STREQUAL "HTDOCS") - add_custom_target(${POPULATE_PACKAGE_TARGET} - DEPENDS ${PACKAGE_HTTPDIR}/${TARGET}-xx - ) - add_custom_command( - OUTPUT ${PACKAGE_HTTPDIR}/${TARGET}-xx - DEPENDS ${TARGET} - COMMAND mkdir -p ${PACKAGE_HTTPDIR} - COMMAND touch ${PACKAGE_HTTPDIR} - COMMAND cp -r ${BD}/${P}${OUT}/* ${PACKAGE_HTTPDIR}/. - ) - add_dependencies(populate ${POPULATE_PACKAGE_TARGET}) - elseif(${T} STREQUAL "DATA") - add_custom_target(${POPULATE_PACKAGE_TARGET} - DEPENDS ${PACKAGE_DATADIR}/${TARGET}-xx - ) - - add_custom_command( - OUTPUT ${PACKAGE_DATADIR}/${TARGET}-xx - DEPENDS ${TARGET} - COMMAND mkdir -p ${PACKAGE_DATADIR} - COMMAND touch ${PACKAGE_DATADIR} - COMMAND cp -r ${BD}/${P}${OUT}/* ${PACKAGE_DATADIR}/. - ) - add_dependencies(populate ${POPULATE_PACKAGE_TARGET}) - endif(${T} STREQUAL "BINDING") - elseif(${CMAKE_BUILD_TYPE} MATCHES "[Dd][Ee][Bb][Uu][Gg]") - MESSAGE(".. Warning: ${TARGET} ignored when packaging.") - endif() - endforeach() -endmacro(project_targets_populate) - -macro(remote_targets_populate) - if (DEFINED ENV{RSYNC_TARGET}) - set (RSYNC_TARGET $ENV{RSYNC_TARGET}) - endif() - if (DEFINED ENV{RSYNC_PREFIX}) - set (RSYNC_PREFIX $ENV{RSYNC_PREFIX}) - endif() - - set( - REMOTE_LAUNCH "Test on target with: ${CMAKE_CURRENT_BINARY_DIR}/target/start-on-${RSYNC_TARGET}.sh" - CACHE STRING "Command to start ${PROJECT_NAME} on remote target ${RSYNC_TARGET}" - ) - - if(NOT RSYNC_TARGET OR NOT RSYNC_PREFIX) - message (".. Warning: RSYNC_TARGET RSYNC_PREFIX not defined 'make remote-target-populate' not instanciated") - add_custom_target(remote-target-populate - COMMENT "*** Fatal: RSYNC_TARGET RSYNC_PREFIX required with 'make remote-target-populate'" - COMMAND exit -1 - ) - else() - - configure_file(${SSH_TEMPLATE_DIR}/start-on-target.in ${CMAKE_CURRENT_BINARY_DIR}/target/start-on-${RSYNC_TARGET}.sh) - configure_file(${GDB_TEMPLATE_DIR}/gdb-on-target.in ${CMAKE_CURRENT_BINARY_DIR}/target/gdb-on-${RSYNC_TARGET}.ini) - - add_custom_target(remote-target-populate - DEPENDS populate - COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/target/start-on-${RSYNC_TARGET}.sh - COMMAND rsync --archive --delete ${PROJECT_PKG_DIR}/ ${RSYNC_TARGET}:${RSYNC_PREFIX}/${PROJECT_NAME} - COMMENT "${REMOTE_LAUNCH}" - ) - endif() -endmacro(remote_targets_populate) - - -macro(wgt_package_build) - if(NOT EXISTS ${WGT_TEMPLATE_DIR}/config.xml.in OR NOT EXISTS ${WGT_TEMPLATE_DIR}/${PROJECT_ICON}.in) - MESSAGE(FATAL_ERROR "Missing mandatory files: you need config.xml.in and ${PROJECT_ICON}.in files in ${WGT_TEMPLATE_DIR} folder.") - endif() - - # Build widget spec file from template only once (Fulup good idea or should depend on time ????) - if(NOT EXISTS ${PROJECT_PKG_DIR}/config.xml.in OR NOT EXISTS ${PROJECT_PKG_DIR}/${PROJECT_ICON}.in) - configure_file(${WGT_TEMPLATE_DIR}/config.xml.in ${PROJECT_PKG_DIR}/config.xml) - file(COPY ${WGT_TEMPLATE_DIR}/${PROJECT_ICON}.in DESTINATION ${PROJECT_PKG_DIR}/${PROJECT_ICON}) - endif(NOT EXISTS ${PROJECT_PKG_DIR}/config.xml.in OR NOT EXISTS ${PROJECT_PKG_DIR}/${PROJECT_ICON}.in) - - # Fulup ??? copy any extra file in wgt/etc into populate package before building the widget - file(GLOB PROJECT_CONF_FILES "${WGT_TEMPLATE_DIR}/etc/*") - if(${PROJECT_CONF_FILES}) - file(COPY "${WGT_TEMPLATE_DIR}/etc/*" DESTINATION ${PROJECT_PKG_DIR}/etc/) - endif(${PROJECT_CONF_FILES}) - - add_custom_command(OUTPUT ${PROJECT_NAME}.wgt - DEPENDS ${PROJECT_TARGETS} - COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt ${PROJECT_PKG_DIR} - ) - - add_custom_target(widget DEPENDS ${PROJECT_NAME}.wgt) - add_dependencies(widget populate) - set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.wgt") - - if(PACKAGE_MESSAGE) - add_custom_command(TARGET widget - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${PACKAGE_MESSAGE}") - endif() -endmacro(wgt_package_build) - -macro(rpm_package_build) - if(NOT EXISTS ${RPM_TEMPLATE_DIR}/rpm-config.spec.in) - MESSAGE(FATAL_ERROR "Missing mandatory files: you needconfig.rpm.in in ${RPM_TEMPLATE_DIR} folder.") - endif() - - # extract PROJECT_PKG_DEPS and replace ; by , for RPM spec file - get_property(PROJECT_PKG_DEPS GLOBAL PROPERTY PROJECT_PKG_DEPS) - foreach (PKFCONF ${PROJECT_PKG_DEPS}) - set(RPM_PKG_DEPS "${RPM_PKG_DEPS}, pkgconfig(${PKFCONF})") - endforeach() - - # build rpm spec file from template - configure_file(${RPM_TEMPLATE_DIR}/rpm-config.spec.in ${SPEC_DIR}/${PROJECT_NAME}.spec) - - add_custom_command(OUTPUT ${PROJECT_NAME}.rpm - DEPENDS ${PROJECT_TARGETS} - COMMAND git --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git archive --format=tar.gz --prefix=${PROJECT_NAME}-${PROJECT_VERSION}/ HEAD -o ${SPEC_DIR}/${PROJECT_NAME}_${PROJECT_VERSION}.orig.tar.gz - COMMAND rpmbuild --define=\"%_sourcedir ${SPEC_DIR}\" -ba ${SPEC_DIR}/${PROJECT_NAME}.spec - ) - - add_custom_target(rpm DEPENDS ${PROJECT_NAME}.rpm) - add_dependencies(rpm populate) - set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.rpm") - - if(PACKAGE_MESSAGE) - add_custom_command(TARGET rpm - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${PACKAGE_MESSAGE}") - endif() -endmacro(rpm_package_build) - -macro(project_package_build) - - if(EXISTS ${RPM_TEMPLATE_DIR}) - rpm_package_build() - endif() - - if(EXISTS ${WGT_TEMPLATE_DIR}) - wgt_package_build() - endif() - - if(EXISTS ${DEB_TEMPLATE_DIR}) - deb_package_build() - endif() - -endmacro(project_package_build) - - -macro(project_subdirs_add) - set (ARGSLIST ${ARGN}) # ${ARGN} is special and should be copied - list(LENGTH ARGSLIST ARGSNUM) - if(${ARGSNUM} GREATER 0) - file(GLOB filelist "${ARGV0}") - else() - file(GLOB filelist "*") - endif() - - 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) - -# Include project configuration -# ------------------------------ -project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES ${PROJECT_LANGUAGES}) -set(PROJECT_PKG_DIR "pkgout" CACHE PATH "Subpath to packages") -set(PROJECT_LIB_DIR "libs" CACHE PATH "Subpath to libraries") -set(PROJECT_RESOURCES "data" CACHE PATH "Subpath to data") - -set(AFB_TOKEN "" CACHE PATH "Default AFB_TOKEN") -set(AFB_REMPORT "1234" CACHE PATH "Default AFB_TOKEN") - -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") - -# Env variable overload default -if(DEFINED ENV{INSTALL_PREFIX}) - set (INSTALL_PREFIX $ENV{INSTALL_PREFIX}) -else() - set(INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/Install" CACHE PATH "The path where to install") -endif() -set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX} CACHE STRING "Installation Prefix" FORCE) - -# (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}) - - PROJECT_PKGDEP_ADD(${PKG_CONFIG}) -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 widget directory -set (PKG_TEMPLATE_PREFIX ${CMAKE_SOURCE_DIR}/conf.d/templates CACHE PATH "Default Package Templates Directory") -set(SSH_TEMPLATE_DIR ${PKG_TEMPLATE_PREFIX}/ssh) -set(GDB_TEMPLATE_DIR ${PKG_TEMPLATE_PREFIX}/gdb) -set(WGT_TEMPLATE_DIR ${PKG_TEMPLATE_PREFIX}/wgt) -set(RPM_TEMPLATE_DIR ${PKG_TEMPLATE_PREFIX}/rpm) -set(DEB_TEMPLATE_DIR ${PKG_TEMPLATE_PREFIX}/deb) -set(SPEC_DIR ${CMAKE_SOURCE_DIR}/conf.d/packaging) - - -# Default Linkflag -if(NOT BINDINGS_LINK_FLAG) - set(BINDINGS_LINK_FLAG "-Wl,--version-script=${PKG_TEMPLATE_PREFIX}/cmake/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() - -# Print developer helper message when build is done -# ------------------------------------------------------- -macro(project_closing_msg) - get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS) - if(CLOSING_MESSAGE AND PROJECT_TARGETS) - add_custom_target(${PROJECT_NAME}_build_done ALL - COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}" - ) - add_dependencies(${PROJECT_NAME}_build_done - ${DEPENDENCIES_TARGET} ${PROJECT_TARGETS}) - endif() -endmacro() - -# Add RSYSTARGET -remote_targets_populate() diff --git a/conf.d/templates/cmake/export.map b/conf.d/templates/cmake/export.map deleted file mode 100644 index ee2f413..0000000 --- a/conf.d/templates/cmake/export.map +++ /dev/null @@ -1 +0,0 @@ -{ global: afbBindingV*; local: *; }; diff --git a/conf.d/templates/gdb/gdb-on-target.in b/conf.d/templates/gdb/gdb-on-target.in deleted file mode 100644 index 934668b..0000000 --- a/conf.d/templates/gdb/gdb-on-target.in +++ /dev/null @@ -1,17 +0,0 @@ -# gdb-remote.init file for IDE -# Object: allow to use standard gdb to remote debug a target -# Usage: remote-target-populate update script under ./build directory -# Author: Fulup Ar Foll (IoT.bzh) -# Reference: https://blog.flameeyes.eu/2010/02/remote-debugging-with-gdb-part-2-gdb/ - -# Start gdbserver on target; make sure that gdbserver and binder run in the same directory to access binding symbols, finally connect through SSH link -target remote | ssh @RSYNC_TARGET@ gdbserver - afb-daemon --port=@AFB_REMPORT@ --workdir=@RSYNC_PREFIX@/@PROJECT_NAME@ --roothttp=./htdocs --ldpath=./lib --verbose --token=@AFB_TOKEN@ - -# try to load binding's symbols locally -set auto-solib-add on -set solib-search-path @CMAKE_CURRENT_BINARY_DIR@/@PROJECT_PKG_DIR@/lib - -# Replace run by continue (gdb use 'run' when gdbserver wants 'continue') -define run -continue -end
\ No newline at end of file diff --git a/conf.d/templates/rpm/rpm-config.spec.in b/conf.d/templates/rpm/rpm-config.spec.in deleted file mode 100644 index 950c9d2..0000000 --- a/conf.d/templates/rpm/rpm-config.spec.in +++ /dev/null @@ -1,52 +0,0 @@ -########################################################################### -# Copyright 2015, 2016, 2017 IoT.bzh -# -# author: Fulup Ar Foll <fulup@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. -########################################################################### - - -Name: @PROJECT_NAME@ -Version: @PROJECT_VERSION@ -Release: 1 -License: @PROJECT_LICENCE@ -Summary: @PROJECT_DESCRIPTION@ -Url: @PROJECT_URL@ -Source0: %{name}_%{version}.orig.tar.gz - -Prefix: /opt/@PROJECT_NAME@ -BuildRequires: cmake -BuildRequires: gcc gcc-c++ -BuildRequires: @RPM_PKG_DEPS@ - -BuildRoot:%{_tmppath}/%{name}-%{version}-build - -%description -@PROJECT_DESCRIPTION@ - -%prep -%setup -q - -%build -%cmake -DBINDINGS_INSTALL_PREFIX:PATH=%{_libdir} -%__make %{?_smp_mflags} - -%install -[ -d build ] && cd build -%make_install - -%files -%defattr(-,root,root) -%dir %{_prefix}/* -%{_prefix}/*/* diff --git a/conf.d/templates/ssh/start-on-target.in b/conf.d/templates/ssh/start-on-target.in deleted file mode 100644 index 3bead72..0000000 --- a/conf.d/templates/ssh/start-on-target.in +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# File: start-on-target.sh -# Author: Fulup Ar Foll @ IoT.bzh -# Object: Forward signal (SIGTERM) to remote process -# Created on 24-May-2017, 09:23:37 -# Usage: remote-target-populate update script under ./build directory - -# Do not change manually use 'make remote-target-populate' -export RSYNC_TARGET=@RSYNC_TARGET@ -export PROJECT_NAME=@PROJECT_NAME@ -export RSYNC_PREFIX=@RSYNC_PREFIX@/@PROJECT_NAME@ -export AFB_REMPORT=@AFB_REMPORT@ -export AFB_TOKEN=@AFB_TOKEN@ - -exec ssh -F /dev/null -o PasswordAuthentication=no -o StrictHostKeyChecking=no \ - -o UserKnownHostsFile=/dev/null -o LogLevel=quiet -o ConnectionAttempts=3 \ - -o ConnectTimeout=10 -o ControlMaster=no -o ControlPath=none \ --tt $RSYNC_TARGET << EOF - afb-daemon --workdir=$RSYNC_PREFIX --port=$AFB_REMPORT --roothttp=./htdocs --ldpath=./lib --verbose --token=$AFB_TOKEN & - PID_DAEMON=\$! - - trap "kill -15 \$PID_DAEMON" INT QUIT TERM EXIT - - # wait for daemon to finish - wait \$PID_DAEMON - exit -EOF |