Commit c29134aa authored by Holger Witsch's avatar Holger Witsch
Browse files

My helper repo has disappeared, but i realised I didn't need it, I can use

multiple git_url sources.

HOwever, right now, with the VacGaugeServer repo, the conda build command
won't go through.

Save changes anyway.
parent fb190ad9
Pipeline #70484 failed with stages
in 10 seconds
...@@ -105,6 +105,10 @@ set(VACGAUGE_SRC ${VACGAUGE_PATH}/${VACGAUGE}.cpp ...@@ -105,6 +105,10 @@ set(VACGAUGE_SRC ${VACGAUGE_PATH}/${VACGAUGE}.cpp
${VACGAUGE_PATH}/AdditionalMethods.cpp ${VACGAUGE_PATH}/AdditionalMethods.cpp
${VACGAUGE_PATH}/RdpAlgorithm.cpp ${VACGAUGE_PATH}/RdpAlgorithm.cpp
) )
#
# Files for VacGaugeServer TANGO class
#
set(VACGAUGESERVER VacGaugeServer)
# #
...@@ -138,7 +142,7 @@ set(ALL_CLASS_INCLUDE ${WINDOWPROTOCOL_INCLUDE} ...@@ -138,7 +142,7 @@ set(ALL_CLASS_INCLUDE ${WINDOWPROTOCOL_INCLUDE}
set(SERVER_SRC ${WINDOWPROTOCOL_SRC} ${SERIAL_SRC} set(SERVER_SRC ${WINDOWPROTOCOL_SRC} ${SERIAL_SRC}
${DIGITELMPC_SRC} ${AGILENT4UHVCTRL_SRC} ${VARIANDUALCTRL_SRC} ${DIGITELMPC_SRC} ${AGILENT4UHVCTRL_SRC} ${VARIANDUALCTRL_SRC}
${VARIANDUALIP_SRC} ${BALZERSTPG300_SRC} ${BALZERSGAUGE_SRC} ${VARIANDUALIP_SRC} ${BALZERSTPG300_SRC} ${BALZERSGAUGE_SRC}
${VACGAUGE_SRC} ${USER_SRC_FILES} ${VACGAUGE_PATH}/main.cpp) ${VACGAUGE_SRC} ${USER_SRC_FILES} ${VACGAUGESERVER}/MultiClassesFactory.cpp ${VACGAUGESERVER}/main.cpp)
include_directories(${ALL_CLASS_INCLUDE} ${USER_INCL_DIR} ${TANGO_INCLUDES}) include_directories(${ALL_CLASS_INCLUDE} ${USER_INCL_DIR} ${TANGO_INCLUDES})
# #
......
...@@ -5,17 +5,16 @@ ...@@ -5,17 +5,16 @@
cp ${RECIPE_DIR}/CMakeLists.txt ${SRC_DIR} cp ${RECIPE_DIR}/CMakeLists.txt ${SRC_DIR}
mkdir build 2>/dev/null mkdir build 2>/dev/null
cd build (cd build;
cmake .. #--debug-output
cmake .. make VERBOSE=1
)
make
# all the above was the attempt to build the server within a conda build # all the above was the attempt to build the server within a conda build
# environment. That failed. # environment. That failed.
#this build expects to find the executable, made on ub2004-devel, as this #this build expects to find the executable, made on ub2004-devel, as this
EXE="VacGaugeServer" EXE=build/"VacGaugeServer"
if [ -x "${EXE}" ]; then if [ -x "${EXE}" ]; then
mkdir ${PREFIX}/bin >&/dev/null mkdir ${PREFIX}/bin >&/dev/null
# copy the executable into the bin directory # copy the executable into the bin directory
......
...@@ -8,32 +8,54 @@ ...@@ -8,32 +8,54 @@
{% set name = "VacGaugeServer" %} {% set name = "VacGaugeServer" %}
{% if GIT_DESCRIBE_TAG is defined %} {% if GIT_DESCRIBE_TAG is defined %}
# git describe --tags ---> VacGaugeServer-3.4
{% set version = GIT_DESCRIBE_TAG %} {% set version = GIT_DESCRIBE_TAG %}
{% else %} {% else %}
{% set version = "3.4" %} {% set version = "0.0.0" %}
{% endif %} {% endif %}
{% if GIT_DESCRIBE_NUMBER is defined %} # this repo doesn't offer a string like VacGaugeServer-3.5-1-gf5613f3
{% set number = GIT_DESCRIBE_NUMBER %} {% if GIT_DESCRIBE_NUMBER is %}
{% else %} {% else %}
{% set number = "1" %} {% set number = "1" %}
{% endif %} {% endif %}
package: package:
name: "{{ name|lower }}" name: "{{ name|lower }}"
version: {{ version | replace("VacGaugeServer-", "v") }} version: "{{ version | replace("VacGaugeServer-", "v") }}"
number: {{ number }} number: 1
numpy: 1.16 numpy: 1.16
source: source:
- git_url: git@gitlab.esrf.fr:holger.witsch/vacgaugeserver-conda-package.git # this needs to be ?????? to allow conda build to catch the Git tag and version.00
#~ - git_url: git@gitlab.esrf.fr:accelerators/Vacuum/VacGaugeServerProject/VacGaugeServer.git - git_url: git@gitlab.esrf.fr:accelerators/Vacuum/VacGaugeServerProject/VacGaugeServer.git
folder: VacGaugeServer
#~ - git_url: git@gitlab.esrf.fr:accelerators/Vacuum/VacGaugeServerProject/BalzersTpg300.git
#~ folder: BalzersTpg300
#~ - git_url: git@gitlab.esrf.fr:accelerators/Vacuum/VacGaugeServerProject/VarianDualIP.git
#~ folder: VarianDualIP
#~ - git_url: git@gitlab.esrf.fr:accelerators/Vacuum/VacGaugeServerProject/VarianDualCtrl.git
#~ folder: VarianDualCtrl
#~ - git_url: git@gitlab.esrf.fr:accelerators/Vacuum/VacGaugeServerProject/VacGauge.git
#~ folder: VacGauge
#~ - git_url: git@gitlab.esrf.fr:accelerators/Vacuum/VacGaugeServerProject/BalzersGauge.git
#~ folder: BalzersGauge
#~ - git_url: git@gitlab.esrf.fr:accelerators/Vacuum/VacGaugeServerProject/Agilent4uhvCtrl.git
#~ folder: Agilent4uhvCtrl
#~ - git_url: git@gitlab.esrf.fr:accelerators/Vacuum/VacGaugeServerProject/DigitelMPC.git
#~ folder: DigitelMPC
#~ - git_url: git@gitlab.esrf.fr:accelerators/Vacuum/VacGaugeServerProject/PressureGauge.git
#~ folder: PressureGauge
#~ - git_url: git@gitlab.esrf.fr:accelerators/cicd/generic/protocols/serial.git
#~ folder: serial
- git_url: git@gitlab.esrf.fr:accelerators/Vacuum/VacGaugeServerProject/WindowProtocol.git
folder: WindowProtocol
git_tag: forgotten_edits
# this magically disappeared ... :-/
# - git_url: git@gitlab.esrf.fr:holger.witsch/vacgaugeserver-conda-package.git
build: build:
arch: linux64 arch: linux64
number: {{ number }} #~ number: 1
binary_relocation: False
requirements: requirements:
build: build:
......
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