Updating packaging to remove hard coded paths

Change-Id: I923fe718b6e6b0ff6083e703512e0f2ad489b555

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index 9e846b8..0000000
--- a/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-PROJECT = Modello_Common
-
-VERSION := 0.0.2
-PACKAGE = $(PROJECT)-$(VERSION)
-
-INSTALL_DIR = ${DESTDIR}/opt/usr/apps/_common
-
-all:
-
-install:
-       @echo "Installing Common UI files package, stand by..."
-       mkdir -p $(INSTALL_DIR)/css
-       mkdir -p $(INSTALL_DIR)/js
-       cp -r css $(INSTALL_DIR)/
-       cp -r js $(INSTALL_DIR)/
-

diff --git a/css/car/components/topBarIcons/topBarIcons.js b/css/car/components/topBarIcons/topBarIcons.js
index ce7d0b2..579c9ff 100644 (file)
--- a/css/car/components/topBarIcons/topBarIcons.js
+++ b/css/car/components/topBarIcons/topBarIcons.js
@@ -219,7 +219,7 @@ function launchApplication(id) {
                                        for (i = 0; i < list.length; i++) {
                                                var app = list[i];
                                                var subName = app.name.substr(7);
-                                               subName = subName.replace(/\./g, "_").replace(/\ /g, "_");
+                                               subName = subName.replace(/\./g, "").replace(/\ /g, "");
                                                if (app.name.indexOf('Modello') >= 0) {
                                                        var newApp = {
                                                                id: app.id,

diff --git a/js/services/carIndicator.js b/js/services/carIndicator.js
index 3b96afd..6b6a326 100644 (file)
--- a/js/services/carIndicator.js
+++ b/js/services/carIndicator.js
@@ -88,6 +88,11 @@ var CarIndicator = function() {
        console.info("Starting up service CarIndicator");
 };
 
+if (typeof Zone !== 'function')
+{
+       window.Zone = function(){return undefined;};
+}
+
 function parseInteger(value) {
        "use strict";
        return parseInt(value, 10);
@@ -459,14 +464,14 @@ CarIndicator.prototype.addListener = function(aCallbackObject) {
                                        var zone = mapping.zone;
                                        var subscribeName = signal;
 
-                                       if (mapping.subscribeName !== undefined) {
+                                       if (mapping.subscribeName !== "undefined") {
                                                subscribeName = mapping.subscribeName;
                                        }
 
                                        if (mapping.callBackPropertyName.toLowerCase() === prop.toLowerCase() && !mapping.subscribeCount) {
-                                               mapping.subscribeCount = typeof (mapping.subscribeCount) === 'undefined' ? 0 : mapping.subscribeCount++;
+                                               mapping.subscribeCount = typeof (mapping.subscribeCount) === "undefined" ? 0 : mapping.subscribeCount++;
 
-                                               if (typeof (tizen) !== 'undefined' && tizen.vehicle !== undefined && tizen.vehicle[subscribeName] !== undefined) {
+                                               if (typeof (tizen.vehicle[subscribeName]) !== "undefined") {
                                                        if (!(subscribeName.toString().trim().toLowerCase() === "nightmode" && id === this._listenerIDs[0])) {
                                                                if (tizen.vehicle[subscribeName]){
                                                                        var setUpData = tizen.vehicle[subscribeName].get(zone);
@@ -474,13 +479,13 @@ CarIndicator.prototype.addListener = function(aCallbackObject) {
                                                                                self.onDataUpdate(setUpData, self, id);
                                                                }
                                                        }
-                                                       if (typeof (tizen.vehicle[subscribeName].subscribe) !== undefined)
+                                                       if (typeof (tizen.vehicle[subscribeName].subscribe) !== "undefined")
                                                        {
                                                                console.log("Modello: Subscribing to AMB signal - " + subscribeName);
                                                                tizen.vehicle[subscribeName].subscribe(subscribeCallback, zone);
                                                        }
                                                } else {
-                                                       if (tizen.vehicle[subscribeName] === undefined)
+                                                       if (typeof (tizen.vehicle[subscribeName]) === "undefined")
                                                                console.warn(subscribeName + " is not available to subscribe to");
                                                        else
                                                                console.warn("Tizen API is not available, cannot subscribe to signal", signal);

diff --git a/packaging/modello-common.changes b/packaging/modello-common.changes
index d3a7b5e..9b8d6de 100644 (file)
--- a/packaging/modello-common.changes
+++ b/packaging/modello-common.changes
@@ -1,3 +1,6 @@
+* Thu Sep 18 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140911.180109-1-g4b1ba8c
+- Updating packaging to remove hard coded paths
+
 * Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140821.133859-3-gf761b8f
 - Removing space in app name - Fix for TC-1404 Updating tizen.vehicle API to use the new API
 

diff --git a/packaging/modello-common.spec b/packaging/modello-common.spec
index 9401bd3..821ff38 100644 (file)
--- a/packaging/modello-common.spec
+++ b/packaging/modello-common.spec
@@ -13,12 +13,12 @@ A proof of concept pure html5 UI
 %prep
 %setup -q -n %{name}-%{version}
 
-%build
-
 %install
-rm -rf %{buildroot}
-%make_install
+mkdir -p %{buildroot}%{_datadir}/Modello/Common/
+cp -r css %{buildroot}%{_datadir}/Modello/Common/
+cp -r js %{buildroot}%{_datadir}/Modello/Common/
 
 %files
 %defattr(-,root,root,-)
-/opt/usr/apps/_common/*
+%{_datadir}/Modello/Common/js
+%{_datadir}/Modello/Common/css