From 42e5f14ffa00542385d0d60ee8b00494f590ab8c Mon Sep 17 00:00:00 2001
From: Stephane Desneux <stephane.desneux@iot.bzh>
Date: Mon, 28 Aug 2017 19:05:20 +0200
Subject: templates.d: adjustments for xds (gdb*.ini, xds-project-target.conf)

Change-Id: Ic3b029793670aac617d6d23e67ce15084f855cdb
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
---
 template.d/gdb-native-target.ini.in   | 35 -------------------------------
 template.d/gdb-on-target.ini.in       | 39 +++++++++++++++++++++++++++++++++++
 template.d/xds-project-target.conf.in | 12 +++++++++++
 3 files changed, 51 insertions(+), 35 deletions(-)
 delete mode 100644 template.d/gdb-native-target.ini.in
 create mode 100644 template.d/gdb-on-target.ini.in
 create mode 100644 template.d/xds-project-target.conf.in

diff --git a/template.d/gdb-native-target.ini.in b/template.d/gdb-native-target.ini.in
deleted file mode 100644
index 1ba6bdb..0000000
--- a/template.d/gdb-native-target.ini.in
+++ /dev/null
@@ -1,35 +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/
-#
-# Warning: In remote native mode netbeans impose debug-command to point on a local instance of afb-daemon binary
-
-# Fulup Hoops: --ldpath should be absolute as solib-search-path refuse to work as documented
-
-# Start gdbserver on target and connect through SSH link WARNING:
-target remote | ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null @RSYNC_TARGET@ gdbserver - afb-daemon --port=@AFB_REMPORT@ --workdir=$HOME/@RSYNC_PREFIX@/@PROJECT_NAME@ --roothttp=htdocs --ldpaths=$HOME/@RSYNC_PREFIX@/@PROJECT_NAME@/lib --verbose --token=@AFB_TOKEN@
-
-# Disable auto answer no on questions and to set breakpoint
-set confirm off
-
-# Disable auto load of libraries to improved perf
-set auto-solib-add off
-
-# Define path for project libraries
-set solib-search-path ${PROJECT_PKG_BUILD_DIR}
-
-# Replace run by continue (gdb use 'run' when gdbserver wants 'continue')
-define run
-continue
-end
-
-# Manually load project libraries when loaded by afb-daemon
-tbreak @GDB_INITIAL_BREAK@
-commands
-sharedlibrary @RSYNC_PREFIX@/@PROJECT_NAME@
-continue
-end
-
-
diff --git a/template.d/gdb-on-target.ini.in b/template.d/gdb-on-target.ini.in
new file mode 100644
index 0000000..20c8d30
--- /dev/null
+++ b/template.d/gdb-on-target.ini.in
@@ -0,0 +1,39 @@
+# 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/
+#
+# Warning:
+#  - on target start with $GDB ./target/gdb-cross-root@$TARGET.ini  
+#  - Netbeans impose debug-command to point on a local instance of afb-daemon binary
+#  - --ldpath should be absolute as solib-search-path refuse to work as documented
+
+# xds-gdb annotation to point where it should 
+# :XDS-ENV: XDS_PROJECT_ID=@XDS_PROJECT_ID@
+# :XDS-ENV: XDS_SDK_ID=@XDS_SDK_ID@
+# :XDS-ENV: XDS_SERVER_URL=@XDS_SERVER_URL@
+
+# Start gdbserver on target and connect through SSH link WARNING:
+target remote | ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null @RSYNC_TARGET@ gdbserver - \
+       /usr/bin/afb-daemon --port=@AFB_REMPORT@ --workdir=@RSYNC_PREFIX@/@PROJECT_NAME@ --roothttp=htdocs --ldpaths=@RSYNC_PREFIX@/@PROJECT_NAME@/lib --verbose --token=@AFB_TOKEN@
+
+# Disable auto answer no on questions and to set breakpoint
+set confirm off
+
+# Disable auto load of libraries to improved perf
+set auto-solib-add off
+
+# Define path for project libraries
+set solib-search-path ${PROJECT_PKG_BUILD_DIR}
+
+# Replace run by continue done by xds-gdb
+
+# Manually load project libraries when loaded by afb-daemon
+tbreak @GDB_INITIAL_BREAK@
+commands
+sharedlibrary @RSYNC_PREFIX@/@PROJECT_NAME@
+continue
+end
+
+
diff --git a/template.d/xds-project-target.conf.in b/template.d/xds-project-target.conf.in
new file mode 100644
index 0000000..814597c
--- /dev/null
+++ b/template.d/xds-project-target.conf.in
@@ -0,0 +1,12 @@
+#
+#       Cmake generated Do Not Edit
+# 
+# Template:  conf.d/app-templates/template.d/xds-project.conf.in
+# Values:  $HOME/.config/app-templates/cmake/xx-projectname-xds.cmake
+#
+# WARNING: in Xdev mode $HOME is ~devel HOME on xds-docker
+#
+export XDS_SERVER_URL=@XDS_SERVER_URL@
+export XDS_PROJECT_ID=@XDS_PROJECT_ID@
+export XDS_SDK_ID=@XDS_SDK_ID@
+
-- 
cgit 1.2.3-korg