Fixes #443, #205 Refactoring of CMake install system

This is a complete refactoring of the our CMake install system to clean up a series of issues with our generated packages.

- Creation of proper tree based cmake files for a majority of our directories.
- Moving of all install lines to proper tree based cmake files.
- Removal of install_directory and all files in the dir.
- Refactoring of the top level CMakeLists.txt to call the tree based cmake files instead of subdirectories.

This provides a fix for #443 (cascaded subproject building) and #205 (Lintain, low quality package).

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>

Author: pschwartz

CMakeLists.txt

@@ -124,144 +124,20 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 include(${HPCC_SOURCE_DIR}/cmake_modules/commonSetup.cmake)
 
 add_subdirectory (initfiles)
-
-add_subdirectory (tools/esdl)
-add_subdirectory (tools/hidl)
-
-add_subdirectory (esp/scm)
-add_subdirectory (common/commonext)
-add_subdirectory (common/deftype)
-add_subdirectory (common/dllserver)
-add_subdirectory (common/environment)
-add_subdirectory (common/fileview2)
-add_subdirectory (common/monitoring/prosysinfo)
-add_subdirectory (common/remote)
-add_subdirectory (common/roxiecommlib)
-add_subdirectory (common/roxiehelper)
-add_subdirectory (common/roxiemanager)
-add_subdirectory (common/thorhelper)
-add_subdirectory (common/workunit)
-add_subdirectory (common/wuwebview)
-add_subdirectory (dali/base)
-add_subdirectory (dali/dafilesrv)
-add_subdirectory (dali/dalidiag)
-add_subdirectory (dali/dalistop)
-add_subdirectory (dali/datest)
-if (CPPUNIT)
-    add_subdirectory (dali/daunittest)
-endif()
-add_subdirectory (dali/dfu)
-add_subdirectory (dali/dfuplus)
-add_subdirectory (dali/dfuxref)
-add_subdirectory (dali/dfuXRefLib)
-add_subdirectory (dali/ft)
-add_subdirectory (dali/regress)
-add_subdirectory (dali/sdsfix)
-add_subdirectory (dali/daliadmin)
-add_subdirectory (dali/server)
-add_subdirectory (dali/treeview)
-add_subdirectory (dali/updtdalienv)
-add_subdirectory (deployment/configgen)
-add_subdirectory (deployment/deploy)
-add_subdirectory (deployment/deployutils)
-add_subdirectory (deployment/envgen)
-add_subdirectory (ecl/agentexec)
-add_subdirectory (ecl/eclagent)
-add_subdirectory (ecl/eclcc)
-add_subdirectory (ecl/eclccserver)
-add_subdirectory (ecl/eclcmd)
-add_subdirectory (ecl/eclscheduler)
-add_subdirectory (ecl/eclplus)
-add_subdirectory (ecl/hql)
-add_subdirectory (ecl/hqlcpp)
-add_subdirectory (ecl/hthor)
-add_subdirectory (ecl/scheduleadmin)
-add_subdirectory (ecl/schedulectrl)
-add_subdirectory (ecl/wutest)
-add_subdirectory (esp/bindings/SOAP/soaplib)
-add_subdirectory (esp/clients/LoggingClient)
-add_subdirectory (esp/clients/wsecl)
-add_subdirectory (esp/clients/WUManager)
-add_subdirectory (esp/platform)
-add_subdirectory (esp/protocols/http)
-add_subdirectory (esp/services/ecldirect)
-add_subdirectory (esp/services/ws_access)
-add_subdirectory (esp/services/ws_account)
-add_subdirectory (esp/services/ws_config)
-add_subdirectory (esp/services/ws_dfu)
-add_subdirectory (esp/services/ws_ecl)
-add_subdirectory (esp/services/ws_fileio)
-add_subdirectory (esp/services/ws_fs)
-add_subdirectory (esp/services/ws_machine)
-add_subdirectory (esp/services/ws_roxiequery)
-add_subdirectory (esp/services/ws_smc)
-add_subdirectory (esp/services/ws_topology)
-add_subdirectory (esp/services/ws_workunits)
-add_subdirectory (esp/services/WsDeploy)
-add_subdirectory (esp/smc/SMCLib)
-add_subdirectory (esp/test/httptest)
-add_subdirectory (esp/tools/soapplus)
-add_subdirectory (plugins/auditlib)
-add_subdirectory (plugins/debugservices)
-add_subdirectory (plugins/fileservices)
-add_subdirectory (plugins/logging)
-add_subdirectory (plugins/parselib)
-add_subdirectory (plugins/stringlib)
-add_subdirectory (plugins/unicodelib)
-add_subdirectory (plugins/workunitservices)
-add_subdirectory (roxie/ccd)
-add_subdirectory (roxie/roxie)
-add_subdirectory (roxie/roxieclient)
-add_subdirectory (roxie/roxieclienttest)
-add_subdirectory (roxie/roxiemem)
-add_subdirectory (roxie/roxiepipe)
-add_subdirectory (roxie/udplib)
-add_subdirectory (rtl/eclrtl)
-add_subdirectory (rtl/nbcd)
-add_subdirectory (dali/sasha)
-add_subdirectory (services/runagent)
-add_subdirectory (system/hrpc)
-add_subdirectory (system/jhtree)
-add_subdirectory (system/jlib)
-add_subdirectory (system/lzma)
-add_subdirectory (system/mp)
-add_subdirectory (system/mp/test)
-add_subdirectory (system/security/LdapSecurity)
-add_subdirectory (system/security/securesocket)
-add_subdirectory (system/security/test/ldapsecuritytest)
-add_subdirectory (system/security/test/myssl)
-if (USE_ZLIB)
-  add_subdirectory (system/security/zcrypt)
-endif()
-add_subdirectory (system/xmllib)
-
-add_subdirectory (thorlcr/activities)
-add_subdirectory (thorlcr/graph)
-add_subdirectory (thorlcr/master)
-add_subdirectory (thorlcr/mfilemanager)
-add_subdirectory (thorlcr/msort)
-add_subdirectory (thorlcr/slave)
-add_subdirectory (thorlcr/thorcodectx)
-add_subdirectory (tools/backupnode)
-add_subdirectory (tools/combine)
-add_subdirectory (tools/dumpkey)
-add_subdirectory (tools/keydiff)
-add_subdirectory (tools/pstart)
-add_subdirectory (tools/pskill)
-add_subdirectory (tools/testsocket)
-add_subdirectory (tools/swapnode)
-add_subdirectory (tools/vkey)
-add_subdirectory (tools/xmlsize)
-add_subdirectory (tools/wuget)
-add_subdirectory (tools/copyexp)
-add_subdirectory (tools/genht)
-
-
-# start-stop-daemon is linux only.
-if ( CMAKE_SYSTEM MATCHES Linux )
-    message ("-- Building start-stop-daemon")
-    add_subdirectory (tools/start-stop-daemon)
-endif()
+add_subdirectory (tools)
+add_subdirectory (common)
+add_subdirectory (dali)
+add_subdirectory (deploy)
+add_subdirectory (deployment)
+add_subdirectory (ecl)
+add_subdirectory (ecllibrary)
+add_subdirectory (esp)
+add_subdirectory (plugins)
+add_subdirectory (roxie)
+add_subdirectory (rtl)
+add_subdirectory (services)
+add_subdirectory (system)
+add_subdirectory (thorlcr)
 
 ###
 ## CPack install and packaging setup.
