HPCC-8882 Move workflow.cpp from eclrtl.so to workunit.so

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

common/workunit/CMakeLists.txt

@@ -28,11 +28,13 @@ set (    SRCS
          workunit.cpp 
          wujobq.cpp
          package.cpp
+         workflow.cpp
                  
          workunit.hpp 
          wuerror.hpp
          wujobq.hpp
          package.h
+         workflow.hpp
          pkgimpl.hpp
     )
 

rtl/eclrtl/workflow.cpp

@@ -999,17 +999,17 @@ const char * WorkflowMachine::queryEventExtra() const
 }
 
 
-ECLRTL_API IWorkflowItemIterator *createWorkflowItemIterator(IPropertyTree *p)
+WORKUNIT_API IWorkflowItemIterator *createWorkflowItemIterator(IPropertyTree *p)
 {
     return new CWorkflowItemIterator(p);
 }
 
-ECLRTL_API IWorkflowItemArray *createWorkflowItemArray(unsigned size)
+WORKUNIT_API IWorkflowItemArray *createWorkflowItemArray(unsigned size)
 {
     return new CCloneWorkflowItemArray(size);
 }
 
-ECLRTL_API IWorkflowItem *createWorkflowItem(IPropertyTree * ptree, unsigned wfid, WFType type, WFMode mode, unsigned success, unsigned failure, unsigned recovery, unsigned retriesAllowed, unsigned contingencyFor)
+WORKUNIT_API IWorkflowItem *createWorkflowItem(IPropertyTree * ptree, unsigned wfid, WFType type, WFMode mode, unsigned success, unsigned failure, unsigned recovery, unsigned retriesAllowed, unsigned contingencyFor)
 {
     return new CWorkflowItem(ptree, wfid, type, mode, success, failure, recovery, retriesAllowed, contingencyFor);
 }

rtl/eclrtl/workflow.hpp

@@ -18,12 +18,12 @@
 #ifndef workflow_incl
 #define workflow_incl
 
-#include "eclrtl.hpp"
+#include "thorhelper.hpp"
 #include "workunit.hpp"
 #include "jlog.hpp"
 #include "eclhelper.hpp"
 
-class ECLRTL_API WorkflowException : public CInterface, public IException
+class WORKUNIT_API WorkflowException : public CInterface, public IException
 {
 public:
     typedef enum { SYSTEM, USER, ABORT } Type;
@@ -63,7 +63,7 @@ private:
   *  - Support once, stored, persist workflow items.
   *
   */
-class ECLRTL_API WorkflowMachine : public CInterface
+class WORKUNIT_API WorkflowMachine : public CInterface
 {
 public:
     WorkflowMachine();
@@ -124,13 +124,13 @@ protected:
     unsigned condition;
 };
 
-extern ECLRTL_API IWorkflowItemIterator *createWorkflowItemIterator(IPropertyTree *p);
-extern ECLRTL_API IWorkflowItemArray *createWorkflowItemArray(unsigned size);
-extern ECLRTL_API IWorkflowItem *createWorkflowItem(IPropertyTree * ptree, unsigned wfid, WFType type, WFMode mode, unsigned success, unsigned failure, unsigned recovery, unsigned retriesAllowed, unsigned contingencyFor);
-extern ECLRTL_API IWorkflowItemIterator *createWorkflowItemIterator(IPropertyTree * ptree);
+extern WORKUNIT_API IWorkflowItemIterator *createWorkflowItemIterator(IPropertyTree *p);
+extern WORKUNIT_API IWorkflowItemArray *createWorkflowItemArray(unsigned size);
+extern WORKUNIT_API IWorkflowItem *createWorkflowItem(IPropertyTree * ptree, unsigned wfid, WFType type, WFMode mode, unsigned success, unsigned failure, unsigned recovery, unsigned retriesAllowed, unsigned contingencyFor);
+extern WORKUNIT_API IWorkflowItemIterator *createWorkflowItemIterator(IPropertyTree * ptree);
 
 #ifdef TRACE_WORKFLOW
-extern const ECLRTL_API LogMsgCategory MCworkflow;       // Category used to inform enqueue/start/finish of workflow item
+extern const WORKUNIT_API LogMsgCategory MCworkflow;       // Category used to inform enqueue/start/finish of workflow item
 #endif
 
 #endif

rtl/eclrtl/CMakeLists.txt

@@ -37,14 +37,12 @@ set (    SRCS
          rtlread.cpp 
          rtltype.cpp 
          rtlxml.cpp 
-         workflow.cpp 
     )
 
 include_directories ( 
          ./../../rtl/include 
          ./../../rtl/nbcd 
          ./../../system/include 
-         ./../../common/workunit
          ./../../system/jlib 
          ./../../testing/unittests
          ${ICU_INCLUDE_DIR}