Azure
/
azure-sdk-for-c
зеркало из https://github.com/Azure/azure-sdk-for-c.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

generate map files for iot samples (#1656)

This commit is contained in:
Dane Walton 2021-03-23 11:41:20 -07:00 коммит произвёл GitHub
Родитель 19ca897dde
Коммит c9ed195790
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 44 добавлений и 29 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
cmake-modules/create_map_file.cmake
Просмотреть файл

@ -4,18 +4,18 @@
# Instructs linker to generate map files and optimize build for minimal size # Instructs linker to generate map files and optimize build for minimal size
# Requires CMake version >= 3.13 to use add_link_options # Requires CMake version >= 3.13 to use add_link_options
function(create_map_file MAP_FILE_NAME) function(create_map_file TARGET_NAME MAP_FILE_NAME)
if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13") if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13")
if(MSVC) if(MSVC)
add_link_options(/MAP) target_link_options(${TARGET_NAME} PRIVATE /MAP)
elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
add_link_options(-Wl,-map,${MAP_FILE_NAME}) target_link_options(${TARGET_NAME} PRIVATE -Wl,-map,${MAP_FILE_NAME})
add_link_options(-Os) target_link_options(${TARGET_NAME} PRIVATE -Os)
else() else()
add_link_options(-Xlinker -Map=${MAP_FILE_NAME}) target_link_options(${TARGET_NAME} PRIVATE -Xlinker -Map=${MAP_FILE_NAME})
add_link_options(-Os) target_link_options(${TARGET_NAME} PRIVATE -Os)
endif() endif()
else() else()
message("Skipping map file generation because CMake version does not support add_link_options") message("Skipping map file generation because CMake version does not support target_link_options")
endif() endif()
endfunction() endfunction()

25
eng/pipelines/templates/jobs/archetype-sdk-client.yml
Просмотреть файл

