conda build

conda-recepie/meta.yaml

@@ -58,6 +58,15 @@ outputs:
       build:
         - {{ compiler('c') }}
         - {{compiler('cxx')}}
+
+  # - name: sls_detector
+  #   version: "refactor"
+  #   script: copy_lib.sh
+    # requirements:
+    #   build:
+    #     - {{ compiler('c') }}
+    #     - {{compiler('cxx')}}
+
   # - name: sls_detector_gui
   #   version: "refactor"
   #   script: copy_gui.sh

python/CMakeLists.txt

@@ -0,0 +1,36 @@
+add_subdirectory(pybind11)
+pybind11_add_module(_sls_detector src/main.cpp)
+
+target_link_libraries(_sls_detector PUBLIC 
+                        slsDetectorShared
+                        slsReceiverShared
+                        slsSupportLib )  
+
+set_target_properties(_sls_detector PROPERTIES
+                        LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+                    )
+
+#Copy Python code 
+set( PYTHON_FILES
+    __init__.py
+    adcs.py
+    dacs.py
+    decorators.py
+    detector_property.py
+    detector.py
+    eiger.py
+    errors.py
+    jungfrau_ctb.py
+    jungfrau.py
+    registers.py
+    utils.py
+
+)
+
+foreach(FILE ${PYTHON_FILES})
+    configure_file( sls_detector/${FILE}  
+    ${CMAKE_BINARY_DIR}/bin/sls_detector/${FILE}  )
+
+endforeach(FILE ${PYTHON_FILES})
+
+

python/conda-recepie/meta.yaml

@@ -1,6 +1,6 @@
 package:
     name: sls_detector
-    version: 4.0.1
+    version: refactor
 
 build:
   number: 0
@@ -16,18 +16,18 @@ requirements:
         - python {{ python }}
         - libpng >=1.6.32,<1.6.35
         - setuptools
-        - sls_detector_lib 4.0.1
+        - sls_detector_lib refactor
         - pyzmq
-        - pybind11
+        - pybind11 2.2
 
     host:
         - python
-        - pybind11
+        - pybind11 2.2 
 
     run:
         - python
         - numpy
-        - sls_detector_lib 4.0.1
+        - sls_detector_lib refactor
         - pyzmq
         - libstdcxx-ng
         - libgcc-ng

python/setup.py

@@ -8,7 +8,7 @@ import sys
 import setuptools
 import os
 
-__version__ = '4.0.0'
+__version__ = 'refactor'
 
 
 def get_conda_path():
@@ -33,30 +33,6 @@ class get_pybind_include(object):
         return pybind11.get_include(self.user)
 
 
-# ext_modules = [
-#     Extension(
-#         '_sls_detector',
-#         ['src/main.cpp'],
-#         include_dirs=[
-#             # Path to pybind11 headers
-#             get_pybind_include(),
-#             get_pybind_include(user=True),
-#             os.path.join(get_sls_path(), 'slsDetectorSoftware/multiSlsDetector'),
-#             os.path.join(get_sls_path(), 'slsReceiverSoftware/include/'),
-#             os.path.join(get_sls_path(),'slsDetectorSoftware/commonFiles/'),
-#             os.path.join(get_sls_path(), 'slsDetectorSoftware/slsDetector'),
-#             os.path.join(get_sls_path(), 'slsDetectorSoftware/slsDetectorAnalysis'),
-#             os.path.join(get_sls_path(), 'slsDetectorSoftware/slsReceiverInterface/'),
-#
-#         ],
-#         libraries = ['SlsDetector', 'zmq'],
-#         library_dirs = [os.path.join(get_sls_path(),'build/bin'),
-#                         os.path.join(get_sls_path(),'slsReceiverSoftware/include')],
-#
-#         language='c++'
-#     ),
-# ]
-
 ext_modules = [
     Extension(
         '_sls_detector',