Merge pull request #46 from ipbus/task/cleanup-cactus-remnants

Cleanup non-IPbus CACTUS remnants

.gitlab-ci.yml

@@ -110,13 +110,13 @@ build:centos7:
     - echo "  GSSAPIDelegateCredentials yes" >> ~/.ssh/config
   script:
     - env | grep -v PASSWORD | grep -v TOKEN
-    - cd cactuscore/extern/pugixml
+    - cd extern/pugixml
     - make && make rpm
     - cd ../../uhal
     - make && make rpm
     - cd ../controlhub
     - make && make rpm
-    - cd ../..
+    - cd ..
     - mkdir -p cc7_rpms
     - cp `find . -iname "*.rpm"` cc7_rpms
     - cp yumgroups-centos7.xml cc7_rpms/
@@ -146,8 +146,8 @@ build:slc6:
     - echo "  GSSAPIDelegateCredentials yes" >> ~/.ssh/config
   script:
     - env | grep -v PASSWORD | grep -v TOKEN
-    - make -k Set=uhal
-    - make -k Set=uhal rpm
+    - make -k Set=all
+    - make -k Set=all rpm
     - mkdir -p slc6_rpms
     - cp `find . -iname "*.rpm"` slc6_rpms
     - cp yumgroups-slc6.xml slc6_rpms/

Makefile

@@ -1,54 +1,24 @@
-ifeq ($(Set), uhal_client)
-PACKAGES = \
-        cactuscore/extern/boost \
-        cactuscore/extern/pugixml \
-        cactuscore/uhal
-else ifeq ($(Set), uhal)
-PACKAGES = \
-        cactuscore/extern/boost \
-        cactuscore/extern/erlang \
-        cactuscore/extern/pugixml \
-        cactuscore/uhal \
-        cactuscore/controlhub
-else ifeq ($(Set), ts)
-PACKAGES = \
-        cactuscore/ts \
-        cactuscore/candela \
-        cactusprojects/central \
-	cactusprojects/csctf \
-        cactusprojects/dtsc \
-        cactusprojects/dttf \
-        cactusprojects/gct \
-	cactusprojects/gt \
-        cactusprojects/gmt \
-        cactusprojects/l1page \
-        cactusprojects/retri \
-        cactusprojects/subsystem \
-	cactusprojects/tcds \
-        cactusprojects/ttc 
-else ifeq ($(Set), tsdev)
-PACKAGES = \
-        cactuscore/ts \
-        cactuscore/candela \
-        cactusprojects/subsystem 
-else ifeq ($(Set), tssub)
-PACKAGES = \
-        cactusprojects/central \
-        cactusprojects/csctf \
-        cactusprojects/dtsc \
-        cactusprojects/dttf \
-        cactusprojects/gct \
-        cactusprojects/gt \
-        cactusprojects/gmt \
-        cactusprojects/l1page \
-        cactusprojects/retri \
-        cactusprojects/tcds \
-        cactusprojects/ttc
-#else ifeq ($(Set), tsupgrades)
-#PACKAGES = \
-#	cactusupgrades/projects/ugt \
-#	cactusupgrades/projects/s1calol2
-
+
+Set?=all
+
+ifeq ($(Set), uhal)
+    PACKAGES = \
+        extern/boost \
+        extern/pugixml \
+        uhal
+else ifeq ($(Set), controlhub)
+    PACKAGES = \
+        extern/erlang \
+        controlhub
+else ifeq ($(Set), all)
+    PACKAGES = \
+        extern/boost \
+        extern/erlang \
+        extern/pugixml \
+        uhal \
+        controlhub
+else
+    $(error Invalid value for Set variable!)
 endif
 
 VIRTUAL_PACKAGES = $(addsuffix /.virtual.Makefile,${PACKAGES})

config/Makefile.macros

@@ -1,7 +1,6 @@
 # Sanitize build home
 BUILD_HOME := $(shell cd ${BUILD_HOME}; pwd)
 
-XDAQ_ROOT ?=/opt/xdaq
 CACTUS_ROOT ?= /opt/cactus
 CACTUS_RPM_ROOT ?= $(BUILD_HOME)
 
@@ -27,87 +26,44 @@ $(info OS Detected: $(CACTUS_OS))
 
 
 #extern/erlang
-EXTERN_ERLANG_PREFIX = $(CACTUS_RPM_ROOT)/cactuscore/extern/erlang/RPMBUILD/SOURCES
+EXTERN_ERLANG_PREFIX = $(CACTUS_RPM_ROOT)/extern/erlang/RPMBUILD/SOURCES
 EXTERN_ERLANG_BIN_PREFIX = ${EXTERN_ERLANG_PREFIX}/bin
 
 #extern/boost
