Merge branch 'dev'

Fixed travis.

.travis.yml

@@ -1,23 +1,18 @@
 dist: trusty
 sudo: require
-language: cpp
+language: c
 compiler: gcc
 addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
     packages:
-    - gcc-6
-    - g++-6
     - cmake
     - libjansson-dev
-    - libssl-dev
-    - libcurl4-openssl-dev
+    - openssl
 script:
-- sudo ln -s /usr/bin/gcc-6 /usr/local/bin/gcc
-- sudo ln -s /usr/bin/g++-6 /usr/local/bin/g++
-- export CC=/usr/bin/gcc-6
-- export CXX=/usr/bin/g++-6
+- git clone https://github.com/curl/curl.git && cd curl && ./buildconf && ./configure && make && sudo make install && cd ..
+- git clone https://github.com/akheron/jansson.git && cd jansson && autoreconf -i && ./configure && make && sudo make install && cd ..
 - bash ./scripts/deploy-script.sh
 deploy:
   provider: releases

CMakeLists.txt

@@ -3,6 +3,8 @@ project(FramebotFramework)
 
 find_package(OpenSSL REQUIRED)
 
+set(curl /usr/local/lib/libcurl.so)
+
 add_subdirectory(src)
 add_subdirectory(test)
 add_subdirectory(examples)

examples/CMakeLists.txt

@@ -4,4 +4,4 @@ project(ExampleBots)
 include_directories (${PROJECT_SOURCE_DIR}/../include)
 
 add_executable(echo echo.c)
-target_link_libraries(echo jansson libcurl.so framebot)
+target_link_libraries(echo jansson ${curl} framebot)

scripts/deploy-script.sh

@@ -8,5 +8,4 @@ cd src
 
 zip framebot-bin.zip libframebot.a libframebot_.so
 
-cd ../../
-ls -LR
+cd ../../

src/CMakeLists.txt

@@ -13,10 +13,10 @@ include_directories (${PROJECT_SOURCE_DIR}/../include)
 
 if(CMAKE_SYSTEM_NAME STREQUAL Linux)
 	add_library(framebot_ SHARED framebot.c memory.c objects.c json.c network.c format.c util.c)
-	target_link_libraries(framebot_ jansson libcurl.so)
+	target_link_libraries(framebot_ jansson ${curl})
 
 	add_library(framebot STATIC framebot.c memory.c objects.c json.c network.c format.c util.c)
-	target_link_libraries(framebot jansson libcurl.so)
+	target_link_libraries(framebot jansson ${curl})
 
 	install(TARGETS framebot_ LIBRARY DESTINATION lib)
 	install(TARGETS framebot ARCHIVE DESTINATION lib)

test/CMakeLists.txt

@@ -29,19 +29,19 @@ add_executable(sendmessage test_sendmessage.c)
 add_executable(all_api test_api.c)
 
 if (CMAKE_SYSTEM_NAME STREQUAL Linux)
-	target_link_libraries(test_lib jansson libcurl.so framebot)
-	target_link_libraries(libtest jansson libcurl.so framebot)
-	target_link_libraries(update jansson libcurl.so framebot)
-	target_link_libraries(file jansson libcurl.so framebot)
-	target_link_libraries(userprofilephotos jansson libcurl.so framebot)
-	target_link_libraries(sendphotos jansson libcurl.so framebot)
-	target_link_libraries(sendaudio jansson libcurl.so framebot)
-	target_link_libraries(senddocument jansson libcurl.so framebot)
-	target_link_libraries(sendvideo jansson libcurl.so framebot)
-	target_link_libraries(sendvoice jansson libcurl.so framebot)
-	target_link_libraries(sendvideonote jansson libcurl.so framebot)
-	target_link_libraries(sendmessage jansson libcurl.so framebot)
-	target_link_libraries(all_api jansson libcurl.so framebot)
+	target_link_libraries(test_lib jansson ${curl} framebot)
+	target_link_libraries(libtest jansson ${curl} framebot)
+	target_link_libraries(update jansson ${curl} framebot)
+	target_link_libraries(file jansson ${curl} framebot)
+	target_link_libraries(userprofilephotos jansson ${curl} framebot)
+	target_link_libraries(sendphotos jansson ${curl} framebot)
+	target_link_libraries(sendaudio jansson ${curl} framebot)
+	target_link_libraries(senddocument jansson ${curl} framebot)
+	target_link_libraries(sendvideo jansson ${curl} framebot)
+	target_link_libraries(sendvoice jansson ${curl} framebot)
+	target_link_libraries(sendvideonote jansson ${curl} framebot)
+	target_link_libraries(sendmessage jansson ${curl} framebot)
+	target_link_libraries(all_api jansson ${curl} framebot)
 endif (CMAKE_SYSTEM_NAME STREQUAL Linux)
 
 if (WIN32)