e7c34375ee
According to this MR: https://gitlab.esss.lu.se/epics-modules/adorca/-/merge_requests/18 it seems dev branch has been extensively used in the last few months. The recipe is using the dev branch: https://gitlab.esss.lu.se/e3/recipes/adorca-recipe/-/blob/master/recipe/meta.yaml?ref_type=heads so merging it into master shouldn't break anything. It's just a sync after some development time. I initially thought about merging master into dev first to solve the small conflict in .gitignore but then this would be acessible to the recipe. After this maybe we should update the recipe?
ADHama
European Spallation Source ERIC Site-specific EPICS module : ADHama
Additonal information:
To build conda env:
conda create -n hama epics-base require tclx make compilers adcore busy
To activate env:
conda activate orca
git clone ...
cd git/ADOrca
compilation:
make -f ADOrca.Makefile LIBVERSION=0.1 clean uninstall build db install
execution:
iocsh.bash cmds/st.cmd