This is an automated email from the ASF dual-hosted git repository.
aldrin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new 4d8f45f MINIFICPP-837: Add enable JNI flag and enable mqtt
4d8f45f is described below
commit 4d8f45fec2f5c0e6f16c289cdc42bce1f3782516
Author: Marc Parisi <[email protected]>
AuthorDate: Thu May 9 10:18:20 2019 -0400
MINIFICPP-837: Add enable JNI flag and enable mqtt
This closes #552.
Signed-off-by: Aldrin Piri <[email protected]>
---
cmake/DockerConfig.cmake | 10 +++++-----
docker/ContainerBuild.sh | 2 ++
docker/bionic/Dockerfile | 3 ++-
docker/centos/Dockerfile | 3 ++-
docker/debian/Dockerfile | 3 ++-
docker/fedora/Dockerfile | 3 ++-
docker/xenial/Dockerfile | 3 ++-
7 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/cmake/DockerConfig.cmake b/cmake/DockerConfig.cmake
index ab12f1b..b1ca54d 100644
--- a/cmake/DockerConfig.cmake
+++ b/cmake/DockerConfig.cmake
@@ -24,29 +24,29 @@ add_custom_target(
add_custom_target(
centos
- COMMAND ${CMAKE_SOURCE_DIR}/docker/ContainerBuild.sh 1000 1000
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
minificppsource ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} centos
+ COMMAND ${CMAKE_SOURCE_DIR}/docker/ContainerBuild.sh 1000 1000
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
minificppsource ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} centos ${ENABLE_JNI}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docker/centos/)
add_custom_target(
debian
- COMMAND ${CMAKE_SOURCE_DIR}/docker/ContainerBuild.sh 1000 1000
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
minificppsource ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} debian
+ COMMAND ${CMAKE_SOURCE_DIR}/docker/ContainerBuild.sh 1000 1000
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
minificppsource ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} debian ${ENABLE_JNI}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docker/debian/)
add_custom_target(
fedora
- COMMAND ${CMAKE_SOURCE_DIR}/docker/ContainerBuild.sh 1000 1000
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
minificppsource ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} fedora
+ COMMAND ${CMAKE_SOURCE_DIR}/docker/ContainerBuild.sh 1000 1000
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
minificppsource ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} fedora ${ENABLE_JNI}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docker/fedora/)
add_custom_target(
u18
- COMMAND ${CMAKE_SOURCE_DIR}/docker/ContainerBuild.sh 1000 1000
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
minificppsource ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} bionic
+ COMMAND ${CMAKE_SOURCE_DIR}/docker/ContainerBuild.sh 1000 1000
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
minificppsource ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} bionic ${ENABLE_JNI}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docker/bionic/)
add_custom_target(
u16
- COMMAND ${CMAKE_SOURCE_DIR}/docker/ContainerBuild.sh 1000 1000
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
minificppsource ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} xenial
+ COMMAND ${CMAKE_SOURCE_DIR}/docker/ContainerBuild.sh 1000 1000
${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
minificppsource ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} xenial ${ENABLE_JNI}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docker/xenial/)
diff --git a/docker/ContainerBuild.sh b/docker/ContainerBuild.sh
index 4e736e2..9164ba5 100755
--- a/docker/ContainerBuild.sh
+++ b/docker/ContainerBuild.sh
@@ -26,6 +26,7 @@ MINIFI_SOURCE_CODE=$4
CMAKE_SOURCE_DIR=$5
DUMP_LOCATION=$6
DISTRO_NAME=$7
+ENABLE_JNI=$8
echo "NiFi-MiNiFi-CPP Version: $MINIFI_VERSION"
echo "Current Working Directory: $(pwd)"
@@ -53,6 +54,7 @@ DOCKER_COMMAND="docker build --build-arg UID=$UID_ARG \
--build-arg MINIFI_VERSION=$MINIFI_VERSION \
--build-arg
MINIFI_SOURCE_CODE=$MINIFI_SOURCE_CODE \
--build-arg DUMP_LOCATION=$DUMP_LOCATION \
+ --build-arg ENABLE_JNI=$ENABLE_JNI \
-t \
apacheminificpp:${DISTRO_NAME}-$MINIFI_VERSION ."
echo "Docker Command: '$DOCKER_COMMAND'"
diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile
index 6b3ab55..0154f5b 100644
--- a/docker/bionic/Dockerfile
+++ b/docker/bionic/Dockerfile
@@ -26,6 +26,7 @@ ARG GID
ARG MINIFI_VERSION
ARG MINIFI_SOURCE_CODE
ARG DUMP_LOCATION
+ARG ENABLE_JNI
# Install the system dependencies needed for a build
@@ -52,5 +53,5 @@ RUN cd $MINIFI_BASE_DIR \
&& rm -rf build \
&& mkdir build \
&& cd build \
- && cmake -DUSE_SHARED_LIBS= -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON
-DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=ON
.. \
+ && cmake -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON
-DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true
-DENABLE_JNI=$ENABLE_JNI .. \
&& make -j8 package
\ No newline at end of file
diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index e604fc6..864ce03 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -26,6 +26,7 @@ ARG GID
ARG MINIFI_VERSION
ARG MINIFI_SOURCE_CODE
ARG DUMP_LOCATION
+ARG ENABLE_JNI
# Install the system dependencies needed for a build
@@ -51,7 +52,7 @@ RUN cd $MINIFI_BASE_DIR \
&& rm -rf build \
&& mkdir build \
&& cd build \
- && cmake3 -DUSE_SHARED_LIBS= -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON
-DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=ON
.. \
+ && cmake3 -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON
-DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true
-DENABLE_JNI=$ENABLE_JNI .. \
&& make -j8 package
#COPY $MINIFI_BASE_DIR/build/nifi-minifi-cpp-$MINIFI_VERSION-bin.tar.gz
$DUMP_LOCATION/nifi-minifi-cpp-centos7-$MINIFI_VERSION-bin.tar.gz
\ No newline at end of file
diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index ec9391c..a710e60 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -26,6 +26,7 @@ ARG GID
ARG MINIFI_VERSION
ARG MINIFI_SOURCE_CODE
ARG DUMP_LOCATION
+ARG ENABLE_JNI
# Install the system dependencies needed for a build
@@ -51,5 +52,5 @@ RUN cd $MINIFI_BASE_DIR \
&& rm -rf build \
&& mkdir build \
&& cd build \
- && cmake -DUSE_SHARED_LIBS= -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON
-DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=ON
.. \
+ && cmake -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON
-DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true
-DENABLE_JNI=$ENABLE_JNI .. \
&& make -j8 package
\ No newline at end of file
diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile
index 46022d5..612e897 100644
--- a/docker/fedora/Dockerfile
+++ b/docker/fedora/Dockerfile
@@ -26,6 +26,7 @@ ARG GID
ARG MINIFI_VERSION
ARG MINIFI_SOURCE_CODE
ARG DUMP_LOCATION
+ARG ENABLE_JNI
# Install the system dependencies needed for a build
@@ -53,5 +54,5 @@ RUN cd $MINIFI_BASE_DIR \
&& rm -rf build \
&& mkdir build \
&& cd build \
- && cmake3 -DUSE_SHARED_LIBS= -DFAIL_ON_WARNINGS=OFF
-DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON
-DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=ON .. \
+ && cmake3 -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DFAIL_ON_WARNINGS=OFF
-DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON
-DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
&& make -j8 package
diff --git a/docker/xenial/Dockerfile b/docker/xenial/Dockerfile
index 9922977..152cabc 100644
--- a/docker/xenial/Dockerfile
+++ b/docker/xenial/Dockerfile
@@ -26,6 +26,7 @@ ARG GID
ARG MINIFI_VERSION
ARG MINIFI_SOURCE_CODE
ARG DUMP_LOCATION
+ARG ENABLE_JNI
# Install the system dependencies needed for a build
ENV USER root
@@ -52,5 +53,5 @@ RUN cd $MINIFI_BASE_DIR \
&& rm -rf build \
&& mkdir build \
&& cd build \
- && cmake -DUSE_SHARED_LIBS= -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON
-DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=ON
.. \
+ && cmake -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON
-DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true
-DENABLE_JNI=$ENABLE_JNI .. \
&& make -j8 package
\ No newline at end of file
