You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by lo...@apache.org on 2022/08/24 11:38:17 UTC
[nifi-minifi-cpp] 02/02: MINIFICPP-1910 - Rename main directory to avoid name clashes with main branch
This is an automated email from the ASF dual-hosted git repository.
lordgamez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit cf66a0be1624a42ff7bd2aab8e533ab935bf3291
Author: Adam Markovics <nu...@gmail.com>
AuthorDate: Wed Aug 17 20:34:06 2022 +0200
MINIFICPP-1910 - Rename main directory to avoid name clashes with main branch
Signed-off-by: Gabor Gyimesi <ga...@gmail.com>
This closes #1394
---
CMakeLists.txt | 2 +-
Windows.md | 2 +-
controller/CMakeLists.txt | 4 ++--
{main => minifi_main}/AgentDocs.cpp | 0
{main => minifi_main}/AgentDocs.h | 0
{main => minifi_main}/CMakeLists.txt | 0
{main => minifi_main}/MainHelper.cpp | 0
{main => minifi_main}/MainHelper.h | 0
{main => minifi_main}/MiNiFiMain.cpp | 2 +-
{main => minifi_main}/MiNiFiWindowsService.cpp | 0
{main => minifi_main}/MiNiFiWindowsService.h | 0
msi/WixWin.wsi | 4 ++--
msi/WixWinMergeModules.wsi | 4 ++--
win_build_vs.bat | 4 ++--
14 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d33cda3a..23d07b5d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,7 +338,7 @@ foreach(extension-dir ${extension-directories})
endforeach()
## NOW WE CAN ADD LIBRARIES AND EXTENSIONS TO MAIN
-add_subdirectory(main)
+add_subdirectory(minifi_main)
if (ENABLE_NANOFI)
add_subdirectory(nanofi)
diff --git a/Windows.md b/Windows.md
index bdf9bbd64..0c374ade6 100644
--- a/Windows.md
+++ b/Windows.md
@@ -95,7 +95,7 @@ mkdir build
cd build
cmake -G "Visual Studio 16 2019" -DINSTALLER_MERGE_MODULES=OFF -DENABLE_SQL=OFF -DCMAKE_BUILD_TYPE_INIT=Release -DCMAKE_BUILD_TYPE=Release -DWIN32=WIN32 -DENABLE_LIBRDKAFKA=OFF -DENABLE_JNI=OFF -DOPENSSL_OFF=OFF -DENABLE_COAP=OFF -DUSE_SHARED_LIBS=OFF -DDISABLE_CONTROLLER=ON -DBUILD_ROCKSDB=ON -DFORCE_WINDOWS=ON -DUSE_SYSTEM_UUID=OFF -DDISABLE_LIBARCHIVE=OFF -DDISABLE_SCRIPTING=ON -DEXCLUDE_BOOST=ON -DENABLE_WEL=TRUE -DFAIL_ON_WARNINGS=OFF -DSKIP_TESTS=OFF ..
msbuild /m nifi-minifi-cpp.sln /property:Configuration=Release /property:Platform=Win32
-copy main\Release\minifi.exe main\
+copy minifi_main\Release\minifi.exe minifi_main\
cpack
ctest -C Release
```
diff --git a/controller/CMakeLists.txt b/controller/CMakeLists.txt
index 728c2636f..eaff1b8b4 100644
--- a/controller/CMakeLists.txt
+++ b/controller/CMakeLists.txt
@@ -19,7 +19,7 @@
cmake_minimum_required(VERSION 3.16)
-include_directories(../main/ ../libminifi/include ../libminifi/include/c2 ../libminifi/include/c2/protocols/ ../libminifi/include/core/state ./libminifi/include/core/statemanagement/metrics ../libminifi/include/core/yaml ../libminifi/include/core)
+include_directories(../minifi_main/ ../libminifi/include ../libminifi/include/c2 ../libminifi/include/c2/protocols/ ../libminifi/include/core/state ./libminifi/include/core/statemanagement/metrics ../libminifi/include/core/yaml ../libminifi/include/core)
if(WIN32)
include_directories(../libminifi/opsys/win)
@@ -30,7 +30,7 @@ endif()
include(CppVersion)
set_cpp_version()
-add_executable(minificontroller MiNiFiController.cpp ../main/MainHelper.cpp)
+add_executable(minificontroller MiNiFiController.cpp ../minifi_main/MainHelper.cpp)
target_link_libraries(minificontroller ${LIBMINIFI} cxxopts Threads::Threads)
set_target_properties(minificontroller PROPERTIES
diff --git a/main/AgentDocs.cpp b/minifi_main/AgentDocs.cpp
similarity index 100%
rename from main/AgentDocs.cpp
rename to minifi_main/AgentDocs.cpp
diff --git a/main/AgentDocs.h b/minifi_main/AgentDocs.h
similarity index 100%
rename from main/AgentDocs.h
rename to minifi_main/AgentDocs.h
diff --git a/main/CMakeLists.txt b/minifi_main/CMakeLists.txt
similarity index 100%
rename from main/CMakeLists.txt
rename to minifi_main/CMakeLists.txt
diff --git a/main/MainHelper.cpp b/minifi_main/MainHelper.cpp
similarity index 100%
rename from main/MainHelper.cpp
rename to minifi_main/MainHelper.cpp
diff --git a/main/MainHelper.h b/minifi_main/MainHelper.h
similarity index 100%
rename from main/MainHelper.h
rename to minifi_main/MainHelper.h
diff --git a/main/MiNiFiMain.cpp b/minifi_main/MiNiFiMain.cpp
similarity index 99%
rename from main/MiNiFiMain.cpp
rename to minifi_main/MiNiFiMain.cpp
index 3a8aad0c2..1d90cef9c 100644
--- a/main/MiNiFiMain.cpp
+++ b/minifi_main/MiNiFiMain.cpp
@@ -220,7 +220,7 @@ int main(int argc, char **argv) {
std::string nifi_configuration_class_name = "yamlconfiguration";
std::string content_repo_class = "filesystemrepository";
- const auto log_properties = std::make_shared<core::logging::LoggerProperties>();
+ auto log_properties = std::make_shared<core::logging::LoggerProperties>();
log_properties->setHome(minifiHome);
log_properties->loadConfigureFile(DEFAULT_LOG_PROPERTIES_FILE);
core::logging::LoggerConfiguration::getConfiguration().initialize(log_properties);
diff --git a/main/MiNiFiWindowsService.cpp b/minifi_main/MiNiFiWindowsService.cpp
similarity index 100%
rename from main/MiNiFiWindowsService.cpp
rename to minifi_main/MiNiFiWindowsService.cpp
diff --git a/main/MiNiFiWindowsService.h b/minifi_main/MiNiFiWindowsService.h
similarity index 100%
rename from main/MiNiFiWindowsService.h
rename to minifi_main/MiNiFiWindowsService.h
diff --git a/msi/WixWin.wsi b/msi/WixWin.wsi
index 8337545d7..feb05b542 100644
--- a/msi/WixWin.wsi
+++ b/msi/WixWin.wsi
@@ -310,7 +310,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
<Directory Id="INSTALLBINDIR" Name="bin">
<Component Id="minifiService" Guid="87658309-0339-425c-8633-f54ffaaa4921">
- <File Id="MiNiFiExe" Name="minifi.exe" KeyPath="yes" Source="main\minifi.exe"/>
+ <File Id="MiNiFiExe" Name="minifi.exe" KeyPath="yes" Source="minifi_main\minifi.exe"/>
<!--
It is not possible to set 'ServiceConfig' for 2 'Component' (error LGHT0130 : The primary key 'Apache NiFi MiNiFi' is duplicated in table 'ServiceConfig').
Problem is described: http://windows-installer-xml-wix-toolset.687559.n2.nabble.com/Installing-a-Service-with-Varying-Dependencies-td693097.html
@@ -348,7 +348,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
<Condition><![CDATA[SERVICEACCOUNT="LocalSystem"]]></Condition>
</Component>
<Component Id="minifiServiceNotLocal" Guid="87658309-0339-425c-8633-f54ffaaa4922">
- <File Id="MiNiFiExeWithPassword" Name="minifi.exe" KeyPath="yes" Source="main\minifi.exe"/>
+ <File Id="MiNiFiExeWithPassword" Name="minifi.exe" KeyPath="yes" Source="minifi_main\minifi.exe"/>
<ServiceInstall Id="MiNiFiExeServiceWithPassword"
Type="ownProcess"
Vital="yes"
diff --git a/msi/WixWinMergeModules.wsi b/msi/WixWinMergeModules.wsi
index 5194ece3a..7bf489c44 100644
--- a/msi/WixWinMergeModules.wsi
+++ b/msi/WixWinMergeModules.wsi
@@ -329,7 +329,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
<File Id="MiNiFiExe"
Name="minifi.exe"
KeyPath="yes"
- Source="main\minifi.exe"/>
+ Source="minifi_main\minifi.exe"/>
<!--
It is not possible to set 'ServiceConfig' for 2 'Component' (error LGHT0130 : The primary key 'Apache NiFi MiNiFi' is duplicated in table 'ServiceConfig').
Problem is described: http://windows-installer-xml-wix-toolset.687559.n2.nabble.com/Installing-a-Service-with-Varying-Dependencies-td693097.html
@@ -370,7 +370,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
<File Id="MiNiFiExeWithPassword"
Name="minifi.exe"
KeyPath="yes"
- Source="main\minifi.exe"/>
+ Source="minifi_main\minifi.exe"/>
<ServiceInstall Id="MiNiFiExeServiceWithPassword"
Type="ownProcess"
Vital="yes"
diff --git a/win_build_vs.bat b/win_build_vs.bat
index 208c9c2db..031021fb0 100755
--- a/win_build_vs.bat
+++ b/win_build_vs.bat
@@ -108,9 +108,9 @@ mkdir %builddir%
pushd %builddir%\
if [%generator%] EQU ["Ninja"] (
- set "buildcmd=ninja && copy bin\minifi.exe main\"
+ set "buildcmd=ninja && copy bin\minifi.exe minifi_main\"
) else (
- set "buildcmd=msbuild /m nifi-minifi-cpp.sln /property:Configuration=%cmake_build_type% /property:Platform=%build_platform% && copy bin\%cmake_build_type%\minifi.exe main\"
+ set "buildcmd=msbuild /m nifi-minifi-cpp.sln /property:Configuration=%cmake_build_type% /property:Platform=%build_platform% && copy bin\%cmake_build_type%\minifi.exe minifi_main\"
)
cmake -G %generator% -DINSTALLER_MERGE_MODULES=%installer_merge_modules% -DTEST_CUSTOM_WEL_PROVIDER=%test_custom_wel_provider% -DENABLE_SQL=%build_SQL% -DUSE_REAL_ODBC_TEST_DRIVER=%real_odbc% ^
-DCMAKE_BUILD_TYPE_INIT=%cmake_build_type% -DCMAKE_BUILD_TYPE=%cmake_build_type% -DWIN32=WIN32 -DENABLE_LIBRDKAFKA=%build_kafka% -DENABLE_JNI=%build_jni% -DOPENSSL_OFF=OFF ^