From 21a5759d892fe3f6356b334a4069bdcb83f42688 Mon Sep 17 00:00:00 2001
From: Dominik Holland <dominik.holland@pelagicore.com>
Date: Wed, 15 Mar 2017 15:22:40 +0100
Subject: Update am-config.yaml to not depend anymore on config.yaml from
 appman

All the configurations should now live in am-config.yaml
Instead of using /opt/am as the directory for the apps.db and app
installations /tmp/am should be used.

This should make it easier to get started with neptune-ui development

Change-Id: I52845c38be749c363577d381e4fa765f17739977
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
---
 README.md      |  6 ++----
 am-config.yaml | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 239e509..27b8c4e 100644
--- a/README.md
+++ b/README.md
@@ -39,15 +39,13 @@ This will install all qml files and plugins into the neptune subfolder of $$PWD/
 
 # Run entire UI with the Application Manager
 
-        $ appman --recreate-database -c $AM_CONFIG_FILE -c am-config.yaml
-
-where `AM_CONFIG_FILE` is the path to the Application Manager `config.yaml` file (inside the template-opt folder within the Application Manager delivery). The default `config.yaml` points to the `/opt/am` folder. If that folder does not exists, make sure to update the config.yaml settings to the corresponding paths.
+        $ appman --recreate-database -c am-config.yaml
 
 # Run the UI without QtIvi installed
 
 It is possible to run the UI also without having QtIvi build and installed. For bugreports please make sure to have QtIvi installed.
 
-        $ appman --recreate-database -c $AM_CONFIG_FILE -c am-config.yaml -I dummyimports
+        $ appman --recreate-database -c am-config.yaml -I dummyimports
 
 # Style Configuration
 
diff --git a/am-config.yaml b/am-config.yaml
index 21af701..357e5f0 100644
--- a/am-config.yaml
+++ b/am-config.yaml
@@ -2,9 +2,13 @@ formatVersion: 1
 formatType: am-configuration
 ---
 # basic AM functionality - the builtin apps are in 'apps'.
+# installations will go into the standard /tmp/am hierarchy
 
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
+  installedAppsManifestDir: "/tmp/am/manifests"
+  appImageMountDir: "/tmp/am/image-mounts"
+  database: "/tmp/am/apps.db"
 
 # QML apps will be able to import from modules...
 
@@ -33,3 +37,30 @@ flags:
   noSecurity: yes
   noUiWatchdog: yes
 
+# simulate an internal and a SD-card installation location
+
+installationLocations:
+- id: "internal-0"
+  installationPath: "/tmp/am/apps"
+  documentPath: "/tmp/am/docs"
+  mountPoint: "/tmp"
+  isDefault: true
+
+# useful debug wrappers - mainly for Unix
+# %program% and %arguments% are internal variables
+
+debugWrappers:
+- name: gdbserver
+  command: [ '/usr/bin/gdbserver', ':%port%', '%program%', '%arguments%' ]
+  parameters:  # <name>: <default value>
+    port: 5555
+  supportedRuntimes: [ native, qml ]
+  supportedContainers: [ process ]
+- name: valgrind
+  command: [ '/usr/bin/valgrind', '%program%', '%arguments%' ]
+  supportedRuntimes: [ native, qml ]
+  supportedContainers: [ process ]
+- name: strace
+  command: [ '/usr/bin/strace', '%program%', '%arguments%' ]
+  supportedRuntimes: [ native, qml ]
+  supportedContainers: [ process ]
-- 
cgit v1.2.1