diff --git a/.gitattributes b/.gitattributes index 49fa9112826ddda3e750fe5b6af83e42f6beccf5..1a37ff87b7cafb2ba08fbfe080ddc428f0af4a7d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2407,8 +2407,8 @@ MAC/APL/APLCommon/test/tAntennaField.sh -text MAC/APL/APLCommon/test/tParentControl.cc -text MAC/APL/APLCommon/test/tParentControl.h -text MAC/APL/APLCommon/test/tParentControl.log_prop -text -MAC/APL/Appl_Controller/forkexec.cc -text -MAC/APL/Appl_Controller/forkexec.h -text +MAC/APL/Appl_Controller/src/forkexec.cc -text +MAC/APL/Appl_Controller/src/forkexec.h -text MAC/APL/CASATools/include/CASATools/CasaConverter.h -text MAC/APL/CASATools/src/CasaConverter.cc -text MAC/APL/CASATools/test/tCasaConverter.cc -text diff --git a/MAC/APL/Appl_Controller/CMakeLists.txt b/MAC/APL/Appl_Controller/CMakeLists.txt index ba47e07c2df9fba0ef268f7041b6b9c6e07a975e..1cdc000bb2b63e542833802dcce48852802db64f 100644 --- a/MAC/APL/Appl_Controller/CMakeLists.txt +++ b/MAC/APL/Appl_Controller/CMakeLists.txt @@ -2,43 +2,8 @@ lofar_package(Appl_Controller 2.0 DEPENDS Common MACIO ALC PLC) -lofar_add_bin_program(ApplController - ApplControllerMain.cc - ACCmdImpl.cc - ACDaemonComm.cc - APAdmin.cc - APAdminPool.cc - CmdStack.cc - forkexec.cc - ItemList.cc - ProcRule.cc - ProcRuler.cc - PR_Shell.cc - PR_MPI.cc - PR_BGL.cc - StateEngine.cc - ApplController.cc) - -lofar_add_bin_program(ACDaemon - ACDaemonMain.cc - ACRequestPool.cc - ACDaemon.cc - forkexec.cc) +include(LofarFindPackage) +lofar_find_package(Blitz REQUIRED) -lofar_add_bin_program(ACcli ACcli.cc) +add_subdirectory(src) -lofar_add_bin_program(ACuserMenu ACuserMenu.cc) - -install(PROGRAMS - startAP.sh - startMPI.sh - stopAP.sh - stopMPI.sh - DESTINATION bin) - -install(FILES - ACDaemon.log_prop - ACDaemon.conf - ApplController.log_prop - ACuserMenu.log_prop - DESTINATION etc) diff --git a/MAC/APL/Appl_Controller/ACCmdImpl.cc b/MAC/APL/Appl_Controller/src/ACCmdImpl.cc similarity index 100% rename from MAC/APL/Appl_Controller/ACCmdImpl.cc rename to MAC/APL/Appl_Controller/src/ACCmdImpl.cc diff --git a/MAC/APL/Appl_Controller/ACCmdImpl.h b/MAC/APL/Appl_Controller/src/ACCmdImpl.h similarity index 100% rename from MAC/APL/Appl_Controller/ACCmdImpl.h rename to MAC/APL/Appl_Controller/src/ACCmdImpl.h diff --git a/MAC/APL/Appl_Controller/ACDaemon.cc b/MAC/APL/Appl_Controller/src/ACDaemon.cc similarity index 100% rename from MAC/APL/Appl_Controller/ACDaemon.cc rename to MAC/APL/Appl_Controller/src/ACDaemon.cc diff --git a/MAC/APL/Appl_Controller/ACDaemon.conf b/MAC/APL/Appl_Controller/src/ACDaemon.conf similarity index 100% rename from MAC/APL/Appl_Controller/ACDaemon.conf rename to MAC/APL/Appl_Controller/src/ACDaemon.conf diff --git a/MAC/APL/Appl_Controller/ACDaemon.h b/MAC/APL/Appl_Controller/src/ACDaemon.h similarity index 100% rename from MAC/APL/Appl_Controller/ACDaemon.h rename to MAC/APL/Appl_Controller/src/ACDaemon.h diff --git a/MAC/APL/Appl_Controller/ACDaemon.log_prop b/MAC/APL/Appl_Controller/src/ACDaemon.log_prop similarity index 100% rename from MAC/APL/Appl_Controller/ACDaemon.log_prop rename to MAC/APL/Appl_Controller/src/ACDaemon.log_prop diff --git a/MAC/APL/Appl_Controller/ACDaemonComm.cc b/MAC/APL/Appl_Controller/src/ACDaemonComm.cc similarity index 100% rename from MAC/APL/Appl_Controller/ACDaemonComm.cc rename to MAC/APL/Appl_Controller/src/ACDaemonComm.cc diff --git a/MAC/APL/Appl_Controller/ACDaemonComm.h b/MAC/APL/Appl_Controller/src/ACDaemonComm.h similarity index 100% rename from MAC/APL/Appl_Controller/ACDaemonComm.h rename to MAC/APL/Appl_Controller/src/ACDaemonComm.h diff --git a/MAC/APL/Appl_Controller/ACDaemonMain.cc b/MAC/APL/Appl_Controller/src/ACDaemonMain.cc similarity index 100% rename from MAC/APL/Appl_Controller/ACDaemonMain.cc rename to MAC/APL/Appl_Controller/src/ACDaemonMain.cc diff --git a/MAC/APL/Appl_Controller/ACRequestPool.cc b/MAC/APL/Appl_Controller/src/ACRequestPool.cc similarity index 100% rename from MAC/APL/Appl_Controller/ACRequestPool.cc rename to MAC/APL/Appl_Controller/src/ACRequestPool.cc diff --git a/MAC/APL/Appl_Controller/ACRequestPool.h b/MAC/APL/Appl_Controller/src/ACRequestPool.h similarity index 100% rename from MAC/APL/Appl_Controller/ACRequestPool.h rename to MAC/APL/Appl_Controller/src/ACRequestPool.h diff --git a/MAC/APL/Appl_Controller/ACcli.cc b/MAC/APL/Appl_Controller/src/ACcli.cc similarity index 100% rename from MAC/APL/Appl_Controller/ACcli.cc rename to MAC/APL/Appl_Controller/src/ACcli.cc diff --git a/MAC/APL/Appl_Controller/ACuserMenu.cc b/MAC/APL/Appl_Controller/src/ACuserMenu.cc similarity index 100% rename from MAC/APL/Appl_Controller/ACuserMenu.cc rename to MAC/APL/Appl_Controller/src/ACuserMenu.cc diff --git a/MAC/APL/Appl_Controller/ACuserMenu.log_prop b/MAC/APL/Appl_Controller/src/ACuserMenu.log_prop similarity index 100% rename from MAC/APL/Appl_Controller/ACuserMenu.log_prop rename to MAC/APL/Appl_Controller/src/ACuserMenu.log_prop diff --git a/MAC/APL/Appl_Controller/APAdmin.cc b/MAC/APL/Appl_Controller/src/APAdmin.cc similarity index 100% rename from MAC/APL/Appl_Controller/APAdmin.cc rename to MAC/APL/Appl_Controller/src/APAdmin.cc diff --git a/MAC/APL/Appl_Controller/APAdmin.h b/MAC/APL/Appl_Controller/src/APAdmin.h similarity index 100% rename from MAC/APL/Appl_Controller/APAdmin.h rename to MAC/APL/Appl_Controller/src/APAdmin.h diff --git a/MAC/APL/Appl_Controller/APAdminPool.cc b/MAC/APL/Appl_Controller/src/APAdminPool.cc similarity index 100% rename from MAC/APL/Appl_Controller/APAdminPool.cc rename to MAC/APL/Appl_Controller/src/APAdminPool.cc diff --git a/MAC/APL/Appl_Controller/APAdminPool.h b/MAC/APL/Appl_Controller/src/APAdminPool.h similarity index 100% rename from MAC/APL/Appl_Controller/APAdminPool.h rename to MAC/APL/Appl_Controller/src/APAdminPool.h diff --git a/MAC/APL/Appl_Controller/ApplController.cc b/MAC/APL/Appl_Controller/src/ApplController.cc similarity index 100% rename from MAC/APL/Appl_Controller/ApplController.cc rename to MAC/APL/Appl_Controller/src/ApplController.cc diff --git a/MAC/APL/Appl_Controller/ApplController.h b/MAC/APL/Appl_Controller/src/ApplController.h similarity index 100% rename from MAC/APL/Appl_Controller/ApplController.h rename to MAC/APL/Appl_Controller/src/ApplController.h diff --git a/MAC/APL/Appl_Controller/ApplController.log_prop b/MAC/APL/Appl_Controller/src/ApplController.log_prop similarity index 100% rename from MAC/APL/Appl_Controller/ApplController.log_prop rename to MAC/APL/Appl_Controller/src/ApplController.log_prop diff --git a/MAC/APL/Appl_Controller/ApplControllerMain.cc b/MAC/APL/Appl_Controller/src/ApplControllerMain.cc similarity index 100% rename from MAC/APL/Appl_Controller/ApplControllerMain.cc rename to MAC/APL/Appl_Controller/src/ApplControllerMain.cc diff --git a/MAC/APL/Appl_Controller/src/CMakeLists.txt b/MAC/APL/Appl_Controller/src/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..ec1202d653397dac685ad435fa50aed90db651c3 --- /dev/null +++ b/MAC/APL/Appl_Controller/src/CMakeLists.txt @@ -0,0 +1,42 @@ +# $Id$ + +lofar_add_bin_program(ApplController + ApplControllerMain.cc + ACCmdImpl.cc + ACDaemonComm.cc + APAdmin.cc + APAdminPool.cc + CmdStack.cc + forkexec.cc + ItemList.cc + ProcRule.cc + ProcRuler.cc + PR_Shell.cc + PR_MPI.cc + PR_BGL.cc + StateEngine.cc + ApplController.cc) + +lofar_add_bin_program(ACDaemon + ACDaemonMain.cc + ACRequestPool.cc + ACDaemon.cc + forkexec.cc) + +lofar_add_bin_program(ACcli ACcli.cc) + +lofar_add_bin_program(ACuserMenu ACuserMenu.cc) + +install(PROGRAMS + startAP.sh + startMPI.sh + stopAP.sh + stopMPI.sh + DESTINATION bin) + +install(FILES + ACDaemon.log_prop + ACDaemon.conf + ApplController.log_prop + ACuserMenu.log_prop + DESTINATION etc) diff --git a/MAC/APL/Appl_Controller/CmdStack.cc b/MAC/APL/Appl_Controller/src/CmdStack.cc similarity index 100% rename from MAC/APL/Appl_Controller/CmdStack.cc rename to MAC/APL/Appl_Controller/src/CmdStack.cc diff --git a/MAC/APL/Appl_Controller/CmdStack.h b/MAC/APL/Appl_Controller/src/CmdStack.h similarity index 100% rename from MAC/APL/Appl_Controller/CmdStack.h rename to MAC/APL/Appl_Controller/src/CmdStack.h diff --git a/MAC/APL/Appl_Controller/ItemList.cc b/MAC/APL/Appl_Controller/src/ItemList.cc similarity index 100% rename from MAC/APL/Appl_Controller/ItemList.cc rename to MAC/APL/Appl_Controller/src/ItemList.cc diff --git a/MAC/APL/Appl_Controller/ItemList.h b/MAC/APL/Appl_Controller/src/ItemList.h similarity index 100% rename from MAC/APL/Appl_Controller/ItemList.h rename to MAC/APL/Appl_Controller/src/ItemList.h diff --git a/MAC/APL/Appl_Controller/ObsA.param b/MAC/APL/Appl_Controller/src/ObsA.param similarity index 100% rename from MAC/APL/Appl_Controller/ObsA.param rename to MAC/APL/Appl_Controller/src/ObsA.param diff --git a/MAC/APL/Appl_Controller/PR_BGL.cc b/MAC/APL/Appl_Controller/src/PR_BGL.cc similarity index 100% rename from MAC/APL/Appl_Controller/PR_BGL.cc rename to MAC/APL/Appl_Controller/src/PR_BGL.cc diff --git a/MAC/APL/Appl_Controller/PR_BGL.h b/MAC/APL/Appl_Controller/src/PR_BGL.h similarity index 100% rename from MAC/APL/Appl_Controller/PR_BGL.h rename to MAC/APL/Appl_Controller/src/PR_BGL.h diff --git a/MAC/APL/Appl_Controller/PR_MPI.cc b/MAC/APL/Appl_Controller/src/PR_MPI.cc similarity index 100% rename from MAC/APL/Appl_Controller/PR_MPI.cc rename to MAC/APL/Appl_Controller/src/PR_MPI.cc diff --git a/MAC/APL/Appl_Controller/PR_MPI.h b/MAC/APL/Appl_Controller/src/PR_MPI.h similarity index 100% rename from MAC/APL/Appl_Controller/PR_MPI.h rename to MAC/APL/Appl_Controller/src/PR_MPI.h diff --git a/MAC/APL/Appl_Controller/PR_Shell.cc b/MAC/APL/Appl_Controller/src/PR_Shell.cc similarity index 100% rename from MAC/APL/Appl_Controller/PR_Shell.cc rename to MAC/APL/Appl_Controller/src/PR_Shell.cc diff --git a/MAC/APL/Appl_Controller/PR_Shell.h b/MAC/APL/Appl_Controller/src/PR_Shell.h similarity index 100% rename from MAC/APL/Appl_Controller/PR_Shell.h rename to MAC/APL/Appl_Controller/src/PR_Shell.h diff --git a/MAC/APL/Appl_Controller/ProcRule.cc b/MAC/APL/Appl_Controller/src/ProcRule.cc similarity index 100% rename from MAC/APL/Appl_Controller/ProcRule.cc rename to MAC/APL/Appl_Controller/src/ProcRule.cc diff --git a/MAC/APL/Appl_Controller/ProcRule.h b/MAC/APL/Appl_Controller/src/ProcRule.h similarity index 100% rename from MAC/APL/Appl_Controller/ProcRule.h rename to MAC/APL/Appl_Controller/src/ProcRule.h diff --git a/MAC/APL/Appl_Controller/ProcRuler.cc b/MAC/APL/Appl_Controller/src/ProcRuler.cc similarity index 100% rename from MAC/APL/Appl_Controller/ProcRuler.cc rename to MAC/APL/Appl_Controller/src/ProcRuler.cc diff --git a/MAC/APL/Appl_Controller/ProcRuler.h b/MAC/APL/Appl_Controller/src/ProcRuler.h similarity index 100% rename from MAC/APL/Appl_Controller/ProcRuler.h rename to MAC/APL/Appl_Controller/src/ProcRuler.h diff --git a/MAC/APL/Appl_Controller/StateEngine.cc b/MAC/APL/Appl_Controller/src/StateEngine.cc similarity index 100% rename from MAC/APL/Appl_Controller/StateEngine.cc rename to MAC/APL/Appl_Controller/src/StateEngine.cc diff --git a/MAC/APL/Appl_Controller/StateEngine.h b/MAC/APL/Appl_Controller/src/StateEngine.h similarity index 100% rename from MAC/APL/Appl_Controller/StateEngine.h rename to MAC/APL/Appl_Controller/src/StateEngine.h diff --git a/MAC/APL/Appl_Controller/forkexec.cc b/MAC/APL/Appl_Controller/src/forkexec.cc similarity index 100% rename from MAC/APL/Appl_Controller/forkexec.cc rename to MAC/APL/Appl_Controller/src/forkexec.cc diff --git a/MAC/APL/Appl_Controller/forkexec.h b/MAC/APL/Appl_Controller/src/forkexec.h similarity index 100% rename from MAC/APL/Appl_Controller/forkexec.h rename to MAC/APL/Appl_Controller/src/forkexec.h diff --git a/MAC/APL/Appl_Controller/myACClientFunctions.h b/MAC/APL/Appl_Controller/src/myACClientFunctions.h similarity index 100% rename from MAC/APL/Appl_Controller/myACClientFunctions.h rename to MAC/APL/Appl_Controller/src/myACClientFunctions.h diff --git a/MAC/APL/Appl_Controller/startAP.sh b/MAC/APL/Appl_Controller/src/startAP.sh similarity index 100% rename from MAC/APL/Appl_Controller/startAP.sh rename to MAC/APL/Appl_Controller/src/startAP.sh diff --git a/MAC/APL/Appl_Controller/startMPI.sh b/MAC/APL/Appl_Controller/src/startMPI.sh similarity index 100% rename from MAC/APL/Appl_Controller/startMPI.sh rename to MAC/APL/Appl_Controller/src/startMPI.sh diff --git a/MAC/APL/Appl_Controller/stopAP.sh b/MAC/APL/Appl_Controller/src/stopAP.sh similarity index 100% rename from MAC/APL/Appl_Controller/stopAP.sh rename to MAC/APL/Appl_Controller/src/stopAP.sh diff --git a/MAC/APL/Appl_Controller/stopMPI.sh b/MAC/APL/Appl_Controller/src/stopMPI.sh similarity index 100% rename from MAC/APL/Appl_Controller/stopMPI.sh rename to MAC/APL/Appl_Controller/src/stopMPI.sh