@ -6,7 +6,7 @@
# +----+------------------+---------+---------------+-----------+---------+------------+-------+---------+---------------+--------+ # +----+------------------+---------+---------------+-----------+---------+------------+-------+---------+---------------+--------+
# | 1 | Linux ARM | + | | | + | N/A | | N/A | | | # | 1 | Linux ARM | + | | | + | N/A | | N/A | | |
# | 2 | Linux ARM | | | | | N/A | | N/A | | | # | 2 | Linux ARM | | | | | N/A | | N/A | | |
# | 3 | Linux (x64) | + | | + | + | + | + | | | | # | 3 | Linux (x64) | + | | + | + | + | + | + | | |
# | 4 | Linux (x64) | | | | + | + | + | + | | | # | 4 | Linux (x64) | | | | + | + | + | + | | |
# | 5 | Windows x86 | + | | + | | + | | | | | # | 5 | Windows x86 | + | | + | | + | | | | |
# | 6 | MacOS (x64) | + | | + | + | + | | + | | | # | 6 | MacOS (x64) | + | | + | + | + | | + | | |
@ -22,7 +22,7 @@
# | 16 | MacOS (x64) | | + | | + | + | | | | | # | 16 | MacOS (x64) | | + | | + | + | | | | |
# | 17 | Linux (x64) GCC5 | + | + | | | + | | + | | | # | 17 | Linux (x64) GCC5 | + | + | | | + | | + | | |
# | 18 | Linux (x64) GCC5 | | + | | | + | | | | | # | 18 | Linux (x64) GCC5 | | + | | | + | | | | |
# | 19 | Windows x64 | + | | + | | | | | | | # | 19 | Windows x64 | + | | + | | | | + | | |
# | 20 | G E N E R A T E A R T I F A C T S | # | 20 | G E N E R A T E A R T I F A C T S |
# +----+------------------+---------+---------------+-----------+---------+------------+-------+---------+---------------+--------+ # +----+------------------+---------+---------------+-----------+---------+------------+-------+---------+---------------+--------+
# #
@ -62,15 +62,14 @@ jobs:
PublishMapFiles: 'false' PublishMapFiles: 'false'
BuildType: Debug BuildType: Debug
Linux_Release_MapFiles_Logging_UnitTests_Mocks: Linux_Release_MapFiles_Logging_UnitTests_Mocks_Samples:
Pool: azsdk-pool-mms-ubuntu-1804-general Pool: azsdk-pool-mms-ubuntu-1804-general
OSVmImage: MMSUbuntu18.04 OSVmImage: MMSUbuntu18.04
vcpkg.deps: 'cmocka' vcpkg.deps: 'cmocka paho-mqtt'
VCPKG_DEFAULT_TRIPLET: 'x64-linux' VCPKG_DEFAULT_TRIPLET: 'x64-linux'
build.args: '-DPRECONDITIONS=OFF -DUNIT_TESTING=ON -DUNIT_TESTING_MOCKS=ON' build.args: '-DPRECONDITIONS=OFF -DUNIT_TESTING=ON -DUNIT_TESTING_MOCKS=ON -DTRANSPORT_PAHO=ON'
AZ_SDK_C_NO_SAMPLES: 'true'
PublishMapFiles: 'true' PublishMapFiles: 'true'
MapFileArtifactSuffix: 'lnx-x64-rel-noprc-log' MapFileArtifactSuffix: 'lnx-x64-rel-noprc-log-samples'
BuildType: Release BuildType: Release
Linux_Logging_UnitTests_Mocks_Samples: Linux_Logging_UnitTests_Mocks_Samples:
@ -101,8 +100,7 @@ jobs:
vcpkg.deps: 'curl[ssl] paho-mqtt cmocka' vcpkg.deps: 'curl[ssl] paho-mqtt cmocka'
VCPKG_DEFAULT_TRIPLET: 'x64-osx' VCPKG_DEFAULT_TRIPLET: 'x64-osx'
build.args: '-DTRANSPORT_CURL=ON -DTRANSPORT_PAHO=ON -DAZ_PLATFORM_IMPL=POSIX -DPRECONDITIONS=OFF -DUNIT_TESTING=ON' build.args: '-DTRANSPORT_CURL=ON -DTRANSPORT_PAHO=ON -DAZ_PLATFORM_IMPL=POSIX -DPRECONDITIONS=OFF -DUNIT_TESTING=ON'
PublishMapFiles: 'true' MapFileArtifactSuffix: 'mac-rel-noprc-log-samples'
MapFileArtifactSuffix: 'mac-rel-noprc-log'
BuildType: Release BuildType: Release
MacOS_Logging_UnitTests_Samples: MacOS_Logging_UnitTests_Samples:
@ -230,17 +228,16 @@ jobs:
CC: '/usr/bin/gcc-5' CC: '/usr/bin/gcc-5'
BuildType: Debug BuildType: Debug
Windows_Release_MapFiles: Windows_Release_Samples_MapFiles:
Pool: azsdk-pool-mms-win-2019-general Pool: azsdk-pool-mms-win-2019-general
OSVmImage: MMS2019 OSVmImage: MMS2019
vcpkg.deps: '' vcpkg.deps: 'paho-mqtt'
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static' VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
build.args: '-DPRECONDITIONS=OFF -DLOGGING=OFF' build.args: '-DPRECONDITIONS=OFF -DLOGGING=OFF -DTRANSPORT_PAHO=ON'
CMAKE_GENERATOR: 'Visual Studio 16 2019' CMAKE_GENERATOR: 'Visual Studio 16 2019'
CMAKE_GENERATOR_PLATFORM: x64 CMAKE_GENERATOR_PLATFORM: x64
AZ_SDK_C_NO_SAMPLES: 'true'
PublishMapFiles: 'true' PublishMapFiles: 'true'
MapFileArtifactSuffix: 'win-x64-rel-noprc-nolog' MapFileArtifactSuffix: 'win-x64-rel-noprc-nolog-samples'
BuildType: Release BuildType: Release
pool: pool:
name: $(Pool) name: $(Pool)

18
sdk/samples/iot/CMakeLists.txt
Просмотреть файл