@@ -340,20 +216,14 @@ set(CPACK_SOURCE_IGNORE_FILES
         )
 
 ###
-## Run file configuration to set build tag
+## Run file configuration to set build tag along with install lines for generated
+## config files.
 ###
 set( BUILD_TAG "${CPACK_RPM_PACKAGE_VERSION}_${CPACK_RPM_PACKAGE_RELEASE}-${stagever}")
 configure_file(${HPCC_SOURCE_DIR}/build-config.h.cmake "build-config.h" )
-configure_file("initfiles/etc/DIR_NAME/version.in" "version")
-configure_file("initfiles/etc/DIR_NAME/environment.conf.in" "environment.conf")
-configure_file("initfiles/etc/DIR_NAME/environment.xml.in" "environment.xml")
-configure_file("initfiles/etc/DIR_NAME/configmgr/configmgr.conf.in" "configmgr.conf")
-configure_file("initfiles/etc/DIR_NAME/configmgr/esp.xml.in" "esp.xml")
-if ( ${HPCC_PROJECT} STREQUAL "community" )
-    configure_file("initfiles/componentfiles/configxml/buildsetCC.xml.in" "buildset.xml")
-else ()
-    configure_file("initfiles/componentfiles/configxml/buildsetEE.xml.in" "buildset.xml")
-endif()
+
+#set( CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON )
+#set( CPACK_DEB_PACKAGE_COMPONENT ON )
 
 
 ###
