Renames shared utility submodule and updates this submodule.

This commit is contained in:
andrew-buckley 2016-10-03 14:04:49 -07:00
Родитель d9b6c237d1
Коммит a9445a3695
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 8804D06ADAC5FFB9
9 изменённых файлов: 10 добавлений и 12 удалений

1
.gitignore поставляемый
Просмотреть файл

@ -7,3 +7,4 @@
/devdoc/~$o_requirements.docm
*.jar
/.vscode/*

5
.gitmodules поставляемый
Просмотреть файл

@ -1,6 +1,3 @@
[submodule "c/azure-c-shared-utility"]
path = c/azure-c-shared-utility
url = https://github.com/Azure/azure-c-shared-utility.git
[submodule "azure-c-shared-utility"]
path = azure-c-shared-utility
path = c-utility
url = https://github.com/Azure/azure-c-shared-utility.git

Просмотреть файл

@ -68,7 +68,7 @@ message(STATUS "MQTT Target architecture: ${ARCHITECTURE}")
# Start of variables used during install
#set (INCLUDE_INSTALL_DIR include CACHE PATH "Include file directory")
add_subdirectory(azure-c-shared-utility)
add_subdirectory(c-utility)
enable_testing()
@ -155,7 +155,7 @@ ENDIF(WIN32)
#this is the product (a library)
add_library(umqtt ${source_c_files} ${source_h_files})
set(SHARED_UTIL_ADAPTER_FOLDER "${CMAKE_CURRENT_LIST_DIR}/azure-c-shared-utility/c/adapters")
set(SHARED_UTIL_ADAPTER_FOLDER "${CMAKE_CURRENT_LIST_DIR}/c-utility/adapters")
target_link_libraries(umqtt aziotsharedutil)

@ -1 +0,0 @@
Subproject commit bf08d9fccd1434592665eb291937b28ad4b70b79

Просмотреть файл

@ -3,6 +3,6 @@
cmake_minimum_required(VERSION 2.8.11)
set(shared_util_base_path ../../azure-c-shared-utility)
set(shared_util_base_path ../../c-utility)
set(mbed_project_base "azure_umqtt_c" CACHE STRING "The item being built")
include (${shared_util_base_path}/tools/mbed_build_scripts/mbedbldtemplate.txt)

Просмотреть файл

@ -16,14 +16,14 @@ rem ----------------------------------------------------------------------------
rem -- build (clean) compilembed tool
rem -----------------------------------------------------------------------------
call "%repo-build-root%\azure-c-shared-utility\tools\compilembed\build.cmd" --clean
call "%repo-build-root%\c-utility\tools\compilembed\build.cmd" --clean
if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
rem -----------------------------------------------------------------------------
rem -- build uMQTT and samples
rem -----------------------------------------------------------------------------
call %repo-build-root%\azure-c-shared-utility\tools\mbed_build_scripts\release_mbed_project.cmd %repo-build-root%\build_all
call %repo-build-root%\c-utility\tools\mbed_build_scripts\release_mbed_project.cmd %repo-build-root%\build_all
if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
call :compile mqtt_client_sample %repo-build-root%\samples\mqtt_client_sample\mbed

1
c-utility Submodule

@ -0,0 +1 @@
Subproject commit 686c3dfdf98991506b95d7575386bb7486b06e72

Просмотреть файл

@ -8,4 +8,4 @@ azure-mqtt is a general purpose library build for MQTT protocol
azure-mqtt client use the azure-c-shared-utility, which is a C library provisioning common functionality for basic tasks (like string, list manipulation, IO, etc.).
azure-c-shared-utility is available here: https://github.com/Azure/azure-c-shared-utility.
azure-c-shared-utility needs to be built before building azure-mqtt.
azure-c-shared-utility needs to be built before building azure-mqtt-c.

Просмотреть файл

@ -3,6 +3,6 @@
cmake_minimum_required(VERSION 2.8.11)
set(shared_util_base_path ../../../azure-c-shared-utility)
set(shared_util_base_path ../../../c-utility)
set(mbed_project_base "mqtt_client_sample" CACHE STRING "The item being built")
include (${shared_util_base_path}/tools/mbed_build_scripts/mbedbldtemplate.txt)