Merge branch '16-generate-conda-packages' into 'master'

Resolve "Generate conda packages"

Closes #16

See merge request !65

.gitlab-ci.yml

-# image : docker-registry.esrf.fr/bcu/lima-ci-debian8:latest
-#before_script :
-
 stages:
   - build
-  - test
+  - deploy
 
-build-python2 :
+build-conda-linux:
   stage: build
   script:
-    - update-alternatives --set python /usr/bin/python2.7
-    - ./install.sh --git tests python
-    - ls -l
+    - conda build ./conda --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
   artifacts:
     paths:
-    - build/
+      - dist/
   tags:
-    - lima
+    - conda
+    - linux
 
-build-python3 :
+build-conda-win:
   stage: build
   script:
-    - update-alternatives --set python /usr/bin/python3.4
-    - ./install.sh --git tests python
-    - ls -l
+    #- conda build ./conda --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
+    - docker run --mount type=bind,source="%CD%",target="C:\sources" docker-registry.esrf.fr/bcu/conda-builder-win cmd /K cd C:\sources ^& conda build ./conda --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
   artifacts:
     paths:
-    - build/
+      - dist/
   tags:
-    - lima
-
-
-test-python2 :
-  stage: test
-  dependencies:
-    - build-python2
-  script:
-    - update-alternatives --set python /usr/bin/python2.7
-    - cd build/
-    - ctest --timeout 10 --output-on-failure
-  tags:
-    - lima
-
+    - conda
+    - win
+    - shell
 
-test-python3 :
-  stage: test
+deploy:
+  stage: deploy
+  environment:
+    name: production
+    url: http://bcu-ci.esrf.fr/stable
   dependencies:
-    - build-python3
+    - build-conda-linux
+    - build-conda-win
   script:
