Merge branch 'candidate-7.10.x'

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

dockerfiles/platform-build/Dockerfile

@@ -49,7 +49,7 @@ RUN mkdir build
 WORKDIR /hpcc-dev/build
 
 ARG BUILD_TYPE=RelWithDebInfo
-RUN cmake /hpcc-dev/HPCC-Platform -Wno-dev -DCONTAINERIZED=1 -DINCLUDE_PLUGINS=1 -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DUSE_PYTHON2=0
+RUN cmake /hpcc-dev/HPCC-Platform -Wno-dev -DCONTAINERIZED=1 -DINCLUDE_PLUGINS=1 -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DUSE_PYTHON2=0 -DSUPPRESS_SPARK=1
 
 ARG BUILD_THREADS
 RUN if [ -n "${BUILD_THREADS}" ] ; then echo ${BUILD_THREADS} > ~/build_threads; else echo $(nproc) > ~/build_threads ; fi

esp/esdllib/CMakeLists.txt

@@ -73,7 +73,4 @@ IF (USE_LIBXSLT)
     include_directories (
          ${LIBXML2_INCLUDE_DIR}
     )
-    target_link_libraries ( esdl_svc_engine
-        ${LIBXML2_LIBRARIES}
-    )
 ENDIF()

esp/esdllib/esdl_xpath_extensions_unsupported.cpp

@@ -24,7 +24,7 @@
 #include "espcontext.hpp"
 #include "esdl_script.hpp"
 
-void registerEsdlXPathExtensions(IXpathContext *xpathContext, IEspContext *context, const StringArray &prefixes)
+void registerEsdlXPathExtensions(IXpathContext *xpathContext, IEsdlScriptContext *context, const StringArray &prefixes)
 {
     //nothing to register.  xpath will error on use of function attempt
 

system/xmllib/libxml_xpathprocessor.cpp

@@ -105,6 +105,7 @@ public:
 
     virtual void extractReferences(StringArray &functions, StringArray &variables) override
     {
+#ifndef _WIN32
         char *buf = nullptr;
         size_t len = 0;
 
@@ -120,6 +121,9 @@ public:
         while (line)
             line = extractFromLineGetNext(functions, variables, line);
         free (buf);
+#else
+        UNIMPLEMENTED;
+#endif
     }
 };
 static xmlXPathObjectPtr variableLookupFunc(void *data, const xmlChar *name, const xmlChar *ns_uri);

system/xmllib/xalan_processor.cpp

@@ -16,6 +16,7 @@
 ############################################################################## */
 
 #include "xalan_processor.ipp"
+#include "xpathprocessor.hpp"
 #include "jencrypt.hpp"
 #include "jexcept.hpp"
 #include "xalanc/XPath/XObjectFactory.hpp"
@@ -692,3 +693,13 @@ void CXslTransform::message(StringBuffer& out, const char* in, IXslTransform* pT
     CXslTransform* pTrans = dynamic_cast<CXslTransform*>(pTransform);
     pTrans->m_sMessages.append(in).append('\n');
 }
+
+extern ICompiledXpath* compileXpath(const char * xpath)
+{
+    UNIMPLEMENTED;
+}
+
+extern IXpathContext* getXpathContext(const char * xmldoc, bool strictParameterDeclaration, bool removeDocNamespaces)
+{
+    UNIMPLEMENTED;
+}