You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2022/08/18 09:04:21 UTC
[GitHub] [nifi-minifi-cpp] adam-markovics opened a new pull request, #1394: MINIFICPP-1910 - Rename main directory to avoid name clashes with main branch
adam-markovics opened a new pull request, #1394:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1394
https://issues.apache.org/jira/browse/MINIFICPP-1910
Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [ ] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [ ] Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
- [ ] Has your PR been rebased against the latest commit within the target branch (typically main)?
- [ ] Is your initial contribution a single, squashed commit?
### For code changes:
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] If applicable, have you updated the LICENSE file?
- [ ] If applicable, have you updated the NOTICE file?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
### Note:
Please ensure that once the PR is submitted, you check GitHub Actions CI results for build issues and submit an update to your PR as soon as possible.
--
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: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] szaszm commented on pull request #1394: MINIFICPP-1910 - Rename main directory to avoid name clashes with main branch
Posted by GitBox <gi...@apache.org>.
szaszm commented on PR #1394:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1394#issuecomment-1219292930
You can use `--` to disabmiguate.
`git checkout main --` means switch to the main branch.
`git checkout -- main` means restore the main directory.
--
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: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] lordgamez commented on pull request #1394: MINIFICPP-1910 - Rename main directory to avoid name clashes with main branch
Posted by GitBox <gi...@apache.org>.
lordgamez commented on PR #1394:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1394#issuecomment-1219229849
It probably also have to be changed in the `msi/WixWin.wsi` and `msi/WixWinMergeModules.wsi` files as well where the installed binary's source is the `main` directory set to `main\minifi.exe`
--
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: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] lordgamez closed pull request #1394: MINIFICPP-1910 - Rename main directory to avoid name clashes with main branch
Posted by GitBox <gi...@apache.org>.
lordgamez closed pull request #1394: MINIFICPP-1910 - Rename main directory to avoid name clashes with main branch
URL: https://github.com/apache/nifi-minifi-cpp/pull/1394
--
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: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] adamdebreceni commented on a diff in pull request #1394: MINIFICPP-1910 - Rename main directory to avoid name clashes with main branch
Posted by GitBox <gi...@apache.org>.
adamdebreceni commented on code in PR #1394:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1394#discussion_r951119757
##########
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\"
Review Comment:
what is the purpose of the copy command here? is it required to run the tests?
--
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: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] fgerlits commented on a diff in pull request #1394: MINIFICPP-1910 - Rename main directory to avoid name clashes with main branch
Posted by GitBox <gi...@apache.org>.
fgerlits commented on code in PR #1394:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1394#discussion_r951133671
##########
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\"
Review Comment:
It is required by `cpack`, when creating the `msi` installer.
--
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: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] adamdebreceni commented on a diff in pull request #1394: MINIFICPP-1910 - Rename main directory to avoid name clashes with main branch
Posted by GitBox <gi...@apache.org>.
adamdebreceni commented on code in PR #1394:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1394#discussion_r951140253
##########
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\"
Review Comment:
I see, thanks
--
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: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] adam-markovics commented on pull request #1394: MINIFICPP-1910 - Rename main directory to avoid name clashes with main branch
Posted by GitBox <gi...@apache.org>.
adam-markovics commented on PR #1394:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1394#issuecomment-1219251436
> It probably also have to be changed in the `msi/WixWin.wsi` and `msi/WixWinMergeModules.wsi` files as well where the installed binary's source is the `main` directory set to `main\minifi.exe`. The same directory is also mentioned in the Windows.md documentation
Thanks for the Windows-specific update. If someone has found necessary changes for other OSes and distributions, please share.
--
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: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi-minifi-cpp] adam-markovics commented on pull request #1394: MINIFICPP-1910 - Rename main directory to avoid name clashes with main branch
Posted by GitBox <gi...@apache.org>.
adam-markovics commented on PR #1394:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1394#issuecomment-1219295745
> You can use `--` to disabmiguate. `git checkout main --` means switch to the main branch. `git checkout -- main` means restore the main directory.
I have been doing this all the time, it would just be more comfortable if I didn't have to.
--
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: issues-unsubscribe@nifi.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org