Skip to content

Commit

Permalink
chore(deps): update deps/open62541 digest to 1fea0ec (#1285)
Browse files Browse the repository at this point in the history 
* chore(deps): update deps/open62541 digest to 1fea0ec

* fix: set UA_NODESET_DIR, remove deprecated definitions

* fix: set DOWNLOAD_EXTRACT_TIMESTAMP

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goetz Goerisch <[email protected]>
  • Loading branch information
@renovate @GoetzGoerisch
renovate[bot] and GoetzGoerisch committed May 24, 2024
1 parent 9d372b9 commit 37d6e8a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 12 deletions.
1 change: 1 addition & 0 deletions .github/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ externalproject_add(
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libreSslSource
URL "https://mirror.leaseweb.com/pub/OpenBSD/LibreSSL/libressl-3.8.2.tar.gz"
URL_HASH SHA256=6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954
DOWNLOAD_EXTRACT_TIMESTAMP true
PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 --forward -d ${CMAKE_CURRENT_BINARY_DIR}/libreSslSource <
${CMAKE_CURRENT_SOURCE_DIR}/ciPatches/libressl-no_postfix.patch || echo "Patch returned non-zero"
CMAKE_ARGS -DLIBRESSL_APPS:BOOL=0 -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
Expand Down
11 changes: 1 addition & 10 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
endif()

set(SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR "${PROJECT_SOURCE_DIR}/src_generated")
set(UA_NODESET_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/open62541/deps/ua-nodeset")

# Generate types and namespace for DI
ua_generate_nodeset_and_datatypes(
NAME "di"
FILE_NS "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml"
FILE_CSV "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeIds.csv"
FILE_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
TARGET_PREFIX "${PROJECT_NAME}"
OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
)
Expand All @@ -77,7 +77,6 @@ ua_generate_nodeset_and_datatypes(
FILE_NS "${UA_NODESET_DIR}/Machinery/Opc.Ua.Machinery.NodeSet2.xml"
FILE_CSV "${UA_NODESET_DIR}/Machinery/Opc.Ua.Machinery.NodeIds.csv"
FILE_BSD "${CMAKE_BINARY_DIR}/model/Opc.Ua.Machinery.Types.bsd"
NAMESPACE_MAP "3:http://opcfoundation.org/UA/Machinery/"
TARGET_PREFIX "${PROJECT_NAME}"
OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
DEPENDS di
Expand All @@ -100,7 +99,6 @@ ua_generate_nodeset_and_datatypes(
FILE_NS "${UA_NODESET_DIR}/IA/Opc.Ua.IA.NodeSet2.xml"
FILE_CSV "${UA_NODESET_DIR}/IA/Opc.Ua.IA.NodeIds.csv"
FILE_BSD "${UA_NODESET_DIR}/IA/Opc.Ua.IA.NodeSet2.bsd"
NAMESPACE_MAP "4:http://opcfoundation.org/UA/IA/"
TARGET_PREFIX "${PROJECT_NAME}"
OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
DEPENDS di
Expand All @@ -120,7 +118,6 @@ ua_generate_nodeset_and_datatypes(
FILE_NS "${UA_NODESET_DIR}/MachineTool/Opc.Ua.MachineTool.NodeSet2.xml"
FILE_CSV "${UA_NODESET_DIR}/MachineTool/NodeIds.csv"
FILE_BSD "${UA_NODESET_DIR}/MachineTool/Opc.Ua.MachineTool.NodeSet2.bsd"
NAMESPACE_MAP "5:http://opcfoundation.org/UA/MachineTool/"
TARGET_PREFIX "${PROJECT_NAME}"
OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
DEPENDS di machinery ia
Expand All @@ -143,7 +140,6 @@ target_link_libraries(ua_gen_machinetool PUBLIC ua_gen_ia ua_gen_machinery)
# FILE_NS "${UA_NODESET_DIR}/Robotics/Opc.Ua.Robotics.NodeSet2.xml"
# FILE_CSV "${UA_NODESET_DIR}/Robotics/NodeIds.csv"
# FILE_BSD "${UA_NODESET_DIR}/Robotics/Opc.Ua.Robotics.Types.bsd"
# NAMESPACE_MAP "6:http://opcfoundation.org/UA/Robotics/"
# TARGET_PREFIX "${PROJECT_NAME}"
# OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
# DEPENDS di
Expand All @@ -166,7 +162,6 @@ ua_generate_nodeset_and_datatypes(
FILE_NS "${PROJECT_SOURCE_DIR}/model/Woodworking/Opc.Ua.Woodworking.NodeSet2.xml"
FILE_CSV "${PROJECT_SOURCE_DIR}/model/Woodworking/Opc.Ua.Woodworking.NodeIds.csv"
FILE_BSD "${PROJECT_SOURCE_DIR}/model/Woodworking/Opc.Ua.Woodworking.NodeSet2.bsd"
NAMESPACE_MAP "6:http://opcfoundation.org/UA/Woodworking/"
TARGET_PREFIX "${PROJECT_NAME}"
OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
DEPENDS machinery
Expand All @@ -189,7 +184,6 @@ ua_generate_nodeset_and_datatypes(
FILE_NS "${UA_NODESET_DIR}/Machinery/Result/Opc.Ua.Machinery.Result.NodeSet2.xml"
FILE_CSV "${UA_NODESET_DIR}/Machinery/Result/NodeIds.csv"
FILE_BSD "${PROJECT_SOURCE_DIR}/model/MachineryResult/Opc.Ua.Machinery.Result.NodeSet2.bsd"
NAMESPACE_MAP "7:http://opcfoundation.org/UA/Machinery/Result/"
TARGET_PREFIX "${PROJECT_NAME}"
OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
)
Expand All @@ -211,7 +205,6 @@ ua_generate_nodeset_and_datatypes(
FILE_NS "${UA_NODESET_DIR}/GMS/opc.ua.gms.nodeset2.xml"
FILE_CSV "${UA_NODESET_DIR}/GMS/opc.ua.gms.nodesids.csv"
FILE_BSD "${UA_NODESET_DIR}/GMS/opc.ua.gms.types.bsd"
NAMESPACE_MAP "8:http://opcfoundation.org/UA/GMS/"
TARGET_PREFIX "${PROJECT_NAME}"
OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
DEPENDS di ia machinery_result machinetool machinery
Expand Down Expand Up @@ -249,7 +242,6 @@ ua_generate_nodeset_and_datatypes(
FILE_NS "${UA_NODESET_DIR}/PADIM/Opc.Ua.PADIM.NodeSet2.xml"
FILE_CSV "${UA_NODESET_DIR}/PADIM/Opc.Ua.PADIM.NodeIds.csv"
FILE_BSD "${CMAKE_BINARY_DIR}/model/Opc.Ua.PADIM.Types.bsd"
NAMESPACE_MAP "10:http://opcfoundation.org/UA/PADIM/"
TARGET_PREFIX "${PROJECT_NAME}"
OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
DEPENDS di irdi
Expand Down Expand Up @@ -285,7 +277,6 @@ ua_generate_nodeset_and_datatypes(
FILE_NS "${PROJECT_SOURCE_DIR}/model/AdditiveManufacturing/Opc.Ua.AdditiveManufacturing.NodeSet2.xml"
FILE_CSV "${PROJECT_SOURCE_DIR}/model/AdditiveManufacturing/Opc.Ua.AdditiveManufacturing.NodeSet2.csv"
FILE_BSD "${PROJECT_SOURCE_DIR}/model/AdditiveManufacturing/Opc.Ua.AdditiveManufacturing.NodeSet2.bsd"
NAMESPACE_MAP "12:http://opcfoundation.org/UA/AdditiveManufacturing/NodeSet2/"
TARGET_PREFIX "${PROJECT_NAME}"
OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
DEPENDS di
Expand Down
2 changes: 1 addition & 1 deletion SampleServer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ int main(int argc, char *argv[]) {
std::cout << "No encryption will be available." << std::endl;
}

// Create namespaces, order must match the NAMESPACE_MAP in CMakeLists.txt
// Create namespaces, order must match the CMakeLists.txt
namespace_di_generated(pServer);
namespace_machinery_generated(pServer);
namespace_ia_generated(pServer);
Expand Down
2 changes: 1 addition & 1 deletion deps/open62541
Submodule open62541 updated 75 files
+105 −70 CMakeLists.txt
+2 −3 arch/eventloop_posix_tcp.c
+1 −1 deps/README.md
+2 −2 doc/CMakeLists.txt
+22 −72 doc/building.rst
+0 −2 include/open62541/config.h.in
+0 −2 src/client/ua_client_subscriptions.c
+4 −2 src/pubsub/ua_pubsub_manager.c
+0 −12 src/pubsub/ua_pubsub_ns0.c
+0 −1 src/server/ua_server_async.c
+0 −4 src/server/ua_server_ns0_diagnostics.c
+0 −41 src/server/ua_subscription_alarms_conditions.c
+88 −94 src/ua_types_encoding_json.c
+1 −0 tests/check_types_builtin_xml.c
+1 −0 tests/encryption/check_cert_generation.c
+1 −0 tests/nodeset-compiler/check_nodeset_compiler_adi.c
+1 −0 tests/nodeset-compiler/check_nodeset_compiler_autoid.c
+1 −0 tests/nodeset-compiler/check_nodeset_compiler_plc.c
+1 −0 tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
+19 −17 tests/nodeset-loader/add_node_integration_test/CMakeLists.txt
+1 −0 tests/nodeset-loader/check_nodeset_loader_adi.c
+1 −0 tests/nodeset-loader/check_nodeset_loader_compare_di.c
+1 −0 tests/nodeset-loader/check_nodeset_loader_ordering_di.c
+1 −0 tests/nodeset-loader/check_nodeset_loader_testnodeset.c
+1 −0 tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
+1 −0 tests/pubsub/check_pubsub_config_freeze.c
+1 −0 tests/pubsub/check_pubsub_configuration.c
+1 −0 tests/pubsub/check_pubsub_connection_ethernet.c
+1 −0 tests/pubsub/check_pubsub_connection_ethernet_etf.c
+1 −0 tests/pubsub/check_pubsub_connection_mqtt.c
+1 −0 tests/pubsub/check_pubsub_connection_udp.c
+1 −0 tests/pubsub/check_pubsub_connection_xdp.c
+1 −0 tests/pubsub/check_pubsub_decryption.c
+1 −0 tests/pubsub/check_pubsub_encoding.c
+1 −0 tests/pubsub/check_pubsub_encoding_custom.c
+1 −0 tests/pubsub/check_pubsub_encoding_json.c
+1 −0 tests/pubsub/check_pubsub_encrypted_rt_levels.c
+1 −0 tests/pubsub/check_pubsub_encryption.c
+1 −0 tests/pubsub/check_pubsub_encryption_aes256.c
+1 −0 tests/pubsub/check_pubsub_get_state.c
+1 −0 tests/pubsub/check_pubsub_informationmodel.c
+1 −0 tests/pubsub/check_pubsub_informationmodel_methods.c
+1 −0 tests/pubsub/check_pubsub_mqtt.c
+1 −0 tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
+1 −0 tests/pubsub/check_pubsub_pds.c
+1 −0 tests/pubsub/check_pubsub_publish.c
+1 −0 tests/pubsub/check_pubsub_publish_ethernet.c
+1 −0 tests/pubsub/check_pubsub_publish_ethernet_etf.c
+1 −0 tests/pubsub/check_pubsub_publish_json.c
+1 −0 tests/pubsub/check_pubsub_publish_rt_levels.c
+1 −0 tests/pubsub/check_pubsub_publisherid.c
+1 −0 tests/pubsub/check_pubsub_publishspeed.c
+1 −0 tests/pubsub/check_pubsub_sks_client.c
+1 −0 tests/pubsub/check_pubsub_sks_keystorage.c
+1 −0 tests/pubsub/check_pubsub_sks_pull.c
+1 −0 tests/pubsub/check_pubsub_sks_push.c
+1 −0 tests/pubsub/check_pubsub_sks_securitygroups.c
+1 −0 tests/pubsub/check_pubsub_subscribe.c
+1 −0 tests/pubsub/check_pubsub_subscribe_config_freeze.c
+1 −0 tests/pubsub/check_pubsub_subscribe_encrypted.c
+1 −0 tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+1 −0 tests/pubsub/check_pubsub_subscribe_rt_levels.c
+1 −0 tests/pubsub/check_pubsub_udp_unicast.c
+1 −0 tests/server/check_server_alarmsconditions.c
+1 −1 tools/cmake/linting_target.cmake
+13 −1 tools/cmake/open62541Config.cmake.in
+1 −5 tools/open62541.pc.in
+3 −3 tools/packaging/debian/changelog
+2 −1 tools/packaging/debian/control-template
+112 −374 tools/packaging/debian/copyright
+1 −1 tools/packaging/debian/libopen62541-dev.install-template
+5 −9 tools/packaging/debian/libopen62541-tools.install-template
+14 −0 tools/packaging/debian/rules
+0 −14 tools/packaging/debian/rules-template
+5 −19 tools/prepare_packaging.py

0 comments on commit 37d6e8a

Please sign in to comment.