-EXTERN_BOOST_PREFIX = $(CACTUS_RPM_ROOT)/cactuscore/extern/boost/RPMBUILD/SOURCES
+EXTERN_BOOST_PREFIX = $(CACTUS_RPM_ROOT)/extern/boost/RPMBUILD/SOURCES
 EXTERN_BOOST_INCLUDE_PREFIX = ${EXTERN_BOOST_PREFIX}/include
 EXTERN_BOOST_LIB_PREFIX = ${EXTERN_BOOST_PREFIX}/lib
 
 #extern/pugixml
-EXTERN_PUGIXML_PREFIX = $(CACTUS_RPM_ROOT)/cactuscore/extern/pugixml/RPMBUILD/SOURCES
+EXTERN_PUGIXML_PREFIX = $(CACTUS_RPM_ROOT)/extern/pugixml/RPMBUILD/SOURCES
 EXTERN_PUGIXML_INCLUDE_PREFIX = ${EXTERN_PUGIXML_PREFIX}/include
 EXTERN_PUGIXML_LIB_PREFIX = ${EXTERN_PUGIXML_PREFIX}/lib
 
 #uhal/grammars
-UHAL_GRAMMARS_PREFIX = $(BUILD_HOME)/cactuscore/uhal/grammars
+UHAL_GRAMMARS_PREFIX = $(BUILD_HOME)/uhal/grammars
 UHAL_GRAMMARS_INCLUDE_PREFIX = ${UHAL_GRAMMARS_PREFIX}/include
 UHAL_GRAMMARS_LIB_PREFIX = ${UHAL_GRAMMARS_PREFIX}/lib
 
 #uhal/log
-UHAL_LOG_PREFIX = $(BUILD_HOME)/cactuscore/uhal/log
+UHAL_LOG_PREFIX = $(BUILD_HOME)/uhal/log
 UHAL_LOG_INCLUDE_PREFIX = ${UHAL_LOG_PREFIX}/include
 UHAL_LOG_LIB_PREFIX = ${UHAL_LOG_PREFIX}/lib
 
 #uhal/uhal
-UHAL_UHAL_PREFIX = $(BUILD_HOME)/cactuscore/uhal/uhal
+UHAL_UHAL_PREFIX = $(BUILD_HOME)/uhal/uhal
 UHAL_UHAL_INCLUDE_PREFIX = ${UHAL_UHAL_PREFIX}/include
 UHAL_UHAL_LIB_PREFIX = ${UHAL_UHAL_PREFIX}/lib
 
 #uhal/uhal
-UHAL_TESTS_PREFIX = $(BUILD_HOME)/cactuscore/uhal/tests
+UHAL_TESTS_PREFIX = $(BUILD_HOME)/uhal/tests
 UHAL_TESTS_INCLUDE_PREFIX = ${UHAL_TESTS_PREFIX}/include
 UHAL_TESTS_LIB_PREFIX = ${UHAL_TESTS_PREFIX}/lib
 
 #controlhub
