From 9484c653839ef3e8823358ac1e2963d97b056d98 Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Thu, 10 Oct 2013 17:20:58 +0200 Subject: Get miles invoker operational again --- CMakeLists.txt | 18 ++++++++---- apps/samples/miles/miles.html | 2 +- apps/samples/miles/miles.js | 32 +++++++++++++--------- apps/samples/miles/miles.scxml | 16 +++++++---- src/uscxml/URL.cpp | 3 ++ .../plugins/invoker/miles/MilesSessionInvoker.cpp | 2 ++ 6 files changed, 48 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1d5bcf..533106e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -653,15 +653,15 @@ endif() find_package(MILES) if (MILES_FOUND) # openal is only needed for miles - find_package(OpenAL REQUIRED) - find_package(JPEG REQUIRED) - list (APPEND MILES_LIBRARIES "iconv") - list (APPEND MILES_LIBRARIES ${JPEG_LIBRARIES}) - list (APPEND USCXML_INCLUDE_DIRS ${OPENAL_INCLUDE_DIR}) + # find_package(OpenAL REQUIRED) + # find_package(JPEG REQUIRED) + # list (APPEND MILES_LIBRARIES "iconv") + # list (APPEND MILES_LIBRARIES ${JPEG_LIBRARIES}) + # list (APPEND USCXML_INCLUDE_DIRS ${OPENAL_INCLUDE_DIR}) include_directories (${MILES_INCLUDE_DIR}) list (APPEND USCXML_OPT_LIBS ${MILES_LIBRARIES}) - list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}) + # list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}) endif() set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) @@ -756,12 +756,18 @@ else() endif() if (NOT CMAKE_CROSSCOMPILING) set_target_properties(uscxml PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "src/uscxml/pch.h") + set_target_properties(uscxml PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) cotire(uscxml) endif() if (NOT CMAKE_CROSSCOMPILING) add_executable(uscxml-browser apps/uscxml-browser.cpp) target_link_libraries(uscxml-browser uscxml) + if (NOT CMAKE_CROSSCOMPILING) + set_target_properties(uscxml-browser PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) + cotire(uscxml-browser) + endif() + set_target_properties(uscxml-browser PROPERTIES FOLDER "Apps") install_executable(TARGETS uscxml-browser COMPONENT tools) diff --git a/apps/samples/miles/miles.html b/apps/samples/miles/miles.html index 019ead4..9cee058 100644 --- a/apps/samples/miles/miles.html +++ b/apps/samples/miles/miles.html @@ -10,7 +10,7 @@ - +
-
-
+
+
@@ -36,7 +38,11 @@ - + +
+
+
+ diff --git a/src/uscxml/URL.cpp b/src/uscxml/URL.cpp index 8332c1d..93d4c40 100644 --- a/src/uscxml/URL.cpp +++ b/src/uscxml/URL.cpp @@ -530,6 +530,9 @@ void URLFetcher::fetchURL(URL& url) { (curlError = curl_easy_setopt(handle, CURLOPT_URL, url.asString().c_str())) == CURLE_OK || LOG(ERROR) << "Cannot set url to " << url.asString() << ": " << curl_easy_strerror(curlError); + +// (curlError = curl_easy_setopt(handle, CURLOPT_NOSIGNAL, 1)) == CURLE_OK || +// LOG(ERROR) << "Cannot set curl to ignore signals: " << curl_easy_strerror(curlError); (curlError = curl_easy_setopt(handle, CURLOPT_WRITEDATA, url._impl.get())) == CURLE_OK || LOG(ERROR) << "Cannot register this as write userdata: " << curl_easy_strerror(curlError); diff --git a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp index 80bcce8..3a3354a 100644 --- a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp +++ b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp @@ -91,6 +91,8 @@ void MilesSessionInvoker::send(const SendRequest& req) { std::string problemName = "Generic"; Event::getParam(req.params, "problemname", problemName); + return; + int rv; rv = miles_connect_reflector_session((char*)reflectorIP.c_str(), (char*)problemName.c_str()); if (!rv) { -- cgit v0.12