Conversation
bakaid
left a comment
There was a problem hiding this comment.
@apiri This fixed the issue for me, but I would like to wait for @arpadboda's approval to make sure I don't break any of his stuff.
| echo "MiNiFi Package: $MINIFI_SOURCE_CODE" | ||
|
|
||
| # Copy the MiNiFi source tree to the Docker working directory before building | ||
| rm -rf $CMAKE_SOURCE_DIR/docker/minificppsource |
There was a problem hiding this comment.
Excluding a path will not delete it in the target, even though we have the --delete flag said (this is the proper behaviour I think). However, this masked the error, because if you have already had the cmake directory copied, it left it as it was, just didn't update it, and the build succeeded. I had to clean up my clone to reproduce the issue.
| --exclude '/*_repository*' \ | ||
| --exclude '/logs' \ | ||
| --exclude '/cmake' \ | ||
| --exclude '/cmake-build-*' \ |
There was a problem hiding this comment.
@arpadboda This was added in #634 - I am not sure what was the original intent here, but this excludes the whole cmake directory, which messes up the whole build process. I changed it to this, based on the .gitignore, but I want to make sure there was no other consideration behind it that I would break with this.
There was a problem hiding this comment.
I wanted to avoid uploading CMakeCache and cmake-build-debug to the container, thanks for fixing.
| && mkdir build \ | ||
| && cd build \ | ||
| && cmake -DOPENSSL_FORCE_SHARED=true -DDISABLE_JEMALLOC=ON -DSTATIC_BUILD= -DSKIP_TESTS=true -DENABLE_JNI=ON .. \ | ||
| && cmake -DDISABLE_JEMALLOC=ON -DSTATIC_BUILD= -DSKIP_TESTS=true -DENABLE_JNI=ON .. \ |
There was a problem hiding this comment.
OPENSSL_FORCE_SHARED no longer makes sense (doesn't hurt either, but it was confusing).
|
Executed properly in a new folder on my U18, merging. |
Signed-off-by: Arpad Boda <aboda@apache.org> This closes apache#655
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 master)?
Is your initial contribution a single, squashed commit?
For code changes:
For documentation related changes:
Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.