Update to latest master in iothub sdk, pull in latest submodules to do

darobs · darobs · commit 58b82bf28bba · 2017-09-12T15:10:33.000-07:00
so.

use iothub_client shared library's new name.
fix strftime in logger

The C SDK moved parson, need to fix our build.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -266,10 +266,10 @@ endfunction(copy_module_host_dll)
 
 function(copy_iothub_client_dll whatIsBuilding whatIsBuildingLocation)
   if(WIN32)
-    if(EXISTS "${azure_iot_sdks_DIR}/../bin/iothub_client.dll")
+    if(EXISTS "${azure_iot_sdks_DIR}/../bin/iothub_client_dll.dll")
       add_custom_command(TARGET ${whatIsBuilding} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${azure_iot_sdks_DIR}/../bin/iothub_client.dll"
+        "${azure_iot_sdks_DIR}/../bin/iothub_client_dll.dll"
         ${whatIsBuildingLocation})
     endif()
   endif()
diff --git a/core/tests/gateway_e2e/dependencies.cmake b/core/tests/gateway_e2e/dependencies.cmake
@@ -17,7 +17,7 @@ findAndInstall(umqtt 1.0.25 ${PROJECT_SOURCE_DIR}/deps/umqtt ${PROJECT_SOURCE_DI
 #######################Find/Install/Build azure_iot_sdks#######################
 ###############################################################################
 #The azure_iot_sdks repo requires special treatment. Parson submodule must be initialized.
-if(NOT EXISTS ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c/parson/README.md)
+if(NOT EXISTS ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c/deps/parson/README.md)
     execute_process(
         COMMAND git submodule update --init ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@@ -28,7 +28,7 @@ if(NOT EXISTS ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c/parson/README.md)
         message(FATAL_ERROR "Error pulling iot-sdk-c submodule: ${res}")
     endif()
     execute_process(
-        COMMAND git submodule update --init parson
+        COMMAND git submodule update --init deps/parson
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c
         RESULT_VARIABLE res
     )
diff --git a/core/tests/testtools/iothub_test/dependencies.cmake b/core/tests/testtools/iothub_test/dependencies.cmake
@@ -13,7 +13,7 @@ findAndInstall(uamqp 1.0.25 ${PROJECT_SOURCE_DIR}/deps/uamqp ${PROJECT_SOURCE_DI
 #######################Find/Install/Build azure_iot_sdks#######################
 ###############################################################################
 #The azure_iot_sdks repo requires special treatment. Parson submodule must be initialized.
-if(NOT EXISTS ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c/parson/README.md)
+if(NOT EXISTS ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c/deps/parson/README.md)
     execute_process(
         COMMAND git submodule update --init ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@@ -24,7 +24,7 @@ if(NOT EXISTS ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c/parson/README.md)
         message(FATAL_ERROR "Error pulling iot-sdk-c submodule: ${res}")
     endif()
     execute_process(
-        COMMAND git submodule update --init parson
+        COMMAND git submodule update --init deps/parson
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c
         RESULT_VARIABLE res
     )
diff --git a/deps/c-utility b/deps/c-utility
@@ -1 +1 @@
-Subproject commit 883b618258097a51bfd226386ca4f04751d11847
+Subproject commit 942909698415cc0bd6483e063a2cfa8da626edc6
diff --git a/deps/ctest b/deps/ctest
@@ -1 +1 @@
-Subproject commit f75c43565720ccf0d44771ba58bb57e9e64ef38c
+Subproject commit 037e318716e37eba358424380659dd1cd6d0554e
diff --git a/deps/iot-sdk-c b/deps/iot-sdk-c
@@ -1 +1 @@
-Subproject commit 35c2e35d4df546b9b4c11991a4bb579dae146fc8
+Subproject commit 278d73ba36d0ab6289297236e19d0f915b52beff
diff --git a/deps/parson b/deps/parson
@@ -1 +1 @@
-Subproject commit ba2a854c27b24068977e5827bd129d0531f4503c
+Subproject commit 578b25e5909df0ca9fb78d5173a6b247faea0c5a
diff --git a/deps/testrunner b/deps/testrunner
@@ -1 +1 @@
-Subproject commit c654e728a0abf00aa72bac8e1d4392246454e94f
+Subproject commit ee279c8b72d64d9ee8ca917ce00c17e0b522461d
diff --git a/deps/uamqp b/deps/uamqp
@@ -1 +1 @@
-Subproject commit ce53717e3e5ecd2a7c673ed2d317fb4040a85e81
+Subproject commit 48523f806b2e1b59bc19a5baf3502e9e20c9878e
diff --git a/deps/umock-c b/deps/umock-c
@@ -1 +1 @@
-Subproject commit c563c7e6606ebf2a89c1381b7b45fabe6898e100
+Subproject commit f41aa23712d82a27998d6918d3533d150e636ae8
diff --git a/deps/umqtt b/deps/umqtt
@@ -1 +1 @@
-Subproject commit 8758a2ddd36dabd6bca206993a2150202a818bf1
+Subproject commit b2b733ad7c7f609d4868c381f1d647abf431cbb0
diff --git a/modules/dependencies.cmake b/modules/dependencies.cmake
@@ -17,7 +17,7 @@ findAndInstall(umqtt 1.0.25 ${PROJECT_SOURCE_DIR}/deps/umqtt ${PROJECT_SOURCE_DI
 #######################Find/Install/Build azure_iot_sdks#######################
 ###############################################################################
 #The azure_iot_sdks repo requires special treatment. Parson submodule must be initialized.
-if(NOT EXISTS ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c/parson/README.md)
+if(NOT EXISTS ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c/deps/parson/README.md)
     execute_process(
         COMMAND git submodule update --init ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@@ -28,7 +28,7 @@ if(NOT EXISTS ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c/parson/README.md)
         message(FATAL_ERROR "Error pulling iot-sdk-c submodule: ${res}")
     endif()
     execute_process(
-        COMMAND git submodule update --init parson
+        COMMAND git submodule update --init deps/parson
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/deps/iot-sdk-c
         RESULT_VARIABLE res
     )
diff --git a/modules/iothub/CMakeLists.txt b/modules/iothub/CMakeLists.txt
@@ -23,7 +23,7 @@ add_library(iothub MODULE
 )
 target_link_libraries(iothub
     gateway
-    iothub_client
+    iothub_client_dll
 )
 
 #this builds the iothub static library
diff --git a/modules/logger/src/logger.c b/modules/logger/src/logger.c
@@ -76,15 +76,15 @@ static int LogStartStop_Print(char* destination, size_t destinationSize, bool ap
 
             if (isAbsoluteStart)
             {
-                err = strftime(destination, destinationSize, "{\"time\":\"%C\",\"content\":\"Log started\"}]", t);
+                err = strftime(destination, destinationSize, "{\"time\":\"%c\",\"content\":\"Log started\"}]", t);
             }
             else if (appendStart)
             {
-                err = strftime(destination, destinationSize, ",{\"time\":\"%C\",\"content\":\"Log started\"}]", t);
+                err = strftime(destination, destinationSize, ",{\"time\":\"%c\",\"content\":\"Log started\"}]", t);
             }
             else
             {
-                err = strftime(destination, destinationSize, ",{\"time\":\"%C\",\"content\":\"Log stopped\"}]", t);
+                err = strftime(destination, destinationSize, ",{\"time\":\"%c\",\"content\":\"Log stopped\"}]", t);
             }
 
             if (err == 0)
@@ -431,7 +431,7 @@ static void Logger_Receive(MODULE_HANDLE moduleHandle, MESSAGE_HANDLE messageHan
             else
             {
                 char timetemp[80] = { 0 };
-                if (strftime(timetemp, sizeof(timetemp) / sizeof(timetemp[0]), "%C", t) == 0)
+                if (strftime(timetemp, sizeof(timetemp) / sizeof(timetemp[0]), "%c", t) == 0)
                 {
                     LogError("unable to strftime");
                     /*Codes_SRS_LOGGER_02_012: [If producing the JSON format or writing it to the file fails, then Logger_Receive shall fail and return.]*/
diff --git a/modules/logger/tests/logger_ut/logger_ut.cpp b/modules/logger/tests/logger_ut/logger_ut.cpp