-CONTROLHUB_PREFIX = $(BUILD_HOME)/cactuscore/controlhub/RPMBUILD/SOURCES
+CONTROLHUB_PREFIX = $(BUILD_HOME)/controlhub/RPMBUILD/SOURCES
 CONTROLHUB_BIN_PREFIX = ${CONTROLHUB_PREFIX}/bin
 CONTROLHUB_LIB_PREFIX = ${CONTROLHUB_PREFIX}/lib
 
 #Python include path  
 PYTHON_INCLUDE_PREFIX ?= $(shell python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()")
 PYTHON_LIB_PREFIX ?= $(shell python -c "from distutils.sysconfig import get_python_lib; import os.path; print os.path.split(get_python_lib(standard_lib=True))[0]")
-
-#Trigger Supervisor Toolbox Library
-TRIGGER_TS_TOOLBOX_PREFIX = $(BUILD_HOME)/cactuscore/ts/toolbox
-TRIGGER_TS_TOOLBOX_INCLUDE_PREFIX=$(TRIGGER_TS_TOOLBOX_PREFIX)/include
-TRIGGER_TS_TOOLBOX_LIB_PREFIX=$(TRIGGER_TS_TOOLBOX_PREFIX)/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
-
-#Trigger Supervisor Ajaxell Library
-TRIGGER_TS_AJAXELL_PREFIX = $(BUILD_HOME)/cactuscore/ts/ajaxell
-TRIGGER_TS_AJAXELL_INCLUDE_PREFIX=$(TRIGGER_TS_AJAXELL_PREFIX)/include
-TRIGGER_TS_AJAXELL_LIB_PREFIX=$(TRIGGER_TS_AJAXELL_PREFIX)/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
-
-#Trigger Supervisor Framework Library
-TRIGGER_TS_FRAMEWORK_PREFIX = $(BUILD_HOME)/cactuscore/ts/framework
-TRIGGER_TS_FRAMEWORK_INCLUDE_PREFIX=$(TRIGGER_TS_FRAMEWORK_PREFIX)/include
-TRIGGER_TS_FRAMEWORK_LIB_PREFIX=$(TRIGGER_TS_FRAMEWORK_PREFIX)/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
-
-#Trigger Supervisor Level-1 Configuration Editor Library
-TRIGGER_TS_L1CE_PREFIX = $(BUILD_HOME)/cactuscore/ts/l1ce
-TRIGGER_TS_L1CE_INCLUDE_PREFIX=$(TRIGGER_TS_L1CE_PREFIX)/include
-TRIGGER_TS_L1CE_LIB_PREFIX=$(TRIGGER_TS_L1CE_PREFIX)/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
-
-#Trigger Supervisor Interconnection Test Library
-TRIGGER_TS_ITF_PREFIX = $(BUILD_HOME)/cactuscore/ts/itf
-TRIGGER_TS_ITF_INCLUDE_PREFIX=$(TRIGGER_TS_ITF_PREFIX)/include
-TRIGGER_TS_ITF_LIB_PREFIX=$(TRIGGER_TS_ITF_PREFIX)/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
-
-#Triger Timing and Control Utility Library for the Trigger Supervisor Applications
-TRIGGER_TTC_TS_TTCUTILS_PREFIX = $(BUILD_HOME)/cactusprojects/ttc/ts/TTCUtils
-TRIGGER_TTC_TS_TTCUTILS_INCLUDE_PREFIX=$(TRIGGER_TTC_TS_TTCUTILS_PREFIX)/include
-TRIGGER_TTC_TS_TTCUTILS_LIB_PREFIX=$(TRIGGER_TTC_TS_TTCUTILS_PREFIX)/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
-
-#TCDS Library for the Trigger Supervisor Applications
-TRIGGER_TCDS_TS_UTILS_PREFIX = $(BUILD_HOME)/cactusprojects/tcds/ts/TCDSUtils
-TRIGGER_TCDS_TS_UTILS_INCLUDE_PREFIX=$(TRIGGER_TCDS_TS_UTILS_PREFIX)/include
-TRIGGER_TCDS_TS_UTILS_LIB_PREFIX=$(TRIGGER_TCDS_TS_UTILS_PREFIX)/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
-
-#Trigger Configuration DB
-TRIGGER_CANDELA_PREFIX = $(BUILD_HOME)/cactuscore/candela
-TRIGGER_CANDELA_INCLUDE_PREFIX=$(TRIGGER_CANDELA_PREFIX)/include
-TRIGGER_CANDELA_LIB_PREFIX=$(TRIGGER_CANDELA_PREFIX)/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
-
-#ROOT
-ROOTSYS=/opt/wbm-support-root

cactuscore/controlhub/Makefile → controlhub/Makefile

@@ -19,13 +19,13 @@
 #########################################################################################
 
 
-BUILD_HOME = $(shell pwd)/../..
+BUILD_HOME = $(shell pwd)/..
 
 include $(BUILD_HOME)/config/Makefile.macros
 
-Project = cactuscore
+Project = 
 Package = controlhub
-PackagePath = $(CACTUS_RPM_ROOT)/${Project}/${Package}
+PackagePath = $(CACTUS_RPM_ROOT)/${Package}
 PackageName = cactuscore-controlhub
 
 Packager = Tom Williams

cactuscore/extern/boost/Makefile → extern/boost/Makefile

@@ -1,10 +1,10 @@
-BUILD_HOME = $(shell pwd)/../../..
+BUILD_HOME = $(shell pwd)/../..
 
 include $(BUILD_HOME)/config/Makefile.macros
 
-Project = cactuscore
+Project = 
 Package = extern/boost
-PackagePath = $(CACTUS_RPM_ROOT)/$(Project)/${Package}
+PackagePath = $(CACTUS_RPM_ROOT)/${Package}
 PackageName = cactuscore-extern-boost
 
 Packager = Andrew Rose, Marc Magrans de Abril

cactuscore/extern/erlang/Makefile → extern/erlang/Makefile

@@ -1,10 +1,10 @@
-BUILD_HOME = $(shell pwd)/../../..
+BUILD_HOME = $(shell pwd)/../..
 
 include $(BUILD_HOME)/config/Makefile.macros
 
-Project = cactuscore
+Project =
 Package = extern/erlang
-PackagePath = $(CACTUS_RPM_ROOT)/$(Project)/${Package}
+PackagePath = $(CACTUS_RPM_ROOT)/${Package}
 PackageName = cactuscore-extern-erlang
 
 Packager = Robert Frazier

cactuscore/extern/pugixml/Makefile → extern/pugixml/Makefile

@@ -1,10 +1,10 @@
-BUILD_HOME = $(shell pwd)/../../..
+BUILD_HOME = $(shell pwd)/../..
 
 include $(BUILD_HOME)/config/Makefile.macros
 
-Project = cactuscore
+Project =
 Package = extern/pugixml
-PackagePath = $(CACTUS_RPM_ROOT)/$(Project)/${Package}
+PackagePath = $(CACTUS_RPM_ROOT)/${Package}
 PackageName = cactuscore-extern-pugixml
 
 Packager = Andrew Rose, Marc Magrans de Abril

scripts/doxygen/api_uhal.sh

@@ -30,13 +30,13 @@ export DOXYGEN_PROJECT_NAME="μHAL $1" # 'μHAL (nightly)'
 export DOXYGEN_PROJECT_LOGO="${REPO_BASE_DIR}/scripts/doxygen/cactus_logo.png"
 export DOXYGEN_HTML_HEADER="${REPO_BASE_DIR}/scripts/doxygen/header.html"
 export DOXYGEN_HTML_EXTRA_FILES="${REPO_BASE_DIR}/scripts/doxygen/favicon.ico"
-export DOXYGEN_MAINPAGE="${REPO_BASE_DIR}/cactuscore/uhal/README.md"
-export DOXYGEN_INPUTS="${REPO_BASE_DIR}/cactuscore/uhal "
+export DOXYGEN_MAINPAGE="${REPO_BASE_DIR}/uhal/README.md"
+export DOXYGEN_UHAL_BASE_DIR="${REPO_BASE_DIR}/uhal"
 export DOXYGEN_EXCLUDE_PATTERNS=''
 export DOXYGEN_OUTPUT=/tmp/api_uhal
 DOXYGEN_STRIP_FROM_INC_PATH=
 for PACKAGE_PATH in log grammars uhal pycohal tests; do
-    DOXYGEN_STRIP_FROM_INC_PATH+="${REPO_BASE_DIR}/cactuscore/uhal/${PACKAGE_PATH}/include "
+    DOXYGEN_STRIP_FROM_INC_PATH+="${REPO_BASE_DIR}/uhal/${PACKAGE_PATH}/include "
 done
 export DOXYGEN_STRIP_FROM_INC_PATH
 
@@ -46,7 +46,7 @@ echo "  DOXYGEN_PROJECT_LOGO        = ${DOXYGEN_PROJECT_LOGO}"
 echo "  DOXYGEN_HTML_HEADER         = ${DOXYGEN_HTML_HEADER}"
 echo "  DOXYGEN_HTML_EXTRA_FILES    = ${DOXYGEN_HTML_EXTRA_FILES}"
 echo "  DOXYGEN_MAINPAGE            = ${DOXYGEN_MAINPAGE}"
-echo "  DOXYGEN_INPUTS              = ${DOXYGEN_INPUTS}"
+echo "  DOXYGEN_UHAL_BASE_DIR       = ${DOXYGEN_UHAL_BASE_DIR}"
 echo "  DOXYGEN_EXCLUDE_PATTERNS    = ${DOXYGEN_EXCLUDE_PATTERNS}"
 echo "  DOXYGEN_OUTPUT              = ${DOXYGEN_OUTPUT}"
 echo "  DOXYGEN_STRIP_FROM_INC_PATH = ${DOXYGEN_STRIP_FROM_INC_PATH}"

scripts/doxygen/cactus-v3.doxy

@@ -17,7 +17,7 @@ ABBREVIATE_BRIEF       =
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES 
-STRIP_FROM_PATH        = $(CACTUS_SANDBOX)
+STRIP_FROM_PATH        = $(DOXYGEN_UHAL_BASE_DIR)
 STRIP_FROM_INC_PATH    = $(DOXYGEN_STRIP_FROM_INC_PATH)
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
@@ -97,7 +97,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = $(DOXYGEN_MAINPAGE) $(DOXYGEN_INPUTS)
+INPUT                  = $(DOXYGEN_MAINPAGE) $(DOXYGEN_UHAL_BASE_DIR)
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.h \
                          *.hh \
@@ -111,10 +111,8 @@ FILE_PATTERNS          = *.h \
                          *.js \
                          *.md
 RECURSIVE              = YES
-EXCLUDE                = $(CACTUS_SANDBOX)/cactuscore/extern/ \
-                         $(CACTUS_SANDBOX)/cactuscore/uhal/gui \
-                         $(CACTUS_SANDBOX)/cactuscore/uhal/pycohal \
-                         $(CACTUS_SANDBOX)/cactusprojects/l1page
+EXCLUDE                = $(DOXYGEN_UHAL_BASE_DIR)/gui \
+                         $(DOXYGEN_UHAL_BASE_DIR)/pycohal
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_SYMBOLS        =
 EXAMPLE_PATH           =