This is an automated email from the ASF dual-hosted git repository.
martinzink pushed a commit to branch MINIFICPP-2584-apache
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/MINIFICPP-2584-apache by this
push:
new a6d57027a asd
a6d57027a is described below
commit a6d57027a27cdf4b1555d8ee33e668870d4ed8d0
Author: Martin Zink <[email protected]>
AuthorDate: Wed Jul 16 11:22:28 2025 +0200
asd
---
CMakeLists.txt | 3 +++
cmake/Extensions.cmake | 1 +
packaging/CMakeLists.txt | 28 ++++++++++++++++++++++
...d-rpm-contents.txt => expected-rpm-contents.in} | 25 +------------------
4 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 047160012..a9eda98e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -643,6 +643,7 @@ elseif(APPLE)
set(CPACK_GENERATOR "TGZ")
else()
if (MINIFI_PACKAGING_TYPE STREQUAL "RPM")
+ set(RPM_EXPECTED_EXTENSION_LIST)
set(CPACK_GENERATOR "RPM")
set(CPACK_BINARY_RPM, "ON")
set(CPACK_RPM_PACKAGE_NAME "nifi-minifi-cpp")
@@ -824,3 +825,5 @@ if (MINIFI_ADVANCED_CODE_COVERAGE)
"controller/MiNiFiController.cpp"
)
endif()
+
+add_subdirectory(packaging)
diff --git a/cmake/Extensions.cmake b/cmake/Extensions.cmake
index ecf3bc6aa..2f842856d 100644
--- a/cmake/Extensions.cmake
+++ b/cmake/Extensions.cmake
@@ -82,6 +82,7 @@ macro(register_extension extension-name
extension-display-name extension-guard d
install(TARGETS ${extension-name}
LIBRARY DESTINATION
${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extensions/
COMPONENT ${component-name})
+ set(RPM_EXPECTED_EXTENSION_LIST ${RPM_EXPECTED_EXTENSION_LIST}
/usr/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extensions/lib${extension-name}.so
PARENT_SCOPE)
elseif (MINIFI_PACKAGING_TYPE STREQUAL "TGZ")
install(TARGETS ${extension-name} LIBRARY DESTINATION
extensions COMPONENT ${component-name})
else()
diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt
new file mode 100644
index 000000000..9133594bb
--- /dev/null
+++ b/packaging/CMakeLists.txt
@@ -0,0 +1,28 @@
+# 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.
+#
+
+if (MINIFI_PACKAGING_TYPE STREQUAL "RPM")
+ string(REPLACE ";" "\n" RPM_EXPECTED_EXTENSION_LIST
"${RPM_EXPECTED_EXTENSION_LIST}")
+
+ configure_file(
+ expected-rpm-contents.in
+ ${CMAKE_BINARY_DIR}/expected-rpm-contents.txt
+ @ONLY
+ )
+endif()
diff --git a/packaging/rpm/expected-rpm-contents.txt
b/packaging/expected-rpm-contents.in
similarity index 68%
rename from packaging/rpm/expected-rpm-contents.txt
rename to packaging/expected-rpm-contents.in
index 62a7d30cd..54e04158a 100644
--- a/packaging/rpm/expected-rpm-contents.txt
+++ b/packaging/expected-rpm-contents.in
@@ -11,30 +11,7 @@
/usr/bin/minifi-encrypt-config
/usr/lib64/nifi-minifi-cpp
/usr/lib64/nifi-minifi-cpp/extensions
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-archive-extensions.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-aws.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-azure.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-civet-extensions.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-couchbase.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-expression-language-extensions.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-gcp.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-grafana-loki.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-kubernetes-extensions.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-lua-script-extension.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-mqtt-extensions.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-opc-extensions.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-procfs.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-prometheus.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-python-lib-loader-extension.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-python-script-extension.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-rdkafka-extensions.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-rocksdb-repos.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-script-extension.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-splunk.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-sql.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-standard-processors.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-systemd.so
-/usr/lib64/nifi-minifi-cpp/extensions/libminifi-test-processors.so
+@RPM_EXPECTED_EXTENSION_LIST@
/usr/lib64/nifi-minifi-cpp/extensions/minifi_native.so
/usr/lib64/nifi-minifi-cpp/fips
/usr/lib64/nifi-minifi-cpp/fips/fips.so
