Merge pull request #5464 from garonsky/HPCC-10919_windows_linkage_deploy_deployutils

HPCC-10919 Restructure configuration tool projects

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

deployment/CMakeLists.txt

@@ -17,3 +17,4 @@ HPCC_ADD_SUBDIRECTORY (configgen "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (deploy "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (deployutils "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (envgen "PLATFORM")
+HPCC_ADD_SUBDIRECTORY (configutils "PLATFORM")

deployment/configutils/CMakeLists.txt

@@ -0,0 +1,48 @@
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2014 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.
+################################################################################
+
+
+# Component: configutils
+#####################################################
+# Description:
+# ------------
+#    Cmake Input File for configutils
+#####################################################
+
+project( configutils )
+
+set (    SRCS
+         confighelper.cpp
+    )
+
+include_directories (
+         ${HPCC_SOURCE_DIR}/system/include
+         ${HPCC_SOURCE_DIR}/system/jlib
+         ${HPCC_SOURCE_DIR}/system/mp
+         ${HPCC_SOURCE_DIR}/common/environment
+         ${HPCC_SOURCE_DIR}/dali/base
+         ${HPCC_SOURCE_DIR}/deployment/deploy
+         ${CMAKE_BINARY_DIR}/oss
+    )
+
+ADD_DEFINITIONS ( -D_USRDLL -DCONFIGUTILS_EXPORTS )
+
+HPCC_ADD_LIBRARY( configutils SHARED ${SRCS} )
+install ( TARGETS configutils RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
+target_link_libraries ( configutils
+         jlib
+         environment
+    )

deployment/deployutils/confighelper.cpp

@@ -1,4 +1,3 @@
-#include "confighelper.hpp"
 #include "jexcept.hpp"
 #include "jfile.hpp"
 #include "jmutex.hpp"
@@ -6,7 +5,9 @@
 #include "jfile.hpp"
 #include "jptree.hpp"
 #include "XMLTags.h"
+#include "deploy.hpp"
 #include "build-config.h"
+#include "confighelper.hpp"
 
 #define STANDARD_CONFIG_BUILDSETFILE "buildset.xml"
 #define STANDARD_CONFIG_CONFIGXML_DIR "/componentfiles/configxml/"

deployment/deployutils/confighelper.hpp

@@ -1,12 +1,24 @@
 #ifndef CONFIGHELPER_HPP_INCL
 #define CONFIGHELPER_HPP_INCL
 
-#include "deployutils.hpp"
-#include "deploy.hpp"
+#ifdef CONFIGUTILS_EXPORTS
+  #define CONFIGUTILS_API __declspec(dllexport)
+#else
+  #define CONFIGUTILS_API __declspec(dllimport)
+#endif
 
 #define STANDARD_CONFIG_ALGORITHMFILE "genenvrules.conf"
 
-class DEPLOYUTILS_API CConfigHelper
+#include "jmutex.hpp"
+#include "jstring.hpp"
+
+interface IDeploymentCallback;
+interface IPropertyTree;
+class StringArray;
+interface IPropertyTree;
+interface IProperties;
+
+class CONFIGUTILS_API CConfigHelper
 {
 public:
 

deployment/deploy/CMakeLists.txt

@@ -39,7 +39,6 @@ set (    SRCS
          thorconfiggenengine.cpp 
          ThorDeploymentEngine.cpp 
          XslFunctions.cpp
-         ${HPCC_SOURCE_DIR}/deployment/deployutils/confighelper.cpp
     )
 
 include_directories ( 
@@ -52,8 +51,7 @@ include_directories (
          ${HPCC_SOURCE_DIR}/system/security/securesocket
          ${CMAKE_BINARY_DIR}
          ${CMAKE_BINARY_DIR}/oss
-         ${HPCC_SOURCE_DIR}/deployment/deployutils
-         ${HPCC_SOURCE_DIR}/deployment/deploy
+         ${HPCC_SOURCE_DIR}/deployment/configutils
     )
 
 ADD_DEFINITIONS ( -D_USRDLL -DDEPLOY_EXPORTS )
@@ -65,6 +63,7 @@ target_link_libraries ( deploy
          environment 
          xmllib 
          securesocket
+         configutils
     )
 
 if ( PLATFORM )

deployment/deployutils/CMakeLists.txt

@@ -30,7 +30,6 @@ set (    SRCS
          configenvhelper.cpp
          wizardInputs.cpp
          deployutils.cpp
-         confighelper.cpp
     )
 
 include_directories ( 
@@ -43,6 +42,7 @@ include_directories (
          ${HPCC_SOURCE_DIR}/esp/esplib
          ${HPCC_SOURCE_DIR}/deployment/configgen
          ${HPCC_SOURCE_DIR}/deployment/deploy
+         ${HPCC_SOURCE_DIR}/deployment/configutils
          ${CMAKE_BINARY_DIR}
          ${CMAKE_BINARY_DIR}/oss
     )
@@ -56,6 +56,7 @@ target_link_libraries ( deployutils
          environment 
          xmllib
          deploy
+         configutils
     )
 
 

esp/services/WsDeploy/CMakeLists.txt

@@ -56,6 +56,7 @@ include_directories (
          ./../../../system/mp 
          ../../../deployment/deploy 
          ../../../deployment/deployutils 
+         ${HPCC_SOURCE_DIR}/deployment/configutils
          ${CMAKE_BINARY_DIR}
          ${CMAKE_BINARY_DIR}/oss
     )
@@ -75,8 +76,9 @@ target_link_libraries ( WsDeploy
          eclrtl 
          hql 
          securesocket 
-     deploy 
-     deployutils     
+         deploy
+         deployutils
+         configutils
     )