lordgamez commented on code in PR #2212:
URL: https://github.com/apache/nifi-minifi-cpp/pull/2212#discussion_r3542110875
##########
cmake/Fetchlibrdkafka.cmake:
##########
@@ -55,3 +55,16 @@ target_include_directories(rdkafka SYSTEM PRIVATE
${ZSTD_INCLUDE_DIRS})
target_include_directories(rdkafka SYSTEM PRIVATE ${LZ4_INCLUDE_DIRS})
target_link_libraries(rdkafka INTERFACE zstd::zstd lz4::lz4)
+
+if (NOT TARGET RdKafka::rdkafka)
+ add_library(RdKafka::rdkafka++ ALIAS rdkafka)
+endif()
Review Comment:
Good catch, updated in
https://github.com/apache/nifi-minifi-cpp/pull/2212/commits/9779514c189c3c5bbac90f5edaaba525c6692d46
##########
.github/workflows/ci.yml:
##########
@@ -84,9 +87,17 @@ jobs:
echo
"PATH=/opt/homebrew/opt/ccache:/opt/homebrew/opt/ccache/bin:/opt/homebrew/opt/ccache/libexec:$PATH"
>> $GITHUB_ENV
echo "DYLD_LIBRARY_PATH=$(brew --prefix)/lib" >> $GITHUB_ENV
echo -e "127.0.0.1\t$HOSTNAME" | sudo tee -a /etc/hosts > /dev/null
+ mkdir -p ~/.conan2/extensions/plugins/compatibility
+ cp .github/conan/compatibility.py
~/.conan2/extensions/plugins/compatibility/compatibility.py
- name: build
run: |
- python -m venv venv && source venv/bin/activate && pip install -r
requirements.txt && python main.py --noninteractive --skip-compiler-install
--cmake-options="-DCMAKE_C_FLAGS=${CPPFLAGS} ${CFLAGS}
-DCMAKE_CXX_FLAGS=${CPPFLAGS} ${CXXFLAGS}"
--minifi-options="${MACOS_MINIFI_OPTIONS}"
+ python -m venv venv && source venv/bin/activate && pip install -r
requirements.txt && \
+ python main.py --noninteractive --skip-compiler-install
--cmake-options="-DCMAKE_C_FLAGS=${CPPFLAGS} ${CFLAGS}
-DCMAKE_CXX_FLAGS=${CPPFLAGS} ${CXXFLAGS}"
--minifi-options="${MACOS_MINIFI_OPTIONS}"
+ working-directory: bootstrap
+ - name: Upload conan packages
+ if: always() && github.event_name == 'push' && github.ref ==
'refs/heads/main'
+ run: |
+ source venv/bin/activate && conan remote login nifi-conan && conan
upload "*" -r nifi-conan --confirm
working-directory: bootstrap
Review Comment:
Good idea, updated in
https://github.com/apache/nifi-minifi-cpp/pull/2212/commits/9779514c189c3c5bbac90f5edaaba525c6692d46
##########
.github/workflows/ci.yml:
##########
@@ -192,14 +204,27 @@ jobs:
if ((Get-FileHash 'sqliteodbc_w64.exe').Hash -ne
"a4804e4f54f42c721df1323c5fcac101a8c7a577e7f20979227324ceab572d51") {Write
"Hash mismatch"; Exit 1}
Start-Process -FilePath ".\sqliteodbc_w64.exe" -ArgumentList "/S"
-Wait
shell: powershell
+ - name: Copy conan compatibility.py
+ shell: powershell
+ run: |
+ $compatDir = Join-Path $env:USERPROFILE
".conan2\extensions\plugins\compatibility"
+ New-Item -ItemType Directory -Force -Path $compatDir | Out-Null
+ Copy-Item ".github\conan\compatibility.py" (Join-Path $compatDir
"compatibility.py")
- name: Zero sccache stats
run: sccache --zero-stats
shell: bash
- name: build
+ working-directory: bootstrap
run: |
- python -m venv venv & venv\Scripts\activate & pip install -r
requirements.txt & python main.py --noninteractive --skip-compiler-install
--minifi-options="%WINDOWS_MINIFI_OPTIONS%"
--cmake-options="-DCMAKE_C_COMPILER_LAUNCHER=sccache
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
+ python -m venv venv && venv\Scripts\activate && pip install -r
requirements.txt && ^
+ python main.py --noninteractive --skip-compiler-install
--minifi-options="%WINDOWS_MINIFI_OPTIONS%"
--cmake-options="-DCMAKE_C_COMPILER_LAUNCHER=sccache
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
shell: cmd
+ - name: Upload conan packages
+ if: always() && github.event_name == 'push' && github.ref ==
'refs/heads/main'
working-directory: bootstrap
+ run: |
+ venv\Scripts\activate && conan remote login nifi-conan && conan
upload "*" -r nifi-conan --confirm
+ shell: cmd
Review Comment:
Good idea, updated in
https://github.com/apache/nifi-minifi-cpp/pull/2212/commits/9779514c189c3c5bbac90f5edaaba525c6692d46
##########
thirdparty/open62541/all/conanfile.py:
##########
@@ -0,0 +1,169 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Recipe based on
https://github.com/conan-io/conan-center-index/blob/master/recipes/open62541/all/conanfile.py
+from conan import ConanFile
+from conan.tools.cmake import cmake_layout, CMake, CMakeToolchain, CMakeDeps
+from conan.tools.scm import Version
+from conan.tools.files import apply_conandata_patches, collect_libs,
export_conandata_patches, copy, rm, rmdir, get
+from conan.errors import ConanInvalidConfiguration
+import glob
+import os
+
+required_conan_version = ">=2.0"
+
+
+class Open62541Conan(ConanFile):
+ name = "open62541"
+ description = "open62541 is an open source and free implementation of OPC
UA " \
+ "(OPC Unified Architecture) written in the common subset of
the " \
+ "C99 and C++98 languages. The library is usable with all
major " \
+ "compilers and provides the necessary tools to implement
dedicated " \
+ "OPC UA clients and servers, or to integrate OPC UA-based
communication " \
+ "into existing applications. open62541 library is platform
independent. " \
+ "All platform-specific functionality is implemented via
exchangeable " \
+ "plugins. Plugin implementations are provided for the major
operating systems."
+ license = ("MPL-2.0", "CC0-1.0")
+ url = "https://github.com/conan-io/conan-center-index";
+ homepage = "https://open62541.org/";
+ topics = (
+ "opc ua", "sdk", "server/client", "c", "iec-62541",
+ "industrial automation", "tsn", "time sensitive networks",
"publish-subscirbe", "pubsub"
+ )
Review Comment:
Fixed in
https://github.com/apache/nifi-minifi-cpp/pull/2212/commits/9779514c189c3c5bbac90f5edaaba525c6692d46
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
