From 3d50d615fbd4322315dd66859d886576e208b36d Mon Sep 17 00:00:00 2001
From: José Bollo <jose.bollo@iot.bzh>
Date: Tue, 27 Feb 2018 15:07:54 +0100
Subject: Add configuration variables for runtime socket dirs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2 new configuration variables:

 - afm_platform_rundir  (default /run/platform)

     Path to location of platform runtime sockets

 - afm_users_rundir     (default /run/user)

     Path to location of users runtime sockets

Change-Id: I65007fee1ca2ce6f1247a67ba0b121f97c08f209
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---
 scripts/CMakeLists.txt |   6 ++-
 scripts/afm-debug      |  90 -------------------------------------
 scripts/afm-debug.in   |  90 +++++++++++++++++++++++++++++++++++++
 scripts/afm-util       | 117 -------------------------------------------------
 scripts/afm-util.in    | 117 +++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 211 insertions(+), 209 deletions(-)
 delete mode 100755 scripts/afm-debug
 create mode 100755 scripts/afm-debug.in
 delete mode 100755 scripts/afm-util
 create mode 100755 scripts/afm-util.in

(limited to 'scripts')

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index e0f80ac..b1ba1d7 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -19,10 +19,12 @@
 cmake_minimum_required(VERSION 2.8)
 
 if(NOT USE_SDK)
-	install(PROGRAMS afm-util DESTINATION ${CMAKE_INSTALL_BINDIR})
+	configure_file(afm-util.in afm-util)
+	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/afm-util DESTINATION ${CMAKE_INSTALL_BINDIR})
 	install(PROGRAMS afm-install DESTINATION ${CMAKE_INSTALL_BINDIR})
 	if(AGL_DEVEL)
-		install(PROGRAMS afm-debug DESTINATION ${CMAKE_INSTALL_BINDIR})
+		configure_file(afm-debug.in afm-debug)
+		install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/afm-debug DESTINATION ${CMAKE_INSTALL_BINDIR})
 	endif()
 endif()
 
