Merge branch 'candidate-7.10.x'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

cmake_modules/docMacros.cmake

@@ -114,7 +114,7 @@ MACRO(DOCBOOK_TO_HTML _xsl_file _xml_file _out_dir _html_target _css_path _zip_t
        STRING(REGEX REPLACE ".+/([^/]+)$" "\\1" _out_dir2 "${_out_dir}")
 
        if(NOT "${_zip_target}" STREQUAL "")
-          SET(_zip_file ${_out_dir2}-${DOC_VERSION_ONLY}.zip)
+          SET(_zip_file ${_html_target}-${DOC_VERSION_ONLY}.zip)
        endif()
        ADD_CUSTOM_COMMAND(
            COMMAND mkdir -p ${_out_dir}

docs/PT_BR/HTMLHelp/CMakeLists.txt

@@ -0,0 +1,17 @@
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+################################################################################
+get_filename_component(DOC_DIR_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../BuildTools/cmake_config/${DOC_DIR_NAME}.txt)

esp/src/package.json

@@ -31,7 +31,6 @@
   },
   "main": "src/stub.js",
   "dependencies": {
-    "d3-array": "2.7.1",
     "@hpcc-js/chart": "2.50.0",
     "@hpcc-js/codemirror": "2.31.0",
     "@hpcc-js/common": "2.40.0",

esp/src/src/ECLArchiveWidget.ts

@@ -1,11 +1,10 @@
 import { ECLEditor } from "@hpcc-js/codemirror";
-import { Palette } from "@hpcc-js/common";
+import { extent, Palette } from "@hpcc-js/common";
 import { Workunit } from "@hpcc-js/comms";
 import { HTMLTooltip } from "@hpcc-js/html";
 import { SplitPanel } from "@hpcc-js/phosphor";
 import { DirectoryTree } from "@hpcc-js/tree";
 import { xml2json } from "@hpcc-js/util";
-import { extent } from "d3-array";
 import "dijit/form/Button";
 import "dijit/layout/BorderContainer";
 import "dijit/layout/ContentPane";

esp/src/stub.htm

@@ -6,6 +6,60 @@
     <meta charset="utf-8">
     <title>ECL Watch</title>
     <script src="/esp/files/node_modules/es6-promise/dist/es6-promise.auto.min.js"></script>
+    <script>
+        //  Polyfills  ---
+        if (typeof Object.assign !== 'function') {
+            Object.defineProperty(Object, "assign", {
+                value: function assign(target, varArgs) {
+                    'use strict';
+                    if (target === null || target === undefined) {
+                        throw new TypeError('Cannot convert undefined or null to object');
+                    }
+                    var to = Object(target);
+                    for (var index = 1; index < arguments.length; index++) {
+                        var nextSource = arguments[index];
+                        if (nextSource !== null && nextSource !== undefined) {
+                            for (var nextKey in nextSource) {
+                                if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+                                    to[nextKey] = nextSource[nextKey];
+                                }
+                            }
+                        }
+                    }
+                    return to;
+                },
+                writable: true,
+                configurable: true
+            });
+        }
+
+        if (!Array.prototype.find) {
+            Object.defineProperty(Array.prototype, 'find', {
+                value: function (predicate) {
+                    if (this == null) {
+                        throw TypeError('"this" is null or not defined');
+                    }
+                    var o = Object(this);
+                    var len = o.length >>> 0;
+                    if (typeof predicate !== 'function') {
+                        throw TypeError('predicate must be a function');
+                    }
+                    var thisArg = arguments[1];
+                    var k = 0;
+                    while (k < len) {
+                        var kValue = o[k];
+                        if (predicate.call(thisArg, kValue, k, o)) {
+                            return kValue;
+                        }
+                        k++;
+                    }
+                    return undefined;
+                },
+                configurable: true,
+                writable: true
+            });
+        }
+    </script>
     <link rel="stylesheet" href="/esp/files/dist/font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/esp/files/img/favlogo.png">
     <script type="text/javascript" src="/esp/files/dist/stub.eclwatch.js" charset="utf-8"></script>
@@ -61,4 +115,4 @@
     <!-- application -->
 </body>
 
-</html>
+</html>

plugins/cassandra/CMakeLists.txt

@@ -74,6 +74,7 @@ if(USE_CASSANDRA)
     remove_definitions (-fsanitize=undefined -fno-sanitize=alignment -fsanitize-trap=undefined)
   endif()
   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cpp-driver/cmake/modules/")
+  set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
   set(CASS_ROOT_DIR "${PROJECT_SOURCE_DIR}/cpp-driver")
   add_subdirectory(cpp-driver ${PROJECT_BINARY_DIR}/cassandra)
   add_dependencies(cassandra libuv)