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 ff60531a2 Use nickname
ff60531a2 is described below
commit ff60531a2305a4969db482ff37434a68e176558c
Author: Martin Zink <[email protected]>
AuthorDate: Tue Jul 15 13:18:26 2025 +0200
Use nickname
---
CMakeLists.txt | 13 +++++++------
conf/CMakeLists.txt | 20 ++++++++++----------
controller/CMakeLists.txt | 2 +-
extensions/python/CMakeLists.txt | 2 +-
minifi_main/CMakeLists.txt | 2 +-
5 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a74d11b1b..58b232fcf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,7 @@ cmake_policy(SET CMP0135 NEW) # policy to set the timestamps
of extracted conten
project(nifi-minifi-cpp VERSION 1.0.0)
set(PROJECT_NAME "nifi-minifi-cpp")
+set(PROJECT_NICKNAME "minifi-cpp")
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type" FORCE)
@@ -592,17 +593,17 @@ if (NOT WIN32)
if (MINIFI_PACKAGING_TYPE STREQUAL "RPM")
message(STATUS "Configuring for FHS/RPM package installation.")
install(FILES fips/openssl.cnf fips/README.md
- DESTINATION /${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}/fips
+ DESTINATION
/${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NICKNAME}/fips
COMPONENT bin)
install(PROGRAMS bin/minifi.sh DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES bin/minifi.service
DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system
COMPONENT bin
)
- install(DIRECTORY DESTINATION
/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NAME} COMPONENT bin)
- install(DIRECTORY DESTINATION
/${CMAKE_INSTALL_LOCALSTATEDIR}/log/${PROJECT_NAME} COMPONENT bin)
+ install(DIRECTORY DESTINATION
/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NICKNAME} COMPONENT bin)
+ install(DIRECTORY DESTINATION
/${CMAKE_INSTALL_LOCALSTATEDIR}/log/${PROJECT_NICKNAME} COMPONENT bin)
install(DIRECTORY extensions/python/pythonprocessors/
- DESTINATION
/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NAME}/minifi-python
+ DESTINATION
/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NICKNAME}/minifi-python
COMPONENT bin)
install(DIRECTORY extensions/python/pythonprocessor-examples/
DESTINATION ${CMAKE_INSTALL_DOCDIR}/pythonprocessor-examples
@@ -662,13 +663,13 @@ else()
if (MINIFI_PACKAGING_TYPE STREQUAL "RPM")
set(CPACK_GENERATOR "RPM")
set(CPACK_BINARY_RPM, "ON")
- set(CPACK_RPM_PACKAGE_NAME "apache-nifi-minifi-cpp")
+ set(CPACK_RPM_PACKAGE_NAME "minifi-cpp")
set(CPACK_RPM_PACKAGE_AUTOREQ OFF)
set(CPACK_RPM_PACKAGE_REQUIRES "")
set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 0)
set(CPACK_RPM_SPEC_MORE_DEFINE "%define _build_id_links none")
set(CPACK_RPM_COMPONENT_INSTALL ON)
- set(CMAKE_INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}")
+ set(CMAKE_INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NICKNAME}")
set(CPACK_RPM_DEFAULT_USER "minificpp")
set(CPACK_RPM_DEFAULT_GROUP "minificpp")
set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE
"${CMAKE_CURRENT_SOURCE_DIR}/packaging/pre_install.sh")
diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
index 39012d6fe..e2775f2d0 100644
--- a/conf/CMakeLists.txt
+++ b/conf/CMakeLists.txt
@@ -20,15 +20,15 @@
# Exclude conf for windows since we'll be doing the work in the WiX template
if (MINIFI_PACKAGING_TYPE STREQUAL "RPM")
- set(MINIFI_PATH_FLOW_CONFIG
"/${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}/config.yml")
- set(MINIFI_PATH_EXTENSIONS
"/usr/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extensions/*")
- set(MINIFI_PATH_PROVENANCE_REPO
"/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NAME}/provenance_repository")
- set(MINIFI_PATH_FLOWFILE_REPO
"/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NAME}/flowfile_repository")
- set(MINIFI_PATH_CONTENT_REPO
"/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NAME}/content_repository")
- set(MINIFI_PATH_ASSET_DIR
"/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NAME}/asset")
- set(MINIFI_PATH_PYTHON_PROCESSORS
"/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NAME}/minifi-python")
- set(MINIFI_PATH_PYTHON_VENV
"/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NAME}/minifi-python-env")
- set(MINIFI_PATH_APPENDER_ROLLING_DIR
"/${CMAKE_INSTALL_LOCALSTATEDIR}/log/${PROJECT_NAME}/")
+ set(MINIFI_PATH_FLOW_CONFIG
"/${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NICKNAME}/config.yml")
+ set(MINIFI_PATH_EXTENSIONS
"/usr/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NICKNAME}/extensions/*")
+ set(MINIFI_PATH_PROVENANCE_REPO
"/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NICKNAME}/provenance_repository")
+ set(MINIFI_PATH_FLOWFILE_REPO
"/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NICKNAME}/flowfile_repository")
+ set(MINIFI_PATH_CONTENT_REPO
"/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NICKNAME}/content_repository")
+ set(MINIFI_PATH_ASSET_DIR
"/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NICKNAME}/asset")
+ set(MINIFI_PATH_PYTHON_PROCESSORS
"/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NICKNAME}/minifi-python")
+ set(MINIFI_PATH_PYTHON_VENV
"/${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${PROJECT_NICKNAME}/minifi-python-env")
+ set(MINIFI_PATH_APPENDER_ROLLING_DIR
"/${CMAKE_INSTALL_LOCALSTATEDIR}/log/${PROJECT_NICKNAME}/")
elseif (MINIFI_PACKAGING_TYPE STREQUAL "TGZ")
set(MINIFI_PATH_FLOW_CONFIG "./conf/config.yml")
set(MINIFI_PATH_EXTENSIONS "../extensions/*")
@@ -74,7 +74,7 @@ if (MINIFI_PACKAGING_TYPE STREQUAL "RPM")
${CMAKE_BINARY_DIR}/conf/minifi-log.properties
${CMAKE_BINARY_DIR}/conf/minifi-uid.properties
${CMAKE_BINARY_DIR}/conf/config.yml
- DESTINATION /${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}
+ DESTINATION /${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NICKNAME}
COMPONENT bin)
elseif (MINIFI_PACKAGING_TYPE STREQUAL "TGZ")
install(FILES
diff --git a/controller/CMakeLists.txt b/controller/CMakeLists.txt
index b06cf4ef8..83c238255 100644
--- a/controller/CMakeLists.txt
+++ b/controller/CMakeLists.txt
@@ -52,7 +52,7 @@ if (NOT WIN32)
target_link_options(minifi-controller PRIVATE
"-Wl,--disable-new-dtags")
endif()
if (MINIFI_PACKAGING_TYPE STREQUAL "RPM")
- set_target_properties(minifi-controller PROPERTIES INSTALL_RPATH
"/usr/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}")
+ set_target_properties(minifi-controller PROPERTIES INSTALL_RPATH
"/usr/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NICKNAME}")
else()
if (APPLE)
set_target_properties(minifi-controller PROPERTIES INSTALL_RPATH
"@loader_path")
diff --git a/extensions/python/CMakeLists.txt b/extensions/python/CMakeLists.txt
index 656c324cc..0b3e9f8e8 100644
--- a/extensions/python/CMakeLists.txt
+++ b/extensions/python/CMakeLists.txt
@@ -88,7 +88,7 @@ else()
if (MINIFI_PACKAGING_TYPE STREQUAL "RPM")
install(
FILES "${CMAKE_BINARY_DIR}/bin/minifi_native.so"
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extensions/
+ DESTINATION
${CMAKE_INSTALL_LIBDIR}/${PROJECT_NICKNAME}/extensions/
COMPONENT minifi_python_native_module
)
elseif (MINIFI_PACKAGING_TYPE STREQUAL "TGZ")
diff --git a/minifi_main/CMakeLists.txt b/minifi_main/CMakeLists.txt
index a9779a72a..26347ade0 100644
--- a/minifi_main/CMakeLists.txt
+++ b/minifi_main/CMakeLists.txt
@@ -84,7 +84,7 @@ if (NOT WIN32)
if (MINIFI_PACKAGING_TYPE STREQUAL "RPM")
set_target_properties(minifiexe PROPERTIES
- INSTALL_RPATH "/usr/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}")
+ INSTALL_RPATH
"/usr/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NICKNAME}")
else()
if (APPLE)
