2017-03-10 00:01:46 +00:00
|
|
|
find_package(GTest ${GTEST_PACKAGE_CONFIG})
|
2017-02-10 23:39:10 +00:00
|
|
|
|
|
|
|
|
set(INCLUDE_PATH "${ACL_SOURCE_DIR}/include"
|
2017-05-18 05:02:48 +00:00
|
|
|
"${GTEST_INCLUDE_DIRS}"
|
|
|
|
|
"${KWD_SOURCE_DIR}/include"
|
|
|
|
|
"${KITTAI_SOURCE_DIR}/include"
|
|
|
|
|
"${KITTAI_KEY_WORD_DETECTOR_INCLUDE_DIR}"
|
2017-06-09 23:23:31 +00:00
|
|
|
"${SENSORY_SOURCE_DIR}/include"
|
|
|
|
|
"${SENSORY_KEY_WORD_DETECTOR_INCLUDE_DIR}"
|
2017-05-18 05:02:48 +00:00
|
|
|
"${AIP_SOURCE_DIR}/include"
|
2017-05-26 23:06:14 +00:00
|
|
|
"${SpeechSynthesizer_SOURCE_DIR}/include"
|
2017-07-18 22:25:37 +00:00
|
|
|
"${Alerts_SOURCE_DIR}/include"
|
|
|
|
|
"${AVSSystem_SOURCE_DIR}/include"
|
2017-05-26 23:06:14 +00:00
|
|
|
"${GST_INCLUDE_DIRS}"
|
2017-06-23 23:26:34 +00:00
|
|
|
"${AVSCommon_INCLUDE_DIRS}"
|
2017-08-08 00:04:43 +00:00
|
|
|
"${AudioPlayer_INCLUDE_DIRS}"
|
2017-12-09 00:07:37 +00:00
|
|
|
"${AudioResources_INCLUDE_DIRS}"
|
2017-05-26 23:06:14 +00:00
|
|
|
"${MediaPlayer_SOURCE_DIR}/include"
|
2018-01-12 23:45:42 +00:00
|
|
|
"${PlaybackController_SOURCE_DIR}/include"
|
2017-05-18 05:02:48 +00:00
|
|
|
"${CONTEXTMANAGER_SOURCE_DIR}/include")
|
2017-02-10 23:39:10 +00:00
|
|
|
|
Version 1.7.0 of the avs-device-sdk
Changes in this update:
**Enhancements**
* `AuthDelegate` and `AuthServer.py` have been replaced by `CBLAUthDelegate`, which provides a more straightforward path to authorization.
* Added a new configuration property called [`cblAuthDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L2). This object specifies parameters for `CBLAuthDelegate`.
* Added a new configuration property called [`miscDatabase`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L34), which is a generic key/value database to be used by various components.
* Added a new configuration property called [`dcfDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L17) This object specifies parameters for `DCFDelegate`. Within this object, values were added for the 'endpoint' and `overridenDcfPublishMessageBody`. 'endpoint' is the endpoint to connect to in order to send device capabilities. `overridenDcfPublishMessageBody`is the message that will get sent out to the Capabilities API. Note: values within the `dcfDelegate` object will only work in `DEBUG` builds.
* Added a new configuration property called [`deviceInfo`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L9) which specifies device-identifying information for use by the Device Capability Framework (DCF), and for authorization (CBLAuthDelegate).
* Updated the Directive Sequencer to support wildcard directive handlers. This allows a handler for a given AVS interface to register at the namespace level, rather than specifying the names of all directives within that namespace.
* Updated the Raspberry Pi installation script to include `alsasink` in the configuration file.
* Added `audioSink` as a configuration option. This allows users to override the audio sink element used in `Gstreamer`.
* Added an interface for monitoring internet connection status: `InternetConnectionMonitorInterface.h`.
* The Alexa Communications Library (ACL) is no longer required to wait until authorization has succeeded before attempting to connect to AVS. Instead, `HTTP2Transport` handles waiting for authorization to complete.
* Added the Device Capabilities Framework (DCF) delegate. Device capabilities can now be sent for each capability interface using DCF publish messages.
* The sample app has been updated to send DCF publish messages, which will automatically occur when the sample app starts. Note: a DCF publish message must be successfully sent in order for communication with AVS to occur.
* The SDK now supports HTTP PUT messages.
* Added support for opt-arg style arguments and multiple configuration files. Now, the sample app can be invoked by either of these commands: `SampleApp <configfile> <debuglevel>` OR `SampleApp -C file1 -C file2 ... -L loglevel`.
**Bug Fixes**
* Issues [447](https://github.com/alexa/avs-device-sdk/issues/447) and [553](https://github.com/alexa/avs-device-sdk/issues/553) Fixed the `AttachmentRenderSource`'s handling of `BLOCKING` `AttachmentReaders`.
* Updated the `Logger` implementation to be more resilient to `nullptr` string inputs.
* Fixed a `TimeUtils` utility-related compile issue.
* Fixed a bug in which alerts failed to activate if the system was restarted without network connection.
* Fixed Android 64-bit build failure issue.
**Known Issues**
* The `ACL` may encounter issues if audio attachments are received but not consumed.
* `SpeechSynthesizerState` currently uses `GAINING_FOCUS` and `LOSING_FOCUS` as a workaround for handling intermediate state. These states may be removed in a future release.
* Some ERROR messages may be printed during start-up event if initialization proceeds normally and successfully.
* If an unrecoverable authorization error or an unrecoverable DCF error is encountered, the sample app may crash on shutdown.
* If a non-CBL `clientId` is included in the `deviceInfo` section of `AlexaClientSDKConfig.json`, the error will be reported as an unrecoverable authorization error, rather than a more specific error.
2018-04-18 22:17:28 +00:00
|
|
|
set(LINK_PATH ACL ADSL AFML AIP Alerts AudioPlayer AVSSystem CBLAuthDelegate ContextManager Integration gtest gmock KWD PlaybackController SpeechSynthesizer)
|
2017-06-09 23:23:31 +00:00
|
|
|
|
2017-05-26 23:06:14 +00:00
|
|
|
if(KITTAI_KEY_WORD_DETECTOR)
|
2017-06-09 23:23:31 +00:00
|
|
|
SET(LINK_PATH ${LINK_PATH} KITTAI)
|
2017-05-26 23:06:14 +00:00
|
|
|
endif()
|
2017-06-09 23:23:31 +00:00
|
|
|
if(SENSORY_KEY_WORD_DETECTOR)
|
|
|
|
|
SET(LINK_PATH ${LINK_PATH} SENSORY)
|
|
|
|
|
endif()
|
|
|
|
|
if(GSTREAMER_MEDIA_PLAYER)
|
|
|
|
|
SET(LINK_PATH ${LINK_PATH} MediaPlayer)
|
|
|
|
|
add_definitions(-DGSTREAMER_MEDIA_PLAYER)
|
2017-05-26 23:06:14 +00:00
|
|
|
endif()
|
2017-05-18 05:02:48 +00:00
|
|
|
|
|
|
|
|
# Define a variable for the audio inputs.
|
|
|
|
|
set(INTEGRATION_INPUTS "${Integration_SOURCE_DIR}/inputs")
|
|
|
|
|
|
|
|
|
|
# Copy SDK Json file to the build directory.
|
|
|
|
|
set(SDK_CONFIG_FILENAME "AlexaClientSDKConfig.json")
|
|
|
|
|
set(SDK_CONFIG_FILE_SOURCE "${Integration_SOURCE_DIR}/${SDK_CONFIG_FILENAME}")
|
|
|
|
|
set(SDK_CONFIG_FILE_TARGET "${Integration_BINARY_DIR}/${SDK_CONFIG_FILENAME}")
|
|
|
|
|
# Use configure_file to support variable substitution later.
|
|
|
|
|
configure_file("${SDK_CONFIG_FILE_SOURCE}" "${SDK_CONFIG_FILE_TARGET}")
|
|
|
|
|
|
Version 1.7.0 of the avs-device-sdk
Changes in this update:
**Enhancements**
* `AuthDelegate` and `AuthServer.py` have been replaced by `CBLAUthDelegate`, which provides a more straightforward path to authorization.
* Added a new configuration property called [`cblAuthDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L2). This object specifies parameters for `CBLAuthDelegate`.
* Added a new configuration property called [`miscDatabase`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L34), which is a generic key/value database to be used by various components.
* Added a new configuration property called [`dcfDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L17) This object specifies parameters for `DCFDelegate`. Within this object, values were added for the 'endpoint' and `overridenDcfPublishMessageBody`. 'endpoint' is the endpoint to connect to in order to send device capabilities. `overridenDcfPublishMessageBody`is the message that will get sent out to the Capabilities API. Note: values within the `dcfDelegate` object will only work in `DEBUG` builds.
* Added a new configuration property called [`deviceInfo`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L9) which specifies device-identifying information for use by the Device Capability Framework (DCF), and for authorization (CBLAuthDelegate).
* Updated the Directive Sequencer to support wildcard directive handlers. This allows a handler for a given AVS interface to register at the namespace level, rather than specifying the names of all directives within that namespace.
* Updated the Raspberry Pi installation script to include `alsasink` in the configuration file.
* Added `audioSink` as a configuration option. This allows users to override the audio sink element used in `Gstreamer`.
* Added an interface for monitoring internet connection status: `InternetConnectionMonitorInterface.h`.
* The Alexa Communications Library (ACL) is no longer required to wait until authorization has succeeded before attempting to connect to AVS. Instead, `HTTP2Transport` handles waiting for authorization to complete.
* Added the Device Capabilities Framework (DCF) delegate. Device capabilities can now be sent for each capability interface using DCF publish messages.
* The sample app has been updated to send DCF publish messages, which will automatically occur when the sample app starts. Note: a DCF publish message must be successfully sent in order for communication with AVS to occur.
* The SDK now supports HTTP PUT messages.
* Added support for opt-arg style arguments and multiple configuration files. Now, the sample app can be invoked by either of these commands: `SampleApp <configfile> <debuglevel>` OR `SampleApp -C file1 -C file2 ... -L loglevel`.
**Bug Fixes**
* Issues [447](https://github.com/alexa/avs-device-sdk/issues/447) and [553](https://github.com/alexa/avs-device-sdk/issues/553) Fixed the `AttachmentRenderSource`'s handling of `BLOCKING` `AttachmentReaders`.
* Updated the `Logger` implementation to be more resilient to `nullptr` string inputs.
* Fixed a `TimeUtils` utility-related compile issue.
* Fixed a bug in which alerts failed to activate if the system was restarted without network connection.
* Fixed Android 64-bit build failure issue.
**Known Issues**
* The `ACL` may encounter issues if audio attachments are received but not consumed.
* `SpeechSynthesizerState` currently uses `GAINING_FOCUS` and `LOSING_FOCUS` as a workaround for handling intermediate state. These states may be removed in a future release.
* Some ERROR messages may be printed during start-up event if initialization proceeds normally and successfully.
* If an unrecoverable authorization error or an unrecoverable DCF error is encountered, the sample app may crash on shutdown.
* If a non-CBL `clientId` is included in the `deviceInfo` section of `AlexaClientSDKConfig.json`, the error will be reported as an unrecoverable authorization error, rather than a more specific error.
2018-04-18 22:17:28 +00:00
|
|
|
# Copy Adapter SDK Json file to the build directory.
|
|
|
|
|
set(SDK_ADAPTERS_CONFIG_FILENAME "ExternalMediaPlayerAdapters.json")
|
|
|
|
|
set(SDK_ADAPTERS_CONFIG_FILE_SOURCE "${Integration_SOURCE_DIR}/${SDK_ADAPTERS_CONFIG_FILENAME}")
|
|
|
|
|
set(SDK_ADAPTERS_CONFIG_FILE_TARGET "${Integration_BINARY_DIR}/${SDK_ADAPTERS_CONFIG_FILENAME}")
|
|
|
|
|
|
|
|
|
|
if(EXISTS "${SDK_ADAPTERS_CONFIG_FILE_SOURCE}")
|
|
|
|
|
# Use configure_file to support variable substitution later.
|
|
|
|
|
configure_file("${SDK_ADAPTERS_CONFIG_FILE_SOURCE}" "${SDK_ADAPTERS_CONFIG_FILE_TARGET}")
|
|
|
|
|
endif()
|
2017-02-10 23:39:10 +00:00
|
|
|
|
|
|
|
|
if(BUILD_TESTING)
|
2018-02-12 23:31:53 +00:00
|
|
|
add_custom_target(integration
|
|
|
|
|
COMMAND ${CMAKE_CTEST_COMMAND} -L Integration -C Integration --output-on-failure)
|
|
|
|
|
include(${Integration_BINARY_DIR}/CTestCustom.cmake OPTIONAL)
|
2017-07-18 22:25:37 +00:00
|
|
|
set(testSourceFiles
|
|
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/AlexaAuthorizationDelegateTest.cpp"
|
|
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/AlexaCommunicationsLibraryTest.cpp"
|
|
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/AlexaDirectiveSequencerLibraryTest.cpp"
|
|
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/AudioInputProcessorIntegrationTest.cpp"
|
2017-08-17 00:13:40 +00:00
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/ServerDisconnectIntegrationTest.cpp"
|
2017-07-18 22:25:37 +00:00
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/SpeechSynthesizerIntegrationTest.cpp"
|
2017-08-08 00:04:43 +00:00
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/AlertsIntegrationTest.cpp"
|
|
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/AudioPlayerIntegrationTest.cpp")
|
2017-07-18 22:25:37 +00:00
|
|
|
# file(GLOB_RECURSE testSourceFiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*Test.cpp")
|
2017-02-10 23:39:10 +00:00
|
|
|
foreach (testSourceFile IN LISTS testSourceFiles)
|
|
|
|
|
get_filename_component(testName ${testSourceFile} NAME_WE)
|
|
|
|
|
add_executable(${testName} ${testSourceFile})
|
|
|
|
|
target_include_directories(${testName} PUBLIC "${INCLUDE_PATH}")
|
|
|
|
|
target_link_libraries(${testName} "${LINK_PATH}")
|
2018-02-12 23:31:53 +00:00
|
|
|
add_test(NAME ${testName}
|
|
|
|
|
COMMAND ${testName} ${SDK_CONFIG_FILE_TARGET} ${INTEGRATION_INPUTS}
|
|
|
|
|
CONFIGURATIONS Integration)
|
|
|
|
|
set_tests_properties(${testName} PROPERTIES LABELS "Integration")
|
|
|
|
|
add_dependencies(integration ${testName})
|
2017-02-10 23:39:10 +00:00
|
|
|
endforeach()
|
|
|
|
|
|
2017-05-18 05:02:48 +00:00
|
|
|
message(STATUS "Please fill ${SDK_CONFIG_FILE_TARGET} before you execute integration tests.")
|
Version 1.7.0 of the avs-device-sdk
Changes in this update:
**Enhancements**
* `AuthDelegate` and `AuthServer.py` have been replaced by `CBLAUthDelegate`, which provides a more straightforward path to authorization.
* Added a new configuration property called [`cblAuthDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L2). This object specifies parameters for `CBLAuthDelegate`.
* Added a new configuration property called [`miscDatabase`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L34), which is a generic key/value database to be used by various components.
* Added a new configuration property called [`dcfDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L17) This object specifies parameters for `DCFDelegate`. Within this object, values were added for the 'endpoint' and `overridenDcfPublishMessageBody`. 'endpoint' is the endpoint to connect to in order to send device capabilities. `overridenDcfPublishMessageBody`is the message that will get sent out to the Capabilities API. Note: values within the `dcfDelegate` object will only work in `DEBUG` builds.
* Added a new configuration property called [`deviceInfo`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L9) which specifies device-identifying information for use by the Device Capability Framework (DCF), and for authorization (CBLAuthDelegate).
* Updated the Directive Sequencer to support wildcard directive handlers. This allows a handler for a given AVS interface to register at the namespace level, rather than specifying the names of all directives within that namespace.
* Updated the Raspberry Pi installation script to include `alsasink` in the configuration file.
* Added `audioSink` as a configuration option. This allows users to override the audio sink element used in `Gstreamer`.
* Added an interface for monitoring internet connection status: `InternetConnectionMonitorInterface.h`.
* The Alexa Communications Library (ACL) is no longer required to wait until authorization has succeeded before attempting to connect to AVS. Instead, `HTTP2Transport` handles waiting for authorization to complete.
* Added the Device Capabilities Framework (DCF) delegate. Device capabilities can now be sent for each capability interface using DCF publish messages.
* The sample app has been updated to send DCF publish messages, which will automatically occur when the sample app starts. Note: a DCF publish message must be successfully sent in order for communication with AVS to occur.
* The SDK now supports HTTP PUT messages.
* Added support for opt-arg style arguments and multiple configuration files. Now, the sample app can be invoked by either of these commands: `SampleApp <configfile> <debuglevel>` OR `SampleApp -C file1 -C file2 ... -L loglevel`.
**Bug Fixes**
* Issues [447](https://github.com/alexa/avs-device-sdk/issues/447) and [553](https://github.com/alexa/avs-device-sdk/issues/553) Fixed the `AttachmentRenderSource`'s handling of `BLOCKING` `AttachmentReaders`.
* Updated the `Logger` implementation to be more resilient to `nullptr` string inputs.
* Fixed a `TimeUtils` utility-related compile issue.
* Fixed a bug in which alerts failed to activate if the system was restarted without network connection.
* Fixed Android 64-bit build failure issue.
**Known Issues**
* The `ACL` may encounter issues if audio attachments are received but not consumed.
* `SpeechSynthesizerState` currently uses `GAINING_FOCUS` and `LOSING_FOCUS` as a workaround for handling intermediate state. These states may be removed in a future release.
* Some ERROR messages may be printed during start-up event if initialization proceeds normally and successfully.
* If an unrecoverable authorization error or an unrecoverable DCF error is encountered, the sample app may crash on shutdown.
* If a non-CBL `clientId` is included in the `deviceInfo` section of `AlexaClientSDKConfig.json`, the error will be reported as an unrecoverable authorization error, rather than a more specific error.
2018-04-18 22:17:28 +00:00
|
|
|
if(EXISTS "${SDK_ADAPTERS_CONFIG_FILE_SOURCE}")
|
|
|
|
|
# Use configure_file to support variable substitution later.
|
|
|
|
|
message(STATUS "Please fill ${SDK_ADAPTERS_CONFIG_FILE_TARGET} before you execute integration tests.")
|
|
|
|
|
endif()
|
2017-08-17 00:13:40 +00:00
|
|
|
|
|
|
|
|
if(NETWORK_INTEGRATION_TESTS AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
|
|
|
|
|
set(networkTestSourceFile
|
|
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/NetworkIntegrationTests.cpp")
|
|
|
|
|
get_filename_component(networkTestName ${networkTestSourceFile} NAME_WE)
|
|
|
|
|
add_executable(${networkTestName} ${networkTestSourceFile})
|
|
|
|
|
target_include_directories(${networkTestName} PUBLIC "${INCLUDE_PATH}")
|
|
|
|
|
target_link_libraries(${networkTestName} "${LINK_PATH}")
|
|
|
|
|
add_custom_target(networkIntegration
|
|
|
|
|
COMMAND NetworkIntegrationTests "${SDK_CONFIG_FILE_TARGET}" "${NETWORK_INTERFACE}")
|
|
|
|
|
else()
|
|
|
|
|
message("Skipping build of NetworkIntegrationTests.cpp.")
|
|
|
|
|
endif()
|
2017-10-02 22:59:05 +00:00
|
|
|
endif()
|
