Commit 8ba6dab6 authored by Dainius Simelevicius's avatar Dainius Simelevicius
Browse files

references #207: updating amc13controller dependencies to amc13 v1.2.17 and cactuscore v2.7.9

parent ccd4ff19
......@@ -2,7 +2,7 @@ variables:
EXTERN_PACKAGES: "extern/oracle extern/dim extern/smi extern/yui extern/caen/a2818 extern/caen/a3818 extern/caen/CAENUSBdrvB extern/caen/caenvmelib extern/caen/caencomm extern/caen/caenbridgeupgrade extern/caen/caenupgrader"
WORKSUITE_PACKAGES: "xdaq2rc interface/evb interface/shared interface/bril evb jobcontrol xpci/drv xpci hal/generic hal/utilities hal/busAdapter/dummy hal/busAdapter/caen hal/busAdapter/pci hal/PyHAL pheaps/drv/cmem_rcc pheaps jal/jtagChain jal/jtagController jal/jtagSVFSequencer ttc/utils ttc/monitoring ttc/ltc ttc/ttcci tts/ttsbase tts/atts tts/cpcibase tts/fmmtd tts/ipcutils tts/fmm tts/fmmcontroller tts/fmmdbi tts/fmmtester d2s/utils d2s/fedemulator d2s/gtpe d2s/gtpecontroller d2s/firmwareloader fedstreamer fedkit ferol ferol40 psx/sapi psx/mapi psx psx/watchdog sentinel sentinel/utils sentinel/probe sentinel/sentineld sentinel/tester sentinel/bridge2g sentinel/spotlight2g sentinel/spotlightocci sentinel/arc/utils sentinel/arc tstore/utils tstore/client tstore tstore/api xmas/admin xmas/heartbeat xmas/heartbeat/probe xmas/heartbeat/heartbeatd xmas/utils xmas/sensord xmas/probe xmas/tester xmas/bridge2g xmas/slash2g xmas/store2g xmas/smarthub ibvla pt/udapl pt/ibv gevb2g es/api es/xtreme es/xbeat elastic/api elastic/timestream amc13controller dipbridge oms"
RPM_REPO_DIR: "/tmp/$CI_PROJECT_NAME/$CI_JOB_NAME/repo"
DOCKER_IMAGE: "gitlab-registry.cern.ch/cmsos/docker/docker-image-cmsos-15-cc7-x86_64-worksuite:3.2.0.0"
DOCKER_IMAGE: "gitlab-registry.cern.ch/cmsos/docker/docker-image-cmsos-15-cc7-x86_64-worksuite:3.3.0.0"
ARTIFACT_PREREQUISITE_DIR: "$CI_PROJECT_DIR/prerequisites/"
ARTIFACT_DISTRIBUTED_DIR: "$CI_PROJECT_DIR/distributed/rpm/"
ARTIFACT_REQUIRED_DIR: "$CI_PROJECT_DIR/required/rpm/"
......
......@@ -14,14 +14,14 @@ Project=$(PROJECT_NAME)
Package=amc13controller
PACKAGE_REQUIRED_PACKAGE_LIST = \
cactuscore-uhal-uhal >= 2.7.8 \
cactuscore-uhal-log >= 2.7.8 \
cactusboards-amc13-amc13 >= 1.2.15 \
cactuscore-uhal-uhal >= 2.7.9 \
cactuscore-uhal-log >= 2.7.9 \
cactusboards-amc13-amc13 >= 1.2.17 \
boost-filesystem >= 1.53.0 \
boost-regex >= 1.53.0 \
boost-system >= 1.53.0 \
boost-thread >= 1.53.0
Sources = \
AMC13StateMachine.cc \
AMC13BaseInfoSpaceHandler.cc \
......
......@@ -7,11 +7,11 @@
// !!! Edit this line to reflect the latest package version !!!
#define WORKSUITE_AMC13CONTROLLER_VERSION_MAJOR 1
#define WORKSUITE_AMC13CONTROLLER_VERSION_MINOR 2
#define WORKSUITE_AMC13CONTROLLER_VERSION_MINOR 3
#define WORKSUITE_AMC13CONTROLLER_VERSION_PATCH 0
// If any previous versions available E.g. #define WORKSUITE_AMC13_PREVIOUS_VERSIONS "3.8.0,3.8.1"
#undef WORKSUITE_AMC13CONTROLLER_PREVIOUS_VERSIONS
#define WORKSUITE_AMC13CONTROLLER_PREVIOUS_VERSIONS "1.0.0, 1.0.1, 1.1.0,1.1.1"
#define WORKSUITE_AMC13CONTROLLER_PREVIOUS_VERSIONS "1.0.0, 1.0.1, 1.1.0,1.1.1,1.2.0"
//
// Template macros
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment