Skip to content

Commit

Permalink
(conan-io#14537) Package/open62541: bump to v1.3.4
Browse files Browse the repository at this point in the history
* remove dead code

* add v1.3.4 version

* add v1.2.6 version

* fix #KB-H041: "NO FINAL ENDLINE"

* refactor old test_package into test_v1_package

* add test_package for v2

* refactor test_package name to be more consistent with other conan packages

* remove wrong executable declaration

* include open62541Macros module

* fix target name

* use CMakeToolchain to set tools and nodeset dirs

* include missing threads package

* retrigger pipeline

* retrigger pipeline

* refactor recipe to be compatible with conan v2.x release

* use v2 auto include instead of explicit include

* use v2 conf_info value for tools_dir

* append to builddirs, instead of assigning

* remove base_path from patches

* fix E9010 error. Old import is deprecated in Conan v2.

* retrigger pipeline

* add generator specifiers for build_modules field

Co-authored-by: SpaceIm <[email protected]>

* reuse test_package data for v1 test

* remove VirtualBuildEnv

* apply code formatting

* honor cmake BUILD_SHARED_LIBS policy

Signed-off-by: Dovydas Girdvainis <[email protected]>

* bump dependencies

* add open62541 to tools_dir definition for v2

* remove unused mkdir import

* remove superfluous new line

* add new patch fields

* use self.ref instead of explicit calls to self.name and self.version

* remove export_sources

* split v1_3_x patch into version specific patches, fix OpenSSL variable

* add patches for v1.2.6

* fix OpenSSL cmake variable for v1.2.x patch

* rollback openssl to v1.1.1*

* fix 1_1_x OpenSSL target name

* rollback mbedtls to latest supported version

* fix MbedTLS target for patch v1_0_x

* retriger pipeline

* Update recipes/open62541/all/test_package/conanfile.py

sanitize open62541_TOOLS_DIR variable path for windows systems

Co-authored-by: SpaceIm <[email protected]>

* fix E9013 hook error

* sanitize open62541_NODESET_DIR variable path

* add missing escape char for \

* sanitize conan v1 tools_dir path for windows systems

* sanitize conan v2 tools_dir path for windows systems

* remove conan v2 open62541:tools_dir path sanitization for windows systems

* add explanation for ua-nodeset nodeset_dir path sanitization

* retriger pipeline

---------

Signed-off-by: Dovydas Girdvainis <[email protected]>
Co-authored-by: SpaceIm <[email protected]>
  • Loading branch information
2 people authored and sabelka committed Feb 12, 2023
1 parent f96e4a5 commit 9ff173e
Show file tree
Hide file tree
Showing 14 changed files with 598 additions and 175 deletions.
67 changes: 51 additions & 16 deletions recipes/open62541/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
sources:
"1.3.4":
url: "https://github.com/open62541/open62541/archive/v1.3.4.tar.gz"
sha256: "3489cfa2f98c52df252adc8e641a9e59cb675bdfd5ef413b0d947e667cddd16d"
"1.3.1":
url: "https://github.com/open62541/open62541/archive/v1.3.1.tar.gz"
sha256: "f54d10325fd08fc1505aea37d83daa085912a269521e6d018bfc41a744ba57aa"
"1.2.6":
url: "https://github.com/open62541/open62541/archive/v1.2.6.tar.gz"
sha256: "7470c1e2f97d0e7dad9632ced7b62f0add66a3c689532204ef85b0556d129106"
"1.2.4":
url: "https://github.com/open62541/open62541/archive/v1.2.4.tar.gz"
sha256: "b2d00b91e8315b61efaef6398f0902a0c9a8f357aa6d02f7f000a429048c97ae"
Expand All @@ -24,41 +30,70 @@ sources:
url: "https://github.com/open62541/open62541/archive/v1.0.3.tar.gz"
sha256: "3e4c939d702d06d89f32a1cafe2b992c7f3d81c8f8579e093a972d4bc4fb3d50"
patches:
"1.3.4":
- patch_file: "patches/0001-fix-cmake-find-deps-1_3_4.patch"
patch_description: "Use Cmake find_package(*) to resolve external dependencies"
patch_type: "portability"
"1.3.1":
- patch_file: "patches/0001-fix-cmake-find-deps-1_3_x.patch"
base_path: "source_subfolder"
- patch_file: "patches/0001-fix-cmake-find-deps-1_3_1.patch"
patch_description: "Use Cmake find_package(*) to resolve external dependencies"
patch_type: "portability"
"1.2.6":
- patch_file: "patches/0001-fix-cmake-find-deps-1_2_x.patch"
patch_description: "Use Cmake find_package(*) to resolve external dependencies"
patch_type: "portability"
- patch_file: "patches/0003-disable-sanitizers-1_2_x.patch"
patch_description: "Disable static code analysis"
patch_type: "conan"
- patch_file: "patches/0003-fix-use-usr-bin-env-python3.patch"
patch_description: "Use python3 instead of default python interpreter"
patch_type: "conan"
"1.2.4":
- patch_file: "patches/0001-fix-cmake-find-deps-1_2_x.patch"
base_path: "source_subfolder"
patch_description: "Use Cmake find_package(*) to resolve external dependencies"
patch_type: "portability"
- patch_file: "patches/0003-disable-sanitizers-1_2_x.patch"
base_path: "source_subfolder"
patch_description: "Disable static code analysis"
patch_type: "conan"
- patch_file: "patches/0003-fix-use-usr-bin-env-python3.patch"
base_path: "source_subfolder"
patch_description: "Use python3 instead of default python interpreter"
patch_type: "conan"
"1.2.2":
- patch_file: "patches/0001-fix-cmake-find-deps-1_2_x.patch"
base_path: "source_subfolder"
patch_description: "Use Cmake find_package(*) to resolve external dependencies"
patch_type: "portability"
- patch_file: "patches/0003-disable-sanitizers-1_2_x.patch"
base_path: "source_subfolder"
patch_description: "Disable static code analysis"
patch_type: "conan"
- patch_file: "patches/0003-fix-use-usr-bin-env-python3.patch"
base_path: "source_subfolder"
patch_description: "Use python3 instead of default python interpreter"
patch_type: "conan"
"1.1.6":
- patch_file: "patches/0001-fix-cmake-find-deps-1_1_x.patch"
base_path: "source_subfolder"
patch_description: "Use Cmake find_package(*) to resolve external dependencies"
patch_type: "portability"
- patch_file: "patches/0003-disable-sanitizers-1_1_6.patch"
base_path: "source_subfolder"
patch_description: "Disable static code analysis"
patch_type: "conan"
"1.1.5":
- patch_file: "patches/0001-fix-cmake-find-deps-1_1_x.patch"
base_path: "source_subfolder"
patch_description: "Use Cmake find_package(*) to resolve external dependencies"
patch_type: "portability"
- patch_file: "patches/0002-disable-sanitizers-1_1_3-and-1_1_5.patch"
base_path: "source_subfolder"
patch_description: "Disable static code analysis"
patch_type: "conan"
"1.1.3":
- patch_file: "patches/0001-fix-cmake-find-deps-1_1_x.patch"
base_path: "source_subfolder"
patch_description: "Use Cmake find_package(*) to resolve external dependencies"
patch_type: "portability"
- patch_file: "patches/0002-disable-sanitizers-1_1_3-and-1_1_5.patch"
base_path: "source_subfolder"
patch_description: "Disable static code analysis"
patch_type: "conan"
"1.0.6":
- patch_file: "patches/1_0_x.patch"
base_path: "source_subfolder"
patch_description: "Fix CMAKE_MODULE_PATH and PROJECT_VERSION variables, remove -Werror flag, disable static code analysis, use Cmake find_package(*) to resolve external dependencies, fix include paths"
patch_type: "conan"
"1.0.3":
- patch_file: "patches/1_0_x.patch"
base_path: "source_subfolder"
patch_description: "Fix CMAKE_MODULE_PATH and PROJECT_VERSION variables, remove -Werror flag, disable static code analysis, use Cmake find_package(*) to resolve external dependencies, fix include paths"
patch_type: "conan"
Loading

0 comments on commit 9ff173e

Please sign in to comment.