Commit 045cb044 authored by Laurent Claustre's avatar Laurent Claustre Committed by Samuel Debionne

* fixed master branch name

* fixed conda recipe meta files when no git tag
parent 3dd194fc
...@@ -6,4 +6,5 @@ ...@@ -6,4 +6,5 @@
\#*\# \#*\#
.\#* .\#*
*.pyc *.pyc
build/
tango/build/
...@@ -22,7 +22,7 @@ build-noarch: ...@@ -22,7 +22,7 @@ build-noarch:
<<: *build-conda <<: *build-conda
stage: build-noarch stage: build-noarch
script: script:
- conda build ./conda/tango --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable - conda build ./conda/tango --prefix-length=80 --output-folder=dist/ -c tango-controls --channel=http://bcu-ci.esrf.fr/stable
dependencies: dependencies:
- build-linux - build-linux
...@@ -43,7 +43,7 @@ deploy-devel: ...@@ -43,7 +43,7 @@ deploy-devel:
only: only:
- branches - branches
except: except:
- stable - master
when: manual when: manual
deploy-stable: deploy-stable:
...@@ -62,4 +62,3 @@ deploy-stable: ...@@ -62,4 +62,3 @@ deploy-stable:
- linux - linux
only: only:
- tags - tags
- stable
########################################################################### ###########################################################################
# This file is part of LImA, a Library for Image Acquisition # This file is part of LImA, a Library for Image Acquisition
# #
# Copyright (C) : 2009-2017 # Copyright (C) : 2009-2019
# European Synchrotron Radiation Facility # European Synchrotron Radiation Facility
# BP 220, Grenoble 38043 # CS40220 38043 Grenoble Cedex 9
# FRANCE # FRANCE
# #
# Contact: lima@esrf.fr # Contact: lima@esrf.fr
...@@ -52,43 +52,25 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) ...@@ -52,43 +52,25 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
endif() endif()
if (CAMERA_MASTER_PROJECT) if (CAMERA_MASTER_PROJECT)
find_package(Lima REQUIRED) find_package(Lima REQUIRED COMPONENTS devel tools)
endif() endif()
# CMake additional macros # CMake additional macros
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${LIMA_CMAKE_INCLUDE_DIRS} ${CMAKE_MODULE_PATH}) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${LIMA_CMAKE_INCLUDE_DIRS} ${CMAKE_MODULE_PATH})
include(LimaTools)
# Set version # Set version
include(project_version) include(project_version)
# Enable python binding code compilation using sip generator # Enable python binding code compilation using sip generator
if (CAMERA_MASTER_PROJECT) if (CAMERA_MASTER_PROJECT)
option(LIMA_ENABLE_PYTHON "compile python binding code?" OFF) option(LIMA_ENABLE_PYTHON "compile python binding code?" OFF)
endif() option(LIMA_ENABLE_PYTANGO_SERVER "install python tango server?" OFF)
if (LIMA_ENABLE_PYTHON) if (LIMA_ENABLE_PYTHON)
# Find python interpreter and libs limatools_find_python_and_sip()
find_package(PythonInterp)
find_package(PythonLibs)
if(${PYTHONINTERP_FOUND})
# python site-packages folder
execute_process(
COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
OUTPUT_VARIABLE _PYTHON_SITE_PACKAGES_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
endif() endif()
set(PYTHON_SITE_PACKAGES_DIR ${_PYTHON_SITE_PACKAGES_DIR} CACHE PATH "where should python modules be installed?")
find_package(SIP REQUIRED)
include(SIPMacros)
if(WIN32)
set(SIP_TAGS WIN32_PLATFORM)
elseif(UNIX)
set(SIP_TAGS POSIX_PLATFORM)
endif(WIN32)
set(SIP_EXTRA_OPTIONS -e -g)
find_package(NumPy REQUIRED)
endif() endif()
if (CAMERA_MASTER_PROJECT) if (CAMERA_MASTER_PROJECT)
...@@ -137,7 +119,6 @@ endif() ...@@ -137,7 +119,6 @@ endif()
# Binding code for python # Binding code for python
if(LIMA_ENABLE_PYTHON) if(LIMA_ENABLE_PYTHON)
include(LimaTools)
set(IMPORTS "limaespia.sip") set(IMPORTS "limaespia.sip")
if(NOT CAMERA_MASTER_PROJECT) if(NOT CAMERA_MASTER_PROJECT)
set(SIP_INCLUDE_DIRS set(SIP_INCLUDE_DIRS
...@@ -186,7 +167,10 @@ if(LIMA_ENABLE_PYTHON) ...@@ -186,7 +167,10 @@ if(LIMA_ENABLE_PYTHON)
install( install(
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python/ DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python/
DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/Frelon" DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/Frelon"
) )
if (LIMA_ENABLE_PYTANGO_SERVER)
add_subdirectory(tango)
endif()
endif() endif()
## Tests ## Tests
......
...@@ -16,7 +16,7 @@ conda install -c esrf-bcu lima-camera-frelon ...@@ -16,7 +16,7 @@ conda install -c esrf-bcu lima-camera-frelon
### Camera tango device server ### Camera tango device server
conda install -c esrf-bcu lima-camera-simulator-frelon conda install -c tango-controls -c esrf-bcu lima-camera-frelon-tango
# LImA # LImA
...@@ -26,5 +26,6 @@ Lima is a C++ library which can be used with many different cameras. The library ...@@ -26,5 +26,6 @@ Lima is a C++ library which can be used with many different cameras. The library
## Documentation ## Documentation
The documentation is available [here](https://lima1.readthedocs.io/) The documentation is available [here](https://lima.blissgarden.org)
{% set version = GIT_DESCRIBE_TAG[1:] %} # Strip the 'v' from the version tag
{% if GIT_DESCRIBE_TAG is defined %}
{% set version = GIT_DESCRIBE_TAG[1:] %}
{% else %}
{% set version = "0.0.0" %}
{% endif %}
package: package:
name: lima-camera-frelon name: lima-camera-frelon
......
xcopy tango\*.* %SP_DIR%\Lima\Server\camera\ cd tango
cmake -Bbuild -H. -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DPYTHON_SITE_PACKAGES_DIR=%SP_DIR% -DCMAKE_FIND_ROOT_PATH=%LIBRARY_PREFIX%
IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
cmake --build build --config Release --target install
IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
mkdir -p $SP_DIR/Lima/Server/camera && cp tango/*.* $SP_DIR/Lima/Server/camera #!/bin/bash
cd tango/
cmake -Bbuild -H. -DCMAKE_INSTALL_PREFIX=$PREFIX -DPYTHON_SITE_PACKAGES_DIR=$SP_DIR -DCMAKE_FIND_ROOT_PATH=$PREFIX
cmake --build build --target install
{% set version = GIT_DESCRIBE_TAG[1:] %} # Strip the 'v' from the version tag
{% if GIT_DESCRIBE_TAG is defined %}
{% set version = GIT_DESCRIBE_TAG[1:] %}
{% else %}
{% set version = "0.0.0" %}
{% endif %}
package: package:
name: lima-camera-frelon-tango name: lima-camera-frelon-tango
...@@ -12,6 +17,10 @@ build: ...@@ -12,6 +17,10 @@ build:
noarch: python noarch: python
requirements: requirements:
build:
- cmake
- git
- lima-core
run: run:
- lima-tango-server - lima-tango-server
- lima-camera-frelon - lima-camera-frelon
......
###########################################################################
# This file is part of LImA, a Library for Image Acquisition
#
# Copyright (C) : 2009-2019
# European Synchrotron Radiation Facility
# CS40220 38043 Grenoble Cedex 9
# FRANCE
#
# Contact: lima@esrf.fr
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This software is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
############################################################################
cmake_minimum_required(VERSION 3.1)
project(Frelon_tango NONE)
# use lima toolbox function,
# if cmake is ran out of camera mother project, check python environment
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
find_package(Lima REQUIRED COMPONENTS tools)
set(CMAKE_MODULE_PATH
${LIMA_CMAKE_INCLUDE_DIRS} ${CMAKE_MODULE_PATH})
include(LimaTools)
endif()
limatools_install_camera_tango("Frelon.py")
Markdown is supported
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