summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragaliuzov <agaliuzov@luxoft.com>2016-03-30 18:49:03 +0300
committeragaliuzov <agaliuzov@luxoft.com>2016-03-30 18:49:03 +0300
commit9712f7b229481b3533d0a4d81f39cb3da71f5862 (patch)
tree55a83133ac411cd5294b6845880e1f23cd631651
parent5fa7138d7236617043f86b3cbe5bd8ca63ce4434 (diff)
parentad68c5d08986bb134651d06d22b4860c610b1f0f (diff)
downloadsdl_core-9712f7b229481b3533d0a4d81f39cb3da71f5862.tar.gz
Merge remote-tracking branch 'upstream/master' into develop
-rw-r--r--.travis.yml15
-rw-r--r--README.md4
-rw-r--r--src/components/application_manager/src/message_helper/message_helper.cc1
3 files changed, 18 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..eea4331127
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+language: cpp
+addons:
+ apt:
+ sources:
+ - travis-ci/sqlite3
+ packages:
+ - sqlite3
+before_install:
+ - sudo apt-get -qq update
+ - sudo apt-get install -y libavahi-client-dev libssl-dev libbluetooth3 libbluetooth-dev bluez-tools libudev-dev
+ - sudo add-apt-repository ppa:kalakris/cmake -y
+ - sudo apt-get update -q
+ - sudo apt-get install -y cmake
+script:
+ - mkdir build && cd build && cmake ../ && make && make install \ No newline at end of file
diff --git a/README.md b/README.md
index 7aef5fb253..d87f24dc33 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
[![Slack Status](http://sdlslack.herokuapp.com/badge.svg)](http://slack.smartdevicelink.org)
-
+
+[![Build Status](https://travis-ci.org/smartdevicelink/sdl_core.svg?branch=master)](https://travis-ci.org/smartdevicelink/sdl_core)
+
# SmartDeviceLink (SDL)
SmartDeviceLink (SDL) is a standard set of protocols and messages that connect applications on a smartphone to a vehicle head unit. This messaging enables a consumer to interact with their application using common in-vehicle interfaces such as a touch screen display, embedded voice recognition, steering wheel controls and various vehicle knobs and buttons. There are three main components that make up the SDL ecosystem.
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
index 1c0a9d167b..809947dea1 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -2464,7 +2464,6 @@ bool MessageHelper::PrintSmartObject(const smart_objects::SmartObject& object) {
break;
}
case NsSmartDeviceLink::NsSmartObjects::SmartType_Integer:
- printf("%" PRId64 "\n", object.asInt());
break;
case NsSmartDeviceLink::NsSmartObjects::SmartType_String:
printf("%s", object.asString().c_str());