@@ -408,32 +278,5 @@ endif()
 ## the hpcc platform.
 ###
 
-Install ( FILES ${HPCC_SOURCE_DIR}/${LICENSE_FILE} DESTINATION ${OSSDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
-include( install_directory/overall.install )
-include( install_directory/bash_startup.install )
-include( install_directory/WsReferenceTracker.install )
-include( install_directory/dali.install )
-include( install_directory/dfuplus.install )
-include( install_directory/dfuserver.install )
-include( install_directory/dkcslave.install ) #: MORE - file name is wrong!
-include( install_directory/eclagent.install )       
-include( install_directory/ecldirect.install )
-include( install_directory/ecllibrary.install )
-include( install_directory/eclplus.install )
-include( install_directory/eclcc.install )      
-include( install_directory/eclccserver.install )      
-include( install_directory/eclscheduler.install )
-include( install_directory/esp.install )             
-include( install_directory/espsmc.install )          
-include( install_directory/ftslave.install )
-#include( install_directory/regressionSuite.install )
-include( install_directory/roxie.install )           
-include( install_directory/sasha.install )           
-include( install_directory/thor.install )            
-include( install_directory/ws_account.install )
-include( install_directory/ws_watchlist.install )
-include( install_directory/ws_ecl.install )
-include( install_directory/configgen.install )
-include( install_directory/configmgr.install )
-include( install_directory/agentexec.install )
+Install ( FILES ${HPCC_SOURCE_DIR}/${LICENSE_FILE} DESTINATION ${OSSDIR} COMPONENT Runtime )
 include (CPack)

common/CMakeLists.txt

@@ -0,0 +1,31 @@
+################################################################################
+#    Copyright (C) 2011 HPCC Systems.
+#
+#    This program is free software: you can redistribute it and/or All rights
+#    reserved. This program is NOT PRESENTLY free software: you can NOT
+#    redistribute
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+add_subdirectory (commonext)
+add_subdirectory (deftype)
+add_subdirectory (dllserver)
+add_subdirectory (environment)
+add_subdirectory (fileview2)
+add_subdirectory (monitoring)
+add_subdirectory (remote)
+add_subdirectory (roxiecommlib)
+add_subdirectory (roxiehelper)
+add_subdirectory (roxiemanager)
+add_subdirectory (thorhelper)
+add_subdirectory (workunit)
+add_subdirectory (wuwebview)

common/monitoring/CMakeLists.txt

@@ -0,0 +1,21 @@
+################################################################################
+#    Copyright (C) 2011 HPCC Systems.
+#
+#    This program is free software: you can redistribute it and/or All rights
+#    reserved. This program is NOT PRESENTLY free software: you can NOT
+#    redistribute
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+add_subdirectory (prosysinfo)
+
+Install ( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/preflight DESTINATION ${OSSDIR}/sbin COMPONENT Runtime )

dali/CMakeLists.txt

@@ -0,0 +1,38 @@
+################################################################################
+#    Copyright (C) 2011 HPCC Systems.
+#
+#    This program is free software: you can redistribute it and/or All rights
+#    reserved. This program is NOT PRESENTLY free software: you can NOT
+#    redistribute
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+add_subdirectory (base)
+add_subdirectory (dafilesrv)
+add_subdirectory (dalidiag)
+add_subdirectory (dalistop)
+add_subdirectory (datest)
+if (CPPUNIT)
+    add_subdirectory (daunittest)
+endif()
+add_subdirectory (dfu)
+add_subdirectory (dfuplus)
+add_subdirectory (dfuxref)
+add_subdirectory (dfuXRefLib)
+add_subdirectory (ft)
+add_subdirectory (regress)
+add_subdirectory (sdsfix)
+add_subdirectory (daliadmin)
+add_subdirectory (server)
+add_subdirectory (treeview)
+add_subdirectory (updtdalienv)
+add_subdirectory (sasha)

install_directory/DropZone.install deploy/CMakeLists.txt

@@ -1,7 +1,9 @@
 ################################################################################
 #    Copyright (C) 2011 HPCC Systems.
 #
-#    This program is free software: you can redistribute it and/or All rights reserved. This program is NOT PRESENTLY free software: you can NOT redistribute
+#    This program is free software: you can redistribute it and/or All rights
+#    reserved. This program is NOT PRESENTLY free software: you can NOT
+#    redistribute
 #    it under the terms of the GNU Affero General Public License as
 #    published by the Free Software Foundation, either version 3 of the
 #    License, or (at your option) any later version.
@@ -14,6 +16,4 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
-
-# DropZone Supplementals
-# SCHEMA: name=dropzone.xsd method=schema
+add_subdirectory (gcc3)

install_directory/topology.install deploy/gcc3/CMakeLists.txt

@@ -1,7 +1,9 @@
 ################################################################################
 #    Copyright (C) 2011 HPCC Systems.
 #
-#    This program is free software: you can redistribute it and/or All rights reserved. This program is NOT PRESENTLY free software: you can NOT redistribute
+#    This program is free software: you can redistribute it and/or All rights
+#    reserved. This program is NOT PRESENTLY free software: you can NOT
+#    redistribute
 #    it under the terms of the GNU Affero General Public License as
 #    published by the Free Software Foundation, either version 3 of the
 #    License, or (at your option) any later version.
@@ -14,6 +16,4 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
-
-# topology Supplementals
-# SCHEMA: name=topology.xsd method=schema
+add_subdirectory (bin)

install_directory/SiteCertificate.install deploy/gcc3/bin/CMakeLists.txt

@@ -1,7 +1,9 @@
 ################################################################################
 #    Copyright (C) 2011 HPCC Systems.
 #
-#    This program is free software: you can redistribute it and/or All rights reserved. This program is NOT PRESENTLY free software: you can NOT redistribute
+#    This program is free software: you can redistribute it and/or All rights
+#    reserved. This program is NOT PRESENTLY free software: you can NOT
+#    redistribute
 #    it under the terms of the GNU Affero General Public License as
 #    published by the Free Software Foundation, either version 3 of the
 #    License, or (at your option) any later version.
@@ -14,6 +16,4 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
-
-# SiteCertificate Supplementals
-# SCHEMA: name=SiteCertificate.xsd method=schema
+Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/g++ DESTINATION ${OSSDIR}/componentfiles COMPONENT Runtime )

install_directory/ldapServer.install deployment/CMakeLists.txt

@@ -1,7 +1,9 @@
 ################################################################################
 #    Copyright (C) 2011 HPCC Systems.
 #
-#    This program is free software: you can redistribute it and/or All rights reserved. This program is NOT PRESENTLY free software: you can NOT redistribute
+#    This program is free software: you can redistribute it and/or All rights
+#    reserved. This program is NOT PRESENTLY free software: you can NOT
+#    redistribute
 #    it under the terms of the GNU Affero General Public License as
 #    published by the Free Software Foundation, either version 3 of the
 #    License, or (at your option) any later version.
@@ -14,6 +16,7 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
-
-# ldapServer Supplementals
-# SCHEMA: name=ldapserver.xsd method=schema
+add_subdirectory (configgen)
+add_subdirectory (deploy)
+add_subdirectory (deployutils)
+add_subdirectory (envgen)