-    - update-alternatives --set python /usr/bin/python3.4
-    - cd build/
-    - ctest --timeout 10 --output-on-failure
+    - mv -Rf dist/* /conda/
+    - conda index /conda/
   tags:
-    - lima
+    - conda
+    - linux
+  when: manual

andor @ 735ba784

-Subproject commit e148a266a6689e9e1e5545a842e2f6ac6cc443c3
+Subproject commit 735ba784e07b37fb991b49a00d20e346e7f6ad1a

andor3 @ 05fa3370

-Subproject commit 019824712a193bf67dac59f54551d8414f794f4c
+Subproject commit 05fa3370c45bee7c164b16b104d43b13d6eb6e21

basler @ 20d7f4a7

-Subproject commit 61ddfec995ab3ac369e12d2f20f78912d3b09502
+Subproject commit 20d7f4a75ac5b65daf51af314fa18e7432d8af3b

espia @ 085e3a54

-Subproject commit 448222e1f64eb92292407cf7ea5d5d7f79933abf
+Subproject commit 085e3a547e77490b7490dbf6168bec5754efd71f

frelon @ d42cb143

-Subproject commit 2f3a081b6090bd4633d5bff8209c7f14065c9181
+Subproject commit d42cb143f59be0fe1bdd355931b1d057fd3869c8

maxipix @ 861cbc2c

-Subproject commit 491b097a012c29168e3a097f937c42ddd398f88e
+Subproject commit 861cbc2cbd575a9b23e95b5352ed7474920e4f86

pco @ 9da79623

-Subproject commit 7d5e257a0f1e706a3b11619877c9ec50381d15ca
+Subproject commit 9da796236f7ce98add5dd5e28cab016c3076e6ac

pilatus @ 7688e5ca

-Subproject commit 0a26b61f31d41c60a6b45385279f889f7791d2d4
+Subproject commit 7688e5cae953891f4f91c5ca17801fd73dd69bdf

prosilica @ ce22fdaf

-Subproject commit dda475da96948630f05bf41d3dcb4c694fbcb869
+Subproject commit ce22fdafa85cbebf9da81815e6f68b52a015a25b

camera/simulator/CMakeLists.txt

@@ -5,19 +5,19 @@
 #  European Synchrotron Radiation Facility
 #  BP 220, Grenoble 38043
 #  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/>.
 ############################################################################
@@ -36,16 +36,8 @@ target_link_libraries(lima${NAME} limacore)
 if(WIN32)
 	target_compile_definitions(lima${NAME} PRIVATE LIBSIMULATOR_EXPORTS)
 endif()
-if(WIN32)
-    set_target_properties(lima${NAME} PROPERTIES PREFIX "lib")
-endif()
-if(WIN32)
-    install(TARGETS lima${NAME}
-            DESTINATION lib)
-else()
-    install(TARGETS lima${NAME}
-            LIBRARY DESTINATION lib)
-endif()
+
+limatools_set_install_libdir(lima${NAME})
 
 if (LIMA_ENABLE_PYTHON)
     limatools_run_sip_for_camera(${NAME})

v4l2 @ 1752063b

-Subproject commit 89f71186c51652daff86a08a0363b58a8818733d
+Subproject commit 1752063b4dc51c930c06437c30fe98907d32917b

cmake/FindCBF.cmake

+find_path(CBF_INCLUDE_DIRS cbflib/cbf.h)
+find_library(CBF_LIBRARIES cbf)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CBF
+  DEFAULT_MSG
+  CBF_LIBRARIES
+  CBF_INCLUDE_DIRS)

cmake/FindCCFits.cmake

+# -- Check for CFITSIO and CCFITS library --
+#
+# Uses path overrides: CFITSIOINC_PATH and CFITSIOLIB_PATH
+#
+# Defines:
+#
+#  CFITSIO_FOUND - system has the CFITSIO library
+#  CFITSIO_INCLUDE_DIR - the CFITSIO include directory
+#  CFITSIO_LIBRARY - The library needed to use CFITSIO
+#
+#  CCFITS_FOUND
+#  CCFITS_INCLUDE_DIR
+#  CCFITS_LIBRARY
+#
+# Hints for non-standard locations:
+#
+#   CFITSIO_ROOT_DIR  (used for finding cfitsio only)
+#   CCFITS_ROOT_DIR (used for finding CCfits only)
+#   BASE_DIR (used for both, and other dependencies as well)
+#
+# These directories can be the --prefix=<dir> directory or the
+# individual source directories for cfitsio or ccfits.
+#
+#   Copyright 2012  Jacek Becla, Daniel Liwei Wang
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+include(FindPackageHandleStandardArgs)
+
+# Look for includes and libraries
+find_path(CFITSIO_INCLUDE_DIR
+  NAMES fitsio.h
+  HINTS ${CFITSIO_ROOT_DIR} ${BASE_DIR}
+  PATH_SUFFIXES include include/cfitsio
+  )
+find_library(CFITSIO_LIBRARY  cfitsio
+  HINTS ${CFITSIO_ROOT_DIR} ${BASE_DIR}
+  PATH_SUFFIXES lib)
+
+find_package_handle_standard_args(CFITSIO  DEFAULT_MSG
+  CFITSIO_INCLUDE_DIR CFITSIO_LIBRARY)
+if(NOT CFITSIO_FOUND)
+  message("Can't find CCfits. You can specify a non-standard (e.g., from source) installation using CFITSIO_ROOT_DIR")
+endif(NOT CFITSIO_FOUND)
+
+
+
+find_path(CCFITS_INCLUDE_DIR  CCfits/CCfits
+  HINTS ${CCFITS_ROOT_DIR} ${BASE_DIR}
+  PATH_SUFFIXES include)
+find_library(CCFITS_LIBRARY  CCfits
+  HINTS ${CCFITS_ROOT_DIR} ${BASE_DIR}
+  PATH_SUFFIXES lib)
+find_package_handle_standard_args(CCFITS  DEFAULT_MSG
+  CCFITS_INCLUDE_DIR CCFITS_LIBRARY)
+
+if(NOT CCFITS_FOUND)
+  message("Can't find CCfits. You can specify a non-standard (e.g., from source) installation using CCFITS_ROOT_DIR")
+endif(NOT CCFITS_FOUND)
+
+#find_package_handle_standard_args(LIBSZ  DEFAULT_MSG  SZ_LIB)
+
+mark_as_advanced(CFITSIO_LIBRARY CFITSIO_INCLUDE_DIR
+  CCFITS_LIBRARY CCFITS_INCLUDE_DIR)

cmake/FindLZ4.cmake

+find_path(LZ4_INCLUDE_DIRS NAMES lz4.h)
+find_library(LZ4_LIBRARIES NAMES lz4)
+
+# We require LZ4_compress_default() which was added in v1.8.2
+if (LZ4_LIBRARIES)
+  include(CheckCSourceRuns)
+  set(CMAKE_REQUIRED_INCLUDES ${LZ4_INCLUDE_DIRS})
+  set(CMAKE_REQUIRED_LIBRARIES ${LZ4_LIBRARY})
+  check_c_source_runs("
+#include <lz4.h>
+int main() {
+  int good = (LZ4_VERSION_MAJOR > 1) ||
+    ((LZ4_VERSION_MAJOR == 1) && (LZ4_VERSION_MINOR >= 8) && (LZ4_VERSION_RELEASE >= 2));
+return !good;
+}" LZ4_GOOD_VERSION)
+  set(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_LIBRARIES)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LZ4
+  DEFAULT_MSG
+  LZ4_LIBRARIES
+  LZ4_INCLUDE_DIRS
+  LZ4_GOOD_VERSION)
+
+mark_as_advanced(LZ4_INCLUDE_DIRS LZ4_LIBRARIES)

cmake/FindNumPy.cmake

+# -- Check for the presence of NumPy --
+#
+# The following variables are set when NumPy is found:
+#
+#  NUMPY_FOUND      = Set to true, if all components of NUMPY have been found.
+#  NUMPY_INCLUDE_DIRS   = Include path for the header files of NUMPY
+#  NUMPY_LIBRARIES  = Link these to use NUMPY
+#  NUMPY_LFLAGS     = Linker flags (optional)
+#
+# Copyright (c) 2013, Lars Baehren <lbaehren@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+if (NOT NUMPY_ROOT_DIR)
+    set (NUMPY_ROOT_DIR ${CMAKE_INSTALL_PREFIX})
+endif (NOT NUMPY_ROOT_DIR)
+
+if (NOT PYTHONINTERP_FOUND)
+    find_package(PythonInterp)
+endif (NOT PYTHONINTERP_FOUND)
+
+##
+## Check for the header files
+
+message(STATUS "#### NUMPY ${PYTHON_EXECUTABLE}" )
+
+## Use Python to determine the include directory
+execute_process (
+    COMMAND ${PYTHON_EXECUTABLE} -c import\ numpy\;\ print\(numpy.get_include\(\)\);
+    ERROR_VARIABLE NUMPY_FIND_ERROR
+    RESULT_VARIABLE NUMPY_FIND_RESULT
+    OUTPUT_VARIABLE NUMPY_FIND_OUTPUT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+## process the output from the execution of the command
+if (NOT NUMPY_FIND_RESULT)
+    set (NUMPY_INCLUDE_DIRS ${NUMPY_FIND_OUTPUT})
+endif (NOT NUMPY_FIND_RESULT)
+
+##
+## Check for the library
+
+if (PYTHON_SITE_PACKAGES_DIR)
+    find_library (NUMPY_NPYMATH_LIBRARY npymath
+        HINTS ${PYTHON_SITE_PACKAGES_DIR}/numpy/core
+        PATH_SUFFIXES lib
+        )
+    if (NUMPY_NPYMATH_LIBRARY)
+        list (APPEND NUMPY_LIBRARIES ${NUMPY_NPYMATH_LIBRARY})
+    endif (NUMPY_NPYMATH_LIBRARY)
+endif (PYTHON_SITE_PACKAGES_DIR)
+
+##
+## Get API version of NumPy from 'numpy/numpyconfig.h'
+
+if (PYTHON_EXECUTABLE)
+    execute_process (
+        COMMAND ${PYTHON_EXECUTABLE} -c import\ numpy\;\ print\(numpy.__version__\);
+        ERROR_VARIABLE NUMPY_API_VERSION_ERROR
+        RESULT_VARIABLE NUMPY_API_VERSION_RESULT
+        OUTPUT_VARIABLE NUMPY_API_VERSION
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+else ()
+    ## Backup procedure: extract version number directly from the header file
+    if (NUMPY_INCLUDE_DIRS)
+        find_file (HAVE_NUMPYCONFIG_H numpy/numpyconfig.h
+            HINTS ${NUMPY_INCLUDE_DIRS}
+            )
+    endif (NUMPY_INCLUDE_DIRS)
+endif ()
+
+## Dissect full version number into major, minor and patch version
+if (NUMPY_API_VERSION)
+    string (REGEX REPLACE "\\." ";" _tmp ${NUMPY_API_VERSION})
+    list (GET _tmp 0 NUMPY_API_VERSION_MAJOR)
+    list (GET _tmp 1 NUMPY_API_VERSION_MINOR)
+    list (GET _tmp 2 NUMPY_API_VERSION_PATCH)
+endif (NUMPY_API_VERSION)
+
+##
+## Actions taken when all components have been found
+
+find_package_handle_standard_args (NUMPY DEFAULT_MSG NUMPY_INCLUDE_DIRS)
+
+if (NUMPY_FOUND)
+    if (NOT NUMPY_FIND_QUIETLY)
+        message (STATUS "Found components for NumPy")
+        message (STATUS "NUMPY_ROOT_DIR    = ${NUMPY_ROOT_DIR}")
+        message (STATUS "NUMPY_INCLUDE_DIRS    = ${NUMPY_INCLUDE_DIRS}")
+        message (STATUS "NUMPY_LIBRARIES   = ${NUMPY_LIBRARIES}")
+        message (STATUS "NUMPY_API_VERSION = ${NUMPY_API_VERSION}")
+    endif (NOT NUMPY_FIND_QUIETLY)
+else (NUMPY_FOUND)
+    if (NUMPY_FIND_REQUIRED)
+        message (FATAL_ERROR "Could not find NUMPY!")
+    endif (NUMPY_FIND_REQUIRED)
+endif (NUMPY_FOUND)
+
+##
+## Mark advanced variables
+
+mark_as_advanced (
+  NUMPY_ROOT_DIR
+  NUMPY_INCLUDE_DIRS
+  NUMPY_LIBRARIES
+)

cmake/LimaTools.cmake

@@ -3,33 +3,33 @@
 #
 #  Copyright (C) : 2009-2017
 #  European Synchrotron Radiation Facility
-#  CS40220 38043 Grenoble Cedex 9 
+#  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/>.
 ############################################################################
 
 function(limatools_set_library_soversion lib_name version_file)
-  
+
     file(STRINGS ${version_file}  version)
     # for lib version as 1.2.3 soverion is fixed to 1.2
     string(REGEX MATCH "^([0-9]+)\\.([0-9]+)" soversion "${version}")
-  
+
     set_target_properties(${lib_name} PROPERTIES VERSION "${version}" SOVERSION "${soversion}")
-  
+
 endfunction()
 
 
@@ -70,16 +70,16 @@ endfunction()
 
 
 function(limatools_run_sip_for_camera cam_name)
-  
+
   set(INCLUDES)
   file(GLOB sipfiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/sip" "${CMAKE_CURRENT_SOURCE_DIR}/sip/*.sip")
   foreach(sipfile ${sipfiles})
-    set(INCLUDES 
+    set(INCLUDES
       "${INCLUDES}
 %Include ${sipfile}")
   endforeach()
 
-  set(IMPORTS 
+  set(IMPORTS
     "${IMPORTS}
 %Import limacore.sip")
 
@@ -112,9 +112,12 @@ endfunction()
 function(limatools_set_install_libdir lib_name)
   if(WIN32)
     set_target_properties(${lib_name} PROPERTIES PREFIX "lib")
-    install(TARGETS ${lib_name} DESTINATION lib)
+    install(TARGETS ${lib_name}
+            LIBRARY DESTINATION lib
+            RUNTIME DESTINATION bin)
   else()
     include(GNUInstallDirs)
-    install(TARGETS ${lib_name} LIBRARY DESTINATION  ${CMAKE_INSTALL_LIBDIR})
+    install(TARGETS ${lib_name}
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
   endif()
-endfunction()
\ No newline at end of file
+endfunction()

common/include/lima/Debug.h

@@ -500,16 +500,17 @@ inline DebProxy DebObj::write(DebType type, ConstStr file_name, int line_nr)
 		return DebProxy();
 }
 
+} // namespace lima
 
 /*------------------------------------------------------------------
  *  debug macros
  *------------------------------------------------------------------*/
 
 #define DEB_GLOBAL_NAMESPC(mod, name_space)				\
-	inline DebParams& getDebParams()				\
+	inline lima::DebParams& getDebParams()				\
 	{								\
-		static DebParams *deb_params = NULL;			\
-		EXEC_ONCE(deb_params = new DebParams(mod, NULL,		\
+		static lima::DebParams *deb_params = NULL;			\
+		EXEC_ONCE(deb_params = new lima::DebParams(lima::mod, NULL,		\
 						     name_space));	\
 		return *deb_params;					\
 	}
@@ -517,12 +518,11 @@ inline DebProxy DebObj::write(DebType type, ConstStr file_name, int line_nr)
 #define DEB_GLOBAL(mod)							\
 	DEB_GLOBAL_NAMESPC(mod, NULL)
 
-#define DEB_CLASS_NAMESPC(mod, class_name, name_space)			\
-  private:								\
-	static DebParams& getDebParams()				\
+#define DEB_STRUCT_NAMESPC(mod, struct_name, name_space)			\
+	static lima::DebParams& getDebParams()				\
 	{								\
-		static DebParams *deb_params = NULL;			\
-		EXEC_ONCE(deb_params = new DebParams(mod, class_name,	\
+		static lima::DebParams *deb_params = NULL;			\
+		EXEC_ONCE(deb_params = new lima::DebParams(lima::mod, struct_name,	\
 						     name_space));	\
 		return *deb_params;					\
 	}								\
@@ -532,7 +532,7 @@ inline DebProxy DebObj::write(DebType type, ConstStr file_name, int line_nr)
 		m_deb_obj_name = obj_name;				\
 	}								\
 									\
-	ConstStr getDebObjName() const					\
+	lima::ConstStr getDebObjName() const					\
 	{								\
 		if (m_deb_obj_name.empty())				\
 			return NULL;					\
@@ -541,31 +541,35 @@ inline DebProxy DebObj::write(DebType type, ConstStr file_name, int line_nr)
 									\
 	std::string m_deb_obj_name
 
+#define DEB_CLASS_NAMESPC(mod, class_name, name_space)			\
+  private:								\
+	DEB_STRUCT_NAMESPC(mod, class_name, name_space)
+
 #define DEB_CLASS(mod, class_name)					\
 	DEB_CLASS_NAMESPC(mod, class_name, NULL)
 
 #ifndef NO_LIMA_DEBUG
 
 #define DEB_GLOBAL_FUNCT()						\
-	DebObj deb(getDebParams(), false, __FUNCTION__,			\
+	lima::DebObj deb(getDebParams(), false, __FUNCTION__,			\
 		   NULL, __FILE__, __LINE__)
 
 #define DEB_CONSTRUCTOR()						\
 	DEB_MEMBER_FUNCT()
 
 #define DEB_DESTRUCTOR()						\
-	DebObj deb(getDebParams(), true, __FUNCTION__,			\
+	lima::DebObj deb(getDebParams(), true, __FUNCTION__,			\
 		   getDebObjName(), __FILE__, __LINE__)
 
 #define DEB_MEMBER_FUNCT()						\
-	DebObj deb(getDebParams(), false, __FUNCTION__,			\
+	lima::DebObj deb(getDebParams(), false, __FUNCTION__,			\
 		   getDebObjName(), __FILE__, __LINE__)
 
 #define DEB_PTR()							\
 	(&deb)
 
 #define DEB_FROM_PTR(deb_ptr)						\
-	DebObj& deb = *(deb_ptr)
+	lima::DebObj& deb = *(deb_ptr)
 
 #define DEB_STATIC_FUNCT()						\
 	DEB_GLOBAL_FUNCT()
@@ -576,13 +580,13 @@ inline DebProxy DebObj::write(DebType type, ConstStr file_name, int line_nr)
 
 #define DEB_MSG(type)	deb.write(type, __FILE__, __LINE__)
 
-#define DEB_FATAL()	DEB_MSG(DebTypeFatal)
-#define DEB_ERROR()	DEB_MSG(DebTypeError)
-#define DEB_WARNING()	DEB_MSG(DebTypeWarning)
-#define DEB_TRACE()	DEB_MSG(DebTypeTrace)
-#define DEB_PARAM()	DEB_MSG(DebTypeParam)
-#define DEB_RETURN()	DEB_MSG(DebTypeReturn)
-#define DEB_ALWAYS()	DEB_MSG(DebTypeAlways)
+#define DEB_FATAL()	DEB_MSG(lima::DebTypeFatal)
+#define DEB_ERROR()	DEB_MSG(lima::DebTypeError)
+#define DEB_WARNING()	DEB_MSG(lima::DebTypeWarning)
+#define DEB_TRACE()	DEB_MSG(lima::DebTypeTrace)
+#define DEB_PARAM()	DEB_MSG(lima::DebTypeParam)
+#define DEB_RETURN()	DEB_MSG(lima::DebTypeReturn)
+#define DEB_ALWAYS()	DEB_MSG(lima::DebTypeAlways)
 
 #define DEB_HEX(x)	DebHex(x)
 
@@ -608,13 +612,13 @@ inline DebProxy DebObj::write(DebType type, ConstStr file_name, int line_nr)
 
 #else //NO_LIMA_DEBUG
 
-#define DEB_GLOBAL_FUNCT() DebSink deb
-#define DEB_CONSTRUCTOR() DebSink deb
-#define DEB_DESTRUCTOR()  DebSink deb
-#define DEB_MEMBER_FUNCT() DebSink deb
+#define DEB_GLOBAL_FUNCT() lima::DebSink deb
+#define DEB_CONSTRUCTOR() lima::DebSink deb
+#define DEB_DESTRUCTOR()  lima::DebSink deb
+#define DEB_MEMBER_FUNCT() lima::DebSink deb
 
 #define DEB_PTR()	NULL
-#define DEB_FROM_PTR(deb_ptr) DebSink deb
+#define DEB_FROM_PTR(deb_ptr) lima::DebSink deb
 #define DEB_STATIC_FUNCT() DEB_GLOBAL_FUNCT()
 #define DEB_SET_OBJ_NAME(n)
 
@@ -640,6 +644,5 @@ inline DebProxy DebObj::write(DebType type, ConstStr file_name, int line_nr)
 #define DEB_CHECK_ANY(type)	0
 
 #endif //NO_LIMA_DEBUG
-} // namespace lima
 
 #endif // DEBUG_H

conda/bld.bat

+./install.bat --install-prefix=%LIBRARY_PREFIX% --install-python-prefix=%SP_DIR% --find-root-path=%PREFIX% --build-type=Release hdf5 hdf5-bs edfgz edflz4 tiff python pytango-server pco

conda/build.sh

+#!/bin/bash
+python -V
+./install.sh --install-prefix=$PREFIX --install-python-prefix=$SP_DIR --find-root-path=$PREFIX hdf5 hdf5-bs edfgz edflz4 cbf tiff python pytango-server basler pilatus v4l2 espia maxipix frelon andor andor3 prosilica
+
+# Conda requires the library to be installed in /lib not /lib64 regardeless of the HFS standard.
+mv -f $PREFIX/lib64/* $PREFIX/lib
+rmdir $PREFIX/lib64

conda/conda_build_config.yaml

+blas_impl:
+  - mkl                        # [x86_64]
+c_compiler:
+  - vs2017                     # [win]
+cxx_compiler:
+  - vs2017                     # [win]
+python:
+  - 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]

control/include/lima/CtSaving_Compression.h

@@ -83,10 +83,19 @@ static const int LZ4_HEADER_SIZE = 19;
 static const int LZ4_FOOTER_SIZE = 4;
 
 static const LZ4F_preferences_t lz4_preferences = {
-  { LZ4F_max256KB, LZ4F_blockLinked, LZ4F_noContentChecksum, LZ4F_frame, 0, { 0, 0 } },
-  0,   /* compression level */
-  1,   /* autoflush */
-  { 0, 0, 0, 0 },  /* reserved, must be set to 0 */
+  {
+    LZ4F_max256KB,            /* blockSizeID */
+    LZ4F_blockLinked,         /* blockMode */
+    LZ4F_noContentChecksum,   /* contentChecksumFlag */
+    LZ4F_frame,               /* frameType */
+    0,                        /* contentSize */
+    0,                        /* dictID */
+    LZ4F_noBlockChecksum      /* blockChecksumFlag */
+  },
+  0,   /* compressionLevel */
+  1,   /* autoFlush */
+  0,   /* favorDecSpeed */
+  { 0, 0, 0 },  /* reserved, must be set to 0 */
 };