@ -53,6 +53,8 @@ target_link_libraries(paho_iot_hub_c2d_sample
az::iot::sample::common az::iot::sample::common
) )
create_map_file(paho_iot_hub_c2d_sample paho_iot_hub_c2d_sample.map)
# Methods Sample # Methods Sample
add_executable (paho_iot_hub_methods_sample add_executable (paho_iot_hub_methods_sample
${CMAKE_CURRENT_LIST_DIR}/paho_iot_hub_methods_sample.c ${CMAKE_CURRENT_LIST_DIR}/paho_iot_hub_methods_sample.c
@ -63,6 +65,8 @@ target_link_libraries(paho_iot_hub_methods_sample
az::iot::sample::common az::iot::sample::common
) )
create_map_file(paho_iot_hub_methods_sample paho_iot_hub_methods_sample.map)
# PnP Sample # PnP Sample
add_executable (paho_iot_hub_pnp_sample add_executable (paho_iot_hub_pnp_sample
${CMAKE_CURRENT_LIST_DIR}/paho_iot_hub_pnp_sample.c ${CMAKE_CURRENT_LIST_DIR}/paho_iot_hub_pnp_sample.c
@ -73,6 +77,8 @@ target_link_libraries(paho_iot_hub_pnp_sample
az::iot::sample::common az::iot::sample::common
) )
create_map_file(paho_iot_hub_pnp_sample paho_iot_hub_pnp_sample.map)
# PnP Component Sample # PnP Component Sample
add_executable (paho_iot_hub_pnp_component_sample add_executable (paho_iot_hub_pnp_component_sample
${CMAKE_CURRENT_LIST_DIR}/pnp/pnp_mqtt_message.c ${CMAKE_CURRENT_LIST_DIR}/pnp/pnp_mqtt_message.c
@ -93,6 +99,8 @@ target_include_directories(paho_iot_hub_pnp_component_sample
${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}
) )
create_map_file(paho_iot_hub_pnp_component_sample paho_iot_hub_pnp_component_sample.map)
# Telemetry (Certificates) Sample # Telemetry (Certificates) Sample
add_executable (paho_iot_hub_telemetry_sample add_executable (paho_iot_hub_telemetry_sample
${CMAKE_CURRENT_LIST_DIR}/paho_iot_hub_telemetry_sample.c ${CMAKE_CURRENT_LIST_DIR}/paho_iot_hub_telemetry_sample.c
@ -103,6 +111,8 @@ target_link_libraries(paho_iot_hub_telemetry_sample
az::iot::sample::common az::iot::sample::common
) )
create_map_file(paho_iot_hub_telemetry_sample paho_iot_hub_telemetry_sample.map)
# Telemetry (SAS) Sample # Telemetry (SAS) Sample
add_executable (paho_iot_hub_sas_telemetry_sample add_executable (paho_iot_hub_sas_telemetry_sample
${CMAKE_CURRENT_LIST_DIR}/paho_iot_hub_sas_telemetry_sample.c ${CMAKE_CURRENT_LIST_DIR}/paho_iot_hub_sas_telemetry_sample.c
@ -113,6 +123,8 @@ target_link_libraries(paho_iot_hub_sas_telemetry_sample
az::iot::sample::common az::iot::sample::common
) )
create_map_file(paho_iot_hub_sas_telemetry_sample paho_iot_hub_sas_telemetry_sample.map)
# Twin Sample # Twin Sample
add_executable (paho_iot_hub_twin_sample add_executable (paho_iot_hub_twin_sample
${CMAKE_CURRENT_LIST_DIR}/paho_iot_hub_twin_sample.c ${CMAKE_CURRENT_LIST_DIR}/paho_iot_hub_twin_sample.c
@ -123,6 +135,8 @@ target_link_libraries(paho_iot_hub_twin_sample
az::iot::sample::common az::iot::sample::common
) )
create_map_file(paho_iot_hub_twin_sample paho_iot_hub_twin_sample.map)
# Provisioning (Certificates) Sample # Provisioning (Certificates) Sample
add_executable (paho_iot_provisioning_sample add_executable (paho_iot_provisioning_sample
${CMAKE_CURRENT_LIST_DIR}/paho_iot_provisioning_sample.c ${CMAKE_CURRENT_LIST_DIR}/paho_iot_provisioning_sample.c
@ -133,6 +147,8 @@ target_link_libraries(paho_iot_provisioning_sample
az::iot::sample::common az::iot::sample::common
) )
create_map_file(paho_iot_provisioning_sample paho_iot_provisioning_sample.map)
# Provisioning (SAS) Sample # Provisioning (SAS) Sample
add_executable (paho_iot_provisioning_sas_sample add_executable (paho_iot_provisioning_sas_sample
${CMAKE_CURRENT_LIST_DIR}/paho_iot_provisioning_sas_sample.c ${CMAKE_CURRENT_LIST_DIR}/paho_iot_provisioning_sas_sample.c
@ -143,4 +159,6 @@ target_link_libraries(paho_iot_provisioning_sas_sample
az::iot::sample::common az::iot::sample::common
) )
create_map_file(paho_iot_provisioning_sas_sample paho_iot_provisioning_sas_sample.map)
endif() # TRANSPORT_PAHO endif() # TRANSPORT_PAHO

4
sdk/tests/core/CMakeLists.txt
Просмотреть файл

@ -16,8 +16,6 @@ else()
set(WRAP_FUNCTIONS "") set(WRAP_FUNCTIONS "")
endif() endif()
create_map_file(az_core_test.map)
set(MATH_LIB_UNIX "") set(MATH_LIB_UNIX "")
if (UNIX) if (UNIX)
set(MATH_LIB_UNIX "m") set(MATH_LIB_UNIX "m")
@ -40,4 +38,6 @@ add_cmocka_test(az_core_test SOURCES
INCLUDE_DIRECTORIES ${CMOCKA_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/sdk/src/azure/core/ INCLUDE_DIRECTORIES ${CMOCKA_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/sdk/src/azure/core/
) )
create_map_file(az_core_test az_core_test.map)
add_cmocka_test_environment(az_core_test) add_cmocka_test_environment(az_core_test)

4
sdk/tests/iot/common/CMakeLists.txt
Просмотреть файл

@ -9,8 +9,6 @@ set(CMAKE_C_STANDARD 99)
include(AddCMockaTest) include(AddCMockaTest)
create_map_file(az_iot_common_test.map)
add_cmocka_test(az_iot_common_test SOURCES add_cmocka_test(az_iot_common_test SOURCES
main.c main.c
test_az_iot_common.c test_az_iot_common.c
@ -21,4 +19,6 @@ add_cmocka_test(az_iot_common_test SOURCES
INCLUDE_DIRECTORIES ${CMOCKA_INCLUDE_DIR} INCLUDE_DIRECTORIES ${CMOCKA_INCLUDE_DIR}
) )
create_map_file(az_iot_common_test az_iot_common_test.map)
add_cmocka_test_environment(az_iot_common_test) add_cmocka_test_environment(az_iot_common_test)

4
sdk/tests/iot/hub/CMakeLists.txt
Просмотреть файл

@ -9,8 +9,6 @@ set(CMAKE_C_STANDARD 99)
include(AddCMockaTest) include(AddCMockaTest)
create_map_file(az_iot_hub_test.map)
add_cmocka_test(az_iot_hub_test SOURCES add_cmocka_test(az_iot_hub_test SOURCES
main.c main.c
test_az_iot_hub_client_sas.c test_az_iot_hub_client_sas.c
@ -27,4 +25,6 @@ add_cmocka_test(az_iot_hub_test SOURCES
INCLUDE_DIRECTORIES ${CMOCKA_INCLUDE_DIR} INCLUDE_DIRECTORIES ${CMOCKA_INCLUDE_DIR}
) )
create_map_file(az_iot_hub_test az_iot_hub_test.map)
add_cmocka_test_environment(az_iot_hub_test) add_cmocka_test_environment(az_iot_hub_test)

4
sdk/tests/iot/provisioning/CMakeLists.txt
Просмотреть файл

@ -9,8 +9,6 @@ set(CMAKE_C_STANDARD 99)
include(AddCMockaTest) include(AddCMockaTest)
create_map_file(az_iot_provisioning_test.map)
add_cmocka_test(az_iot_provisioning_test SOURCES add_cmocka_test(az_iot_provisioning_test SOURCES
main.c main.c
test_az_iot_provisioning_client.c test_az_iot_provisioning_client.c
@ -24,4 +22,6 @@ add_cmocka_test(az_iot_provisioning_test SOURCES
INCLUDE_DIRECTORIES ${CMOCKA_INCLUDE_DIR} INCLUDE_DIRECTORIES ${CMOCKA_INCLUDE_DIR}
) )
create_map_file(az_iot_provisioning_test az_iot_provisioning_test.map)
add_cmocka_test_environment(az_iot_provisioning_test) add_cmocka_test_environment(az_iot_provisioning_test)