diff --git a/scripts/afm-debug b/scripts/afm-debug
deleted file mode 100755
index 18ecae2..0000000
--- a/scripts/afm-debug
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-###########################################################################
-# Copyright 2017 IoT.bzh
-#
-# Author: Stephane Desneux <sdx@iot.bzh>
-#         Sebastien Douheret <sebastien@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.
-###########################################################################
-
-# This script should be invoked by gdb client through a ssh connection.
-# It relays gdbmi protocol from gdbserver to gdb client
-#
-# WARNING: nothing should be sent to stdout except gdbserver output
-
-# FIXME: add support of --debugger option to support tcf or gdb-remote
-
-
-function error() {
-	echo "ERR: $@" >&2
-	exit 1
-}
-function info() {
-	echo "INF: $@" >&2
-}
-
-# setup debug dir (shared with service file)
-DBGDIR=/var/run/afm-debug
-mkdir -p $DBGDIR
-
-# check application name passed as first arg by gdb
-APP=$1
-[[ -z "$APP" ]] && error "Invalid application name"
-
-# redirect to log file
-exec 2>$DBGDIR/$APP.dbgclt.log
-
-# activate DEBUG in environment file sourced in systemd service
-AFB_WAIT_POINT="start-start"
-echo "AFB_DEBUG_WAIT=$AFB_WAIT_POINT" >$DBGDIR/$APP.env
-
-# remove debug env file on exit
-trap "rm $DBGDIR/$APP.*" STOP INT QUIT EXIT
-
-# ask appfw to start application
-pid=$(afm-util start $APP)
-[[ -z "$pid" || ! -e "/proc/$pid" ]] && error "Failed to start application $APP"
-info "$APP started with pid=$pid"
-
-# wait debugging process is stop/waiting at start-start point
-AFB_FILE=/tmp/afb-debug-$pid
-tmo=100
-info "Waiting for process stopped..."
-while [[ ! -e "$AFB_FILE" ]]; do
-    sleep 0.1
-    tmo=$(expr $tmo - 1)
-    [[ "$tmo" == "0" ]] && error "Timeout waiting for process $pid stopped"
-done
-
-info "Waiting for process stopped..."
-AFB_WAIT_FILE=/tmp/afb-debug-$pid
-tmo=100
-res=1
-while [[ "$res" != "0" ]]; do
-    sleep 0.1
-    tmo=$(expr $tmo - 1)
-    [[ "$tmo" == "0" ]] && error "Timeout waiting for process $pid stopped"
-    grep $AFB_WAIT_POINT $AFB_WAIT_FILE > /dev/null 2>&1
-    res=$?
-done
-
-# debugging
-info "Attaching gdbserver to pid $pid ..."
-gdbserver --attach - $pid
-
-# end of debug session
-info "proxy connection terminated - killing $APP (pid $pid)"
-afm-util kill $pid >&2
-info "$APP killed"
diff --git a/scripts/afm-debug.in b/scripts/afm-debug.in
new file mode 100755
index 0000000..e676469
--- /dev/null
+++ b/scripts/afm-debug.in
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+###########################################################################
+# Copyright 2017 IoT.bzh
+#
+# Author: Stephane Desneux <sdx@iot.bzh>
+#         Sebastien Douheret <sebastien@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.
+###########################################################################
+
+# This script should be invoked by gdb client through a ssh connection.
+# It relays gdbmi protocol from gdbserver to gdb client
+#
+# WARNING: nothing should be sent to stdout except gdbserver output
+
+# FIXME: add support of --debugger option to support tcf or gdb-remote
+
+
+function error() {
+	echo "ERR: $@" >&2
+	exit 1
+}
+function info() {
+	echo "INF: $@" >&2
+}
+
+# setup debug dir (shared with service file)
+DBGDIR=@afm_platform_rundir@/debug
+mkdir -p $DBGDIR
+
+# check application name passed as first arg by gdb
+APP=$1
+[[ -z "$APP" ]] && error "Invalid application name"
+
+# redirect to log file
+exec 2>$DBGDIR/$APP.dbgclt.log
+
+# activate DEBUG in environment file sourced in systemd service
+AFB_WAIT_POINT="start-start"
+echo "AFB_DEBUG_WAIT=$AFB_WAIT_POINT" >$DBGDIR/$APP.env
+
+# remove debug env file on exit
+trap "rm $DBGDIR/$APP.*" STOP INT QUIT EXIT
+
+# ask appfw to start application
+pid=$(afm-util start $APP)
+[[ -z "$pid" || ! -e "/proc/$pid" ]] && error "Failed to start application $APP"
+info "$APP started with pid=$pid"
+
+# wait debugging process is stop/waiting at start-start point
+AFB_FILE=/tmp/afb-debug-$pid
+tmo=100
+info "Waiting for process stopped..."
+while [[ ! -e "$AFB_FILE" ]]; do
+    sleep 0.1
+    tmo=$(expr $tmo - 1)
+    [[ "$tmo" == "0" ]] && error "Timeout waiting for process $pid stopped"
+done
+
+info "Waiting for process stopped..."
+AFB_WAIT_FILE=/tmp/afb-debug-$pid
+tmo=100
+res=1
+while [[ "$res" != "0" ]]; do
+    sleep 0.1
+    tmo=$(expr $tmo - 1)
+    [[ "$tmo" == "0" ]] && error "Timeout waiting for process $pid stopped"
+    grep $AFB_WAIT_POINT $AFB_WAIT_FILE > /dev/null 2>&1
+    res=$?
+done
+
+# debugging
+info "Attaching gdbserver to pid $pid ..."
+gdbserver --attach - $pid
+
+# end of debug session
+info "proxy connection terminated - killing $APP (pid $pid)"
+afm-util kill $pid >&2
+info "$APP killed"
diff --git a/scripts/afm-util b/scripts/afm-util
deleted file mode 100755
index c5e48eb..0000000
--- a/scripts/afm-util
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/bash
-
-send() {
-	afb-client-demo -H -d unix:/run/afm/apis/ws/afm-main "$1" "$2" |
-	awk '$1=="ON-REPLY-FAIL"{$1="ERROR:";$2="";print;exit 1;}NR>1'
-}
-
-case "$1" in
-
-  list|runnables)
-    send runnables true
-    ;;
-
-  add|install)
-    f=$(realpath $2)
-    r=true
-    if [[ "$(basename $0)" = "afm-install" ]]; then r=false; fi
-    send install '{"wgt":"'"$f"'","force":true,"reload":'"$r"'}'
-    ;;
-
-  remove|uninstall)
-    i=$2
-    send uninstall "\"$i\""
-    ;;
-
-  info|detail)
-    i=$2
-    send detail "\"$i\""
-    ;;
-
-  ps|runners)
-    send runners true
-    ;;
-
-  run|start)
-    i=$2
-    send start "\"$i\""
-    ;;
-
-  run-remote|start-remote)
-    i=$2
-    send start '{"id":"'"$i"'","mode":"remote"}'
-    ;;
-
-  once)
-    i=$2
-    send once "\"$i\""
-    ;;
-
-  terminate|kill)
-    i=$2
-    send terminate "$i"
-    ;;
-
-  stop|pause)
-    i=$2
-    send pause "$i"
-    ;;
-
-  resume|continue)
-    i=$2
-    send resume "$i"
-    ;;
-
-  state|status)
-    i=$2
-    send state "$i"
-    ;;
-
-  -h|--help|help)
-    cat << EOC
-usage: $(basename $0) command [arg]
-
-The commands are:
-
-  list
-  runnables      list the runnable widgets installed
-
-  add wgt
-  install wgt    install the wgt file
-
-  remove id
-  uninstall id   remove the installed widget of id
-
-  info id
-  detail id      print detail about the installed widget of id
-
-  ps
-  runners        list the running instance
-
-  run id
-  start id       start an instance of the widget of id
-
-  once id        run once an instance of the widget of id
-
-  kill rid
-  terminate rid  terminate the running instance rid
-
-  stop rid
-  pause rid      pause the running instance rid
-
-  resume rid
-  continue rid   continue the previously paused rid
-
-  status rid
-  state rid      get status of the running instance rid
-
-EOC
-    ;;
-
-  *)
-    echo "unknown command $1" >&2
-    exit 1
-    ;;
-esac
-
-
diff --git a/scripts/afm-util.in b/scripts/afm-util.in
new file mode 100755
index 0000000..40bc7da
--- /dev/null
+++ b/scripts/afm-util.in
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+send() {
+	afb-client-demo -H -d unix:@afm_platform_rundir@/apis/ws/afm-main "$1" "$2" |
+	awk '$1=="ON-REPLY-FAIL"{$1="ERROR:";$2="";print;exit 1;}NR>1'
+}
+
+case "$1" in
+
+  list|runnables)
+    send runnables true
+    ;;
+
+  add|install)
+    f=$(realpath $2)
+    r=true
+    if [[ "$(basename $0)" = "afm-install" ]]; then r=false; fi
+    send install '{"wgt":"'"$f"'","force":true,"reload":'"$r"'}'
+    ;;
+
+  remove|uninstall)
+    i=$2
+    send uninstall "\"$i\""
+    ;;
+
+  info|detail)
+    i=$2
+    send detail "\"$i\""
+    ;;
+
+  ps|runners)
+    send runners true
+    ;;
+
+  run|start)
+    i=$2
+    send start "\"$i\""
+    ;;
+
+  run-remote|start-remote)
+    i=$2
+    send start '{"id":"'"$i"'","mode":"remote"}'
+    ;;
+
+  once)
+    i=$2
+    send once "\"$i\""
+    ;;
+
+  terminate|kill)
+    i=$2
+    send terminate "$i"
+    ;;
+
+  stop|pause)
+    i=$2
+    send pause "$i"
+    ;;
+
+  resume|continue)
+    i=$2
+    send resume "$i"
+    ;;
+
+  state|status)
+    i=$2
+    send state "$i"
+    ;;
+
+  -h|--help|help)
+    cat << EOC
+usage: $(basename $0) command [arg]
+
+The commands are:
+
+  list
+  runnables      list the runnable widgets installed
+
+  add wgt
+  install wgt    install the wgt file
+
+  remove id
+  uninstall id   remove the installed widget of id
+
+  info id
+  detail id      print detail about the installed widget of id
+
+  ps
+  runners        list the running instance
+
+  run id
+  start id       start an instance of the widget of id
+
+  once id        run once an instance of the widget of id
+
+  kill rid
+  terminate rid  terminate the running instance rid
+
+  stop rid
+  pause rid      pause the running instance rid
+
+  resume rid
+  continue rid   continue the previously paused rid
+
+  status rid
+  state rid      get status of the running instance rid
+
+EOC
+    ;;
+
+  *)
+    echo "unknown command $1" >&2
+    exit 1
+    ;;
+esac
+
+
-- 
cgit