Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
Lima-camera-frelon
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LimaGroup
Lima-camera-frelon
Commits
6c20b48b
Commit
6c20b48b
authored
Sep 11, 2019
by
Samuel Debionne
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'prepare-1.9' into 'master'
Prepare 1.9 See merge request
!12
parents
3dd194fc
045cb044
Pipeline
#14296
passed with stages
in 4 minutes and 39 seconds
Changes
9
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
84 additions
and
38 deletions
+84
-38
.gitignore
.gitignore
+2
-1
.gitlab-ci.yml
.gitlab-ci.yml
+2
-3
CMakeLists.txt
CMakeLists.txt
+12
-28
README.md
README.md
+3
-2
conda/camera/meta.yaml
conda/camera/meta.yaml
+6
-1
conda/tango/bld.bat
conda/tango/bld.bat
+7
-1
conda/tango/build.sh
conda/tango/build.sh
+4
-1
conda/tango/meta.yaml
conda/tango/meta.yaml
+10
-1
tango/CMakeLists.txt
tango/CMakeLists.txt
+38
-0
No files found.
.gitignore
View file @
6c20b48b
...
...
@@ -6,4 +6,5 @@
\#*\#
.\#*
*.pyc
build/
tango/build/
.gitlab-ci.yml
View file @
6c20b48b
...
...
@@ -22,7 +22,7 @@ build-noarch:
<<
:
*build-conda
stage
:
build-noarch
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
:
-
build-linux
...
...
@@ -43,7 +43,7 @@ deploy-devel:
only
:
-
branches
except
:
-
stable
-
master
when
:
manual
deploy-stable
:
...
...
@@ -62,4 +62,3 @@ deploy-stable:
-
linux
only
:
-
tags
-
stable
CMakeLists.txt
View file @
6c20b48b
###########################################################################
# This file is part of LImA, a Library for Image Acquisition
#
# Copyright (C) : 2009-201
7
# Copyright (C) : 2009-201
9
# European Synchrotron Radiation Facility
#
BP 220, Grenoble 38043
#
CS40220 38043 Grenoble Cedex 9
# FRANCE
#
# Contact: lima@esrf.fr
...
...
@@ -52,43 +52,25 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
endif
()
if
(
CAMERA_MASTER_PROJECT
)
find_package
(
Lima REQUIRED
)
find_package
(
Lima REQUIRED
COMPONENTS devel tools
)
endif
()
# CMake additional macros
set
(
CMAKE_MODULE_PATH
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake
${
LIMA_CMAKE_INCLUDE_DIRS
}
${
CMAKE_MODULE_PATH
}
)
include
(
LimaTools
)
# Set version
include
(
project_version
)
# Enable python binding code compilation using sip generator
if
(
CAMERA_MASTER_PROJECT
)
option
(
LIMA_ENABLE_PYTHON
"compile python binding code?"
OFF
)
endif
(
)
option
(
LIMA_ENABLE_PYTANGO_SERVER
"install python tango server?"
OFF
)
if
(
LIMA_ENABLE_PYTHON
)
# Find python interpreter and libs
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
)
if
(
LIMA_ENABLE_PYTHON
)
limatools_find_python_and_sip
()
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
()
if
(
CAMERA_MASTER_PROJECT
)
...
...
@@ -137,7 +119,6 @@ endif()
# Binding code for python
if
(
LIMA_ENABLE_PYTHON
)
include
(
LimaTools
)
set
(
IMPORTS
"limaespia.sip"
)
if
(
NOT CAMERA_MASTER_PROJECT
)
set
(
SIP_INCLUDE_DIRS
...
...
@@ -186,7 +167,10 @@ if(LIMA_ENABLE_PYTHON)
install
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/python/
DESTINATION
"
${
PYTHON_SITE_PACKAGES_DIR
}
/Lima/Frelon"
)
)
if
(
LIMA_ENABLE_PYTANGO_SERVER
)
add_subdirectory
(
tango
)
endif
()
endif
()
## Tests
...
...
README.md
View file @
6c20b48b
...
...
@@ -16,7 +16,7 @@ conda install -c esrf-bcu lima-camera-frelon
### 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
...
...
@@ -26,5 +26,6 @@ Lima is a C++ library which can be used with many different cameras. The library
## Documentation
The documentation is available
[
here
](
https://lima1.readthedocs.io/
)
The documentation is available
[
here
](
https://lima.blissgarden.org
)
conda/camera/meta.yaml
View file @
6c20b48b
{
%
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
:
name
:
lima-camera-frelon
...
...
conda/tango/bld.bat
View file @
6c20b48b
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%
conda/tango/build.sh
View file @
6c20b48b
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
conda/tango/meta.yaml
View file @
6c20b48b
{
%
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
:
name
:
lima-camera-frelon-tango
...
...
@@ -12,6 +17,10 @@ build:
noarch
:
python
requirements
:
build
:
-
cmake
-
git
-
lima-core
run
:
-
lima-tango-server
-
lima-camera-frelon
...
...
tango/CMakeLists.txt
0 → 100644
View file @
6c20b48b
###########################################################################
# 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"
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment