MINIFICPP-479: begin incorporating validators

MINIFICPP-479: Make updates to how values can be used MINIFICPP-479: Update processors MINIFICPP-479: Add capability to persist flow updates, and fix allowableValue in responses MINIFICPP-479: Resolve issues with restartability of schedulers MINIFICPP-479: Resolve issues with prioritizer reloading MINIFICPP-697: Fix issues with same names This closes #460. Signed-off-by: Aldrin Piri <aldrin@apache.org>
apache · Jan 9, 2019 · 3433331 · 3433331
1 parent 20642f5
commit 3433331
Show file tree

Hide file tree

Showing 73 changed files with 2,572 additions and 778 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -199,7 +199,11 @@ if(USE_SYSTEM_ZLIB STREQUAL "OFF")
   message("Using bundled zlib")
 
   if (WIN32)
+  IF(CMAKE_BUILD_TYPE MATCHES RELEASE)
+  set(BYPRODUCT "thirdparty/zlib-install/lib/zlibstatic.lib")
+  else()
   set(BYPRODUCT "thirdparty/zlib-install/lib/zlibstaticd.lib")
+  endif()
   else()
   set(BYPRODUCT "thirdparty/zlib-install/lib/libz.a")
   endif()
@@ -257,7 +261,11 @@ if(NOT DISABLE_CURL AND (NOT USE_SYSTEM_CURL))
   set(CURL_CXX_FLAGS "${CURL_C_FLAGS}")
 
   if (WIN32)
-  set(BYPRODUCT "thirdparty/curl-install/lib/libcurl-d.lib")
+  IF(CMAKE_BUILD_TYPE MATCHES RELEASE)
+	set(BYPRODUCT "thirdparty/curl-install/lib/libcurl.lib")
+  else()
+  	set(BYPRODUCT "thirdparty/curl-install/lib/libcurl-d.lib")
+  endif()
   else()
   set(BYPRODUCT "thirdparty/curl-install/lib/libcurl.a")
   endif()
@@ -532,7 +540,15 @@ else()
 endif()
 # Generate source assembly
 set(ASSEMBLY_BASE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+if(WIN32)
+set(CPACK_ALL_INSTALL_TYPES Full Developer)
+set(CPACK_COMPONENT_LIBRARIES_INSTALL_TYPES Developer Full)
+set(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
+set(CPACK_COMPONENT_APPLICATIONS_INSTALL_TYPES Full)
+
+else()
 set(CPACK_SOURCE_GENERATOR "TGZ")
+endif(WIN32)
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${ASSEMBLY_BASE_NAME}-source")
 set(CPACK_SOURCE_IGNORE_FILES "/docs/generated/;${CMAKE_SOURCE_DIR}/build/;~$;${CPACK_SOURCE_IGNORE_FILES};${CMAKE_SOURCE_DIR}/.git/;${CMAKE_SOURCE_DIR}/.idea/;${CMAKE_SOURCE_DIR}/cmake-build-debug/;${CMAKE_SOURCE_DIR}/extensions/expression-language/Scanner.h;${CMAKE_SOURCE_DIR}/extensions/expression-language/Scanner.cpp;${CMAKE_SOURCE_DIR}/extensions/expression-language/Parser.cpp;${CMAKE_SOURCE_DIR}/extensions/expression-language/Parser.hpp;${CMAKE_SOURCE_DIR}/extensions/expression-language/scanner.hh;${CMAKE_SOURCE_DIR}/extensions/expression-language/position.hh;${CMAKE_SOURCE_DIR}/extensions/expression-language/location.hh;${CMAKE_SOURCE_DIR}/extensions/expression-language/stack.hh")
 
@@ -549,14 +565,17 @@ install(FILES LICENSE README.md NOTICE
         DESTINATION .
         COMPONENT bin)
 
-set(CPACK_GENERATOR "TGZ")
+
 set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 1)
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Apache NiFi MiNiFi C++ version ${VERSION}")
 set(CPACK_PACKAGE_VENDOR "Apache NiFi")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_FILE_NAME "${ASSEMBLY_BASE_NAME}")
+if(NOT WIN32)
+set(CPACK_GENERATOR "TGZ")
 set(CPACK_BINARY_TGZ, "ON")
+endif()
 set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 set(CPACK_RDKAFKA_COMPONENT_INSTALL ON)
 set(CPACK_MQTT_COMPONENT_INSTALL ON)

diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -1,7 +1,7 @@
 {
   // See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file.
   "configurations": [
-       {
+    {
       "name": "x64-Debug",
       "generator": "Visual Studio 14 2015 Win64",
       "configurationType": "Debug",
@@ -10,73 +10,73 @@
       "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
       "cmakeCommandArgs": "",
       "buildCommandArgs": "-v:minimal -m:8",
-        "variables": [
-          {
-            "name": "OPENSSL_OFF",
-            "value": "OFF"
-          },
-          {
-            "name": "USE_SYSTEM_OPENSSL",
-            "value": "ON"
-          },
-          {
-            "name": "OPENSSL_ROOT_DIR",
-            "value": "C:\\OpenSSL-Win64"
-          },
-          {
-            "name": "USE_SYSTEM_ZLIB",
-            "value": "OFF"
-          },
-          {
-            "name": "USE_SYSTEM_CURL",
-            "value": "OFF"
-          },
-          {
-            "name": "USE_SYSTEM_UUID",
-            "value": "OFF"
-          },
-          {
-            "name": "FORCE_WINDOWS",
-            "value": "ON"
-          },
-          {
-            "name": "DISABLE_ROCKSDB",
-            "value": "FALSE"
-          },
-          {
-            "name": "ENABLE_WEL",
-            "value": "TRUE"
-          },
-          {
-            "name": "ENABLE_LIBRDKAFKA",
-            "value": "OFF"
-          },
-          {
-            "name": "DISABLE_CURL",
-            "value": "OFF"
-          },
-          {
-            "name": "DISABLE_LIBARCHIVE",
-            "value": "TRUE"
-          },
-          {
-            "name": "DISABLE_SCRIPTING",
-            "value": "TRUE"
-          },
-          {
-            "name": "EXCLUDE_BOOST",
-            "value": "TRUE"
-          },
-          {
-            "name": "DISABLE_EXPRESSION_LANGUAGE",
-            "value": "TRUE"
-          },
-          {
-            "name": "SKIP_TESTS",
-            "value": "TRUE"
-          }
+      "variables": [
+        {
+          "name": "OPENSSL_OFF",
+          "value": "OFF"
+        },
+        {
+          "name": "USE_SYSTEM_OPENSSL",
+          "value": "ON"
+        },
+        {
+          "name": "OPENSSL_ROOT_DIR",
+          "value": "C:\\OpenSSL-Win64"
+        },
+        {
+          "name": "USE_SYSTEM_ZLIB",
+          "value": "OFF"
+        },
+        {
+          "name": "USE_SYSTEM_CURL",
+          "value": "OFF"
+        },
+        {
+          "name": "USE_SYSTEM_UUID",
+          "value": "OFF"
+        },
+        {
+          "name": "FORCE_WINDOWS",
+          "value": "ON"
+        },
+        {
+          "name": "DISABLE_ROCKSDB",
+          "value": "FALSE"
+        },
+        {
+          "name": "ENABLE_WEL",
+          "value": "TRUE"
+        },
+        {
+          "name": "ENABLE_LIBRDKAFKA",
+          "value": "OFF"
+        },
+        {
+          "name": "DISABLE_CURL",
+          "value": "OFF"
+        },
+        {
+          "name": "DISABLE_LIBARCHIVE",
+          "value": "TRUE"
+        },
+        {
+          "name": "DISABLE_SCRIPTING",
+          "value": "TRUE"
+        },
+        {
+          "name": "EXCLUDE_BOOST",
+          "value": "TRUE"
+        },
+        {
+          "name": "DISABLE_EXPRESSION_LANGUAGE",
+          "value": "TRUE"
+        },
+        {
+          "name": "SKIP_TESTS",
+          "value": "TRUE"
+        }
 
-        ],
+      ],
       "ctestCommandArgs": ""
     },
     {
@@ -87,16 +87,29 @@
       "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
       "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
       "cmakeCommandArgs": "",
-      "buildCommandArgs": "-v",
+      "buildCommandArgs": "-v -j8",
+      "$" { "env.USERPROFILE" },
       "variables": [
         {
           "name": "OPENSSL_OFF",
+          "value": "OFF"
+        },
+        {
+          "name": "USE_SYSTEM_OPENSSL",
           "value": "ON"
         },
+        {
+          "name": "OPENSSL_ROOT_DIR",
+          "value": "C:\\OpenSSL-Win64"
+        },
         {
           "name": "USE_SYSTEM_ZLIB",
           "value": "OFF"
         },
+        {
+          "name": "DISABLE_CONTROLLER",
+          "value": "TRUE"
+        },
         {
           "name": "USE_SYSTEM_CURL",
           "value": "OFF"
@@ -145,7 +158,6 @@
           "name": "SKIP_TESTS",
           "value": "TRUE"
         }
-
       ],
       "ctestCommandArgs": ""
     }