Make the am-config-dev.yaml an additional configuration

Previously the am-config-dev.yaml was standalone like am-config.yaml
It is now an additional configuration file, which just contains the
additional apps directory for the examples.

In addition the examples and the am-config-dev.yaml is now also copied
to the build directory.

Change-Id: I04a6e79930f6c18a90b5815020cdfb2062282125
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>

3 files changed, 3 insertions, 77 deletions

diff --git a/am-config-dev.yaml b/am-config-dev.yaml
index d900b49..98bdfee 100644
--- a/am-config-dev.yaml
+++ b/am-config-dev.yaml
@@ -1,79 +1,5 @@
 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", "${CONFIG_PWD}/examples"]
-  installedAppsManifestDir: "/tmp/am/manifests"
-  appImageMountDir: "/tmp/am/image-mounts"
-  database: "/tmp/am/apps.db"
-
-# QML apps will be able to import from modules...
-
-runtimes:
-  qml:
-    importPaths: [ "${CONFIG_PWD}/imports/shared" ]
-
-# ... as well as the SystemUI
-
-ui:
-  fullscreen: no
-  style: "${CONFIG_PWD}/styles/neptune"
-  mainQml: "${CONFIG_PWD}/Main.qml"
-  importPaths: [ "${CONFIG_PWD}/imports/shared", "${CONFIG_PWD}/imports/system", "${CONFIG_PWD}/sysui" ]
-  windowIcon: "${CONFIG_PWD}/imports/assets/icons/active/apps@96.png"
-
-systemProperties:
-    public:
-      showCluster: yes
-    private:
-      appStoreServerUrl: 'http://chaos.pelagicore.net:8080'
-
-# development setup: no security
-
-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: qmldebugger # can also be used for the qmlprofiler
-  command: ['%program%', '-qmljsdebugger=port:%port%,block', '--qml-debug', '%arguments%' ]
-  parameters:  # <name>: <default value>
-    port: 3456
-  supportedRuntimes: [ qml ]
-  supportedContainers: [ process ]
-- name: cppqmldebugger
-  command: [ '/usr/bin/gdbserver', ':%gdbport%', '%program%', '-qmljsdebugger=port:%qmlport%,block', '--qml-debug', '%arguments%' ]
-  parameters:  # <name>: <default value>
-    gdbport: 5555
-    qmlport: 3456
-  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 ]
+  builtinAppsManifestDir: [ "${CONFIG_PWD}/examples" ]
diff --git a/am-config.yaml b/am-config.yaml
index 59f6939..01a2edc 100644
--- a/am-config.yaml
+++ b/am-config.yaml
@@ -5,7 +5,7 @@ formatType: am-configuration
 # installations will go into the standard /tmp/am hierarchy
 
 applications:
-  builtinAppsManifestDir: "${CONFIG_PWD}/apps"
+  builtinAppsManifestDir: [ "${CONFIG_PWD}/apps" ]
   installedAppsManifestDir: "/tmp/neptune-ui/manifests"
   appImageMountDir: "/tmp/neptune-ui/image-mounts"
   database: "/tmp/neptune-ui/apps.db"
diff --git a/copydata.pro b/copydata.pro
index 4b4cb27..3aaa29a 100644
--- a/copydata.pro
+++ b/copydata.pro
@@ -1,7 +1,7 @@
 TEMPLATE = aux
 
 # Copy all QML files during the build time
-do_copydata.commands = $(COPY_DIR) $$PWD/apps $$PWD/imports $$PWD/sysui $$PWD/styles $$PWD/am-config.yaml $$PWD/Main.qml $$OUT_PWD
+do_copydata.commands = $(COPY_DIR) $$PWD/examples $$PWD/apps $$PWD/imports $$PWD/sysui $$PWD/styles $$PWD/am-config.yaml $$PWD/am-config-dev.yaml $$PWD/Main.qml $$OUT_PWD
 
 first.depends = do_copydata
 !equals(PWD, $$OUT_PWD):QMAKE_EXTRA_TARGETS += first do_copydata