From d352bbd0cd39b1ea31474949d9317a770a41c6ca Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
Date: Tue, 30 Sep 2014 09:49:02 +0000
Subject: Web and Qt HMI

Conflicts:
	strata/genivi-smartdevicelink.morph
	strata/genivi-smartdevicelink/smartdevicelink-qt.morph
---
 strata/genivi-smartdevicelink.morph                 | 21 ++++++++++++++-------
 .../genivi-smartdevicelink/smartdevicelink-qt.morph | 18 ++++++++++++++++++
 .../smartdevicelink-web.morph                       | 10 ++++++++++
 strata/genivi-smartdevicelink/smartdevicelink.morph | 18 ------------------
 4 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 strata/genivi-smartdevicelink/smartdevicelink-qt.morph
 create mode 100644 strata/genivi-smartdevicelink/smartdevicelink-web.morph
 delete mode 100644 strata/genivi-smartdevicelink/smartdevicelink.morph

diff --git a/strata/genivi-smartdevicelink.morph b/strata/genivi-smartdevicelink.morph
index 6dfb3496..ea477f34 100644
--- a/strata/genivi-smartdevicelink.morph
+++ b/strata/genivi-smartdevicelink.morph
@@ -25,10 +25,17 @@ chunks:
   build-depends:
   - libapr-tarball
   - libapr-util-tarball
-#- name: smartdevicelink
-#  morph: strata/genivi-smartdevicelink/smartdevicelink.morph
-#  repo: upstream:smartdevicelink
-#  ref: ct-mcr-1/danielsilverstone/jetson-genivi
-#  unpetrify-ref: 5a59c031430712fe270e72e8521866193c27fa56
-#  build-depends:
-#  - log4cxx
+- name: smartdevicelink-qt
+  morph: strata/genivi-smartdevicelink/smartdevicelink-qt.morph
+  repo: upstream:smartdevicelink
+  ref: ct-mcr-1/danielsilverstone/smartdevicelink
+  unpetrify-ref: ct-mcr-1/danielsilverstone/jetson-genivi
+  build-depends:
+  - log4cxx
+- name: smartdevicelink-web
+  morph: strata/genivi-smartdevicelink/smartdevicelink-web.morph
+  repo: upstream:smartdevicelink
+  ref: ct-mcr-1/danielsilverstone/smartdevicelink
+  unpetrify-ref: ct-mcr-1/danielsilverstone/jetson-genivi
+  build-depends:
+  - log4cxx
diff --git a/strata/genivi-smartdevicelink/smartdevicelink-qt.morph b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph
new file mode 100644
index 00000000..65de97e3
--- /dev/null
+++ b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph
@@ -0,0 +1,18 @@
+name: smartdevicelink
+kind: chunk
+
+configure-commands:
+    - cmake -D HMI2=ON -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-qt" .
+build-commands:
+    - make
+install-commands:
+    - make install DESTDIR=/
+    - mkdir -p $DESTDIR/opt/smartlink/include
+    - mkdir -p $DESTDIR/opt/smartlink/bin
+    - mkdir -p $DESTDIR/opt/smartlink/lib
+    - mkdir -p $DESTDIR/opt/smartlink/HMI
+    - cp -r SDL_Core/bin/* $DESTDIR/opt/smartlink/bin
+    - cp -r SDL_Core/include/* $DESTDIR/opt/smartlink/include
+    - cp -r SDL_Core/lib/* $DESTDIR/opt/smartlink/lib
+    - cp -r SDL_Core/src/components/HMI/* $DESTDIR/opt/smartlink/HMI
+    - echo "/opt/smartlink/HMI/index.html" > $DESTDIR/opt/smartlink/bin/hmi_link 
diff --git a/strata/genivi-smartdevicelink/smartdevicelink-web.morph b/strata/genivi-smartdevicelink/smartdevicelink-web.morph
new file mode 100644
index 00000000..736f9ffc
--- /dev/null
+++ b/strata/genivi-smartdevicelink/smartdevicelink-web.morph
@@ -0,0 +1,10 @@
+name: smartdevicelink
+kind: chunk
+
+configure-commands:
+    - cmake -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-web" .
+build-commands:
+    - make
+install-commands:
+    - make install DESTDIR="$DESTDIR"
+    - rm -rf "$DESTDIR/$(pwd)"
diff --git a/strata/genivi-smartdevicelink/smartdevicelink.morph b/strata/genivi-smartdevicelink/smartdevicelink.morph
deleted file mode 100644
index 1ab5cada..00000000
--- a/strata/genivi-smartdevicelink/smartdevicelink.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: smartdevicelink
-kind: chunk
-
-configure-commands:
-    - cmake -D HMI2=ON .
-build-commands:
-    - make
-install-commands:
-    - make install DESTDIR=/
-    - mkdir -p $DESTDIR/opt/smartlink/include
-    - mkdir -p $DESTDIR/opt/smartlink/bin
-    - mkdir -p $DESTDIR/opt/smartlink/lib
-    - mkdir -p $DESTDIR/opt/smartlink/HMI
-    - cp -r SDL_Core/bin/* $DESTDIR/opt/smartlink/bin
-    - cp -r SDL_Core/include/* $DESTDIR/opt/smartlink/include
-    - cp -r SDL_Core/lib/* $DESTDIR/opt/smartlink/lib
-    - cp -r SDL_Core/src/components/HMI/* $DESTDIR/opt/smartlink/HMI
-    - echo "/opt/smartlink/HMI/index.html" > $DESTDIR/opt/smartlink/bin/hmi_link 
-- 
cgit v1.2.1