Merge branch '56-build-standalone-camera-packages' into 'master'

56 build standalone camera packages

See merge request !6

.gitlab-ci.yml

+stages:
+  - build
+  - build-noarch
+  - deploy
+
+.build-conda: &build-conda
+  stage: build
+  artifacts:
+    paths:
+      - dist/
+  tags:
+    - conda
+
+build-win:
+  <<: *build-conda
+  script:
+    - conda build ./conda/camera --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
+  tags:
+    - win
+
+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
+  dependencies:
+    - build-win
+  tags:
+    - win
+
+deploy-devel:
+  stage: deploy
+  environment:
+    name: devel/$CI_COMMIT_REF_NAME
+    url: http://bcu-ci.esrf.fr/devel
+  dependencies:
+    - build-win
+    - build-noarch
+  script:
+    - cp -Rf dist/* /conda-devel/
+    - conda index /conda-devel/
+  tags:
+    - conda
+    - linux
+  only:
+    - branches
+  except:
+    - stable
+  when: manual
+
+deploy-stable:
+  stage: deploy
+  environment:
+    name: production
+    url: http://bcu-ci.esrf.fr/stable
+  dependencies:
+    - build-win
+    - build-noarch
+  script:
+    - cp -Rf dist/* /conda/
+    - conda index /conda/
+  tags:
+    - conda
+    - linux
+  only:
+    - tags
+    - stable

VERSION

-1.7.7

cmake/FindPco.cmake

+set(PCO_INCLUDE_DIRS)
+set(PCO_LIBRARIES)
+set(PCO_DEFINITIONS)
+
+set(PCO_SDKWIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdkPco" CACHE PATH "location of PCO Windows SDK")
+set(PCO_SDKLIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdkPcoLin" CACHE PATH "location of PCO Linux SDK")
+
+if(WIN32)
+  find_path(PCO_INCLUDE_DIRS "PcoSdkVersion.h" ${PCO_SDKWIN_DIR})
+  find_library(PCO_LIBRARIES SC2_Cam ${PCO_SDKWIN_DIR}/lib64)
+  list(APPEND PCO_INCLUDE_DIRS ${PCO_INCLUDE_DIRS} ${PCO_INCLUDE_DIRS}/include)
+else()
+  #Current location of linux sdk, on the branch linux_dev.v123 the 09/06/17
+  set(PCO_SDK_LIB_DIR "${PCO_SDKLIN_DIR}/pco_common/pco_lib" CACHE PATH "location of pco sdklib-lin")
+
+  #set(SISO_LIB_DIR "${SISODIR5}/lib64" CACHE PATH "sisolib")
+  set(SISO_LIB_DIR "/opt/SiliconSoftware/Runtime5.2.2/lib64" CACHE PATH "sisolib")
+
+  find_path(PCO_INCLUDE_DIRS "PcoSdkVersion.h")
+  find_library(PCO_CAM_ME4_LIB pcocam_me4 ${PCO_SDK_LIB_DIR})
+  find_library(PCO_FILE_LIB pcofile ${PCO_SDK_LIB_DIR})
+  find_library(PCO_LOG_LIB pcolog ${PCO_SDK_LIB_DIR})
+  find_library(PCO_FUNC_LIB reorderfunc ${PCO_SDK_LIB_DIR})
+  find_library(SISO_LIB_FGLIB5 fglib5 ${SISO_LIB_DIR})
+  find_library(SISO_LIB_CLSERSIS clsersis ${SISO_LIB_DIR})
+  find_library(SISO_LIB_HAPRT haprt ${SISO_LIB_DIR})
+  list(APPEND PCO_LIBRARIES ${PCO_CAM_ME4_LIB} ${PCO_FILE_LIB} ${PCO_LOG_LIB} ${PCO_FUNC_LIB} ${SISO_LIB_FGLIB5} ${SISO_LIB_CLSERSIS} ${SISO_LIB_HAPRT})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PCO DEFAULT_MSG
+  PCO_LIBRARIES
+  PCO_INCLUDE_DIRS
+)

cmake/project-config.cmake.in

+# Config file for @PROJECT_NAME_LOWER@
+#
+# It defines the following variables:
+#
+# @PROJECT_NAME_UPPER@_INCLUDE_DIRS     - include directory
+# @PROJECT_NAME_UPPER@_LIBRARIES        - all dynamic libraries
+# @PROJECT_NAME_UPPER@_STATIC_LIBRARIES - all static libraries
+
+@PACKAGE_INIT@
+
+# Add dependencies here
+include(CMakeFindDependencyMacro)
+find_dependency(Lima)
+
+include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
+check_required_components("@PROJECT_NAME@")
+
+check_required_components(@PROJECT_NAME_LOWER@)

conda/camera/bld.bat

+cmake -Bbuild -H. -G "%CMAKE_GENERATOR%" -DCAMERA_ENABLE_PYTHON=1 -DCAMERA_ENABLE_TESTS=1 -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/camera/build.sh

+#!/bin/bash
+cmake -Bbuild -H. -DCAMERA_ENABLE_PYTHON=1 -DCAMERA_ENABLE_TESTS=1 -DCMAKE_INSTALL_PREFIX=$PREFIX -DPYTHON_SITE_PACKAGES_DIR=$SP_DIR -DCMAKE_FIND_ROOT_PATH=$PREFIX
+cmake --build build --target install

conda/camera/conda_build_config.yaml

+blas_impl:
+  - mkl                        # [x86_64]
+c_compiler:
+  - vs2017                     # [win]
+cxx_compiler:
+  - vs2017                     # [win]
+python:
+  - 2.7                        # [linux]
+  - 3.6
+# This differs from target_platform in that it determines what subdir the compiler
+#    will target, not what subdir the compiler package will be itself.
+#    For example, we need a win-64 vs2008_win-32 package, so that we compile win-32
+#    code on win-64 miniconda.
+cross_compiler_target_platform:
+  - win-64                     # [win]
+target_platform:
+  - win-64                     # [win]
+vc:
+  - 14
+zip_keys:
+  -                             # [win]
+    - vc                        # [win]
+    - c_compiler                # [win]
+    - cxx_compiler              # [win]

conda/camera/meta.yaml

+{% set version = GIT_DESCRIBE_TAG[1:] %}
+
+package:
+  name: lima-camera-pco
+  version: {{ version }}
+
+source:
+  path: ../..
+
+build:
+  number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
+
+requirements:
+  host:
+    - python {{ python }}
+    - numpy
+    - sip 4.19.8              # For compatibility with pyqt 5.9.2
+    - lima-core
+    - pco-sdk
+  build:
+    - git
+    - cmake
+    - {{ compiler('cxx') }}
+  run:
+    - python {{ python }}
+    - sip >=4.19.4, <=4.19.8  # For compatibility with pyqt 5.9.2
+    - {{ pin_compatible('lima-core', max_pin='x.x') }}
+    - pco-sdk
+
+test:
+  requires:
+    - cmake
+  imports:
+    - Lima.Pco
+  commands:
+    - cmake --version
+    - ctest --version
+    - cpack --version
+
+about:
+  home: https://github.com/esrf-bliss/Lima
+  license: GPL
+  license_file: COPYING
+  summary: a library for the unified control of 2D detectors

conda/tango/bld.bat

+xcopy tango\*.* %SP_DIR%\Lima\Server\camera\

conda/tango/build.sh

+mkdir -p $SP_DIR/Lima/Server/camera && cp tango/*.* $SP_DIR/Lima/Server/camera

conda/tango/meta.yaml

+{% set version = GIT_DESCRIBE_TAG[1:] %}
+
+package:
+  name: lima-camera-pco-tango
+  version: {{ version }}
+
+source:
+  path: ../..
+
+build:
+  number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
+  noarch: python
+
+requirements:
+  run:
+    - lima-tango-server
+    - lima-camera-pco
+
+about:
+  home: https://github.com/esrf-bliss/Lima
+  license: GPL
+  license_file: COPYING
+  summary: a library for the unified control of 2D detectors

include/PcoCamera.h

@@ -707,7 +707,7 @@ namespace lima
 
         void getCameraName(std::string& name);
 
-        const char *talk(const std::string& cmd);
+        std::string talk(const std::string& cmd);
         const char *_talk(const char *cmd, char *output, int lg);
 
 

sip/PcoCamera.sip

@@ -15,7 +15,7 @@ namespace Pco
         void 	startAcq();
         void	reset(int);
 
-        const char *talk(const std::string& cmd);
+        std::string talk(const std::string& cmd);
 
         int getNbAcquiredFrames();
 

src/PcoCameraUtils.cpp

@@ -268,7 +268,7 @@ void stcPcoData::traceMsg(char *s){
 }
 
 static char buff[BUFF_INFO_SIZE +16];
-const char *Camera::talk(const std::string& cmd){
+std::string Camera::talk(const std::string& cmd){
 	DEB_MEMBER_FUNCT();
 
 	static char buff[BUFF_INFO_SIZE +16];