From 547efc48e3e61d712d83f8340f6221d3f201df79 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Wed, 12 Dec 2018 16:27:35 +0100 Subject: [PATCH 1/6] added conda recipe --- .travis.yml | 45 +++++++++++++++++++++++ recipe/build.sh | 15 ++++++++ recipe/copy_gui.sh | 15 ++++++++ recipe/copy_lib.sh | 23 ++++++++++++ recipe/meta.yaml | 89 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 187 insertions(+) create mode 100644 .travis.yml create mode 100644 recipe/build.sh create mode 100644 recipe/copy_gui.sh create mode 100644 recipe/copy_lib.sh create mode 100644 recipe/meta.yaml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..3348a8b60 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,45 @@ +sudo: false + +language: cpp + +matrix: + include: + - os: linux + env: CONDA_PY=3.6 + +dist: trusty + +install: + - sudo apt-get update + - ldd --version + - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; + - bash miniconda.sh -b -p $HOME/miniconda + - export PATH="$HOME/miniconda/bin:$PATH" + - rm -f miniconda.sh + - hash -r + - conda config --set always_yes yes --set changeps1 no + - conda config --add channels conda-forge + - conda config --add channels slsdetectorgroup + - conda update conda + - conda update --all + - conda install conda-build anaconda-client + + # Useful for debugging any issues with conda + - conda info -a + + + # Replace dep1 dep2 ... with your dependencies + - conda create -q -n test-environment python=$CONDA_PY + - source activate test-environment + - conda-build . + +script: + - echo "No test scripts to be run!" + + +deploy: + provider: script + script: find $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \; + on: + branch: developer + diff --git a/recipe/build.sh b/recipe/build.sh new file mode 100644 index 000000000..ccaa0f3d1 --- /dev/null +++ b/recipe/build.sh @@ -0,0 +1,15 @@ +mkdir build +mkdir install +cd build +cmake .. \ + -DCMAKE_PREFIX_PATH=$CONDA_PREFIX \ + -DCMAKE_INSTALL_PREFIX=install \ + -DUSE_TEXTCLIENT=ON \ + -DUSE_RECEIVER=ON \ + -DUSE_GUI=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DUSE_HDF5=OFF\ + + +cmake --build . -- -j10 +cmake --build . --target install \ No newline at end of file diff --git a/recipe/copy_gui.sh b/recipe/copy_gui.sh new file mode 100644 index 000000000..26ce29890 --- /dev/null +++ b/recipe/copy_gui.sh @@ -0,0 +1,15 @@ + +mkdir $PREFIX/lib +mkdir $PREFIX/bin +mkdir $PREFIX/include + +#No libs for gui? + +#Binaries +cp build/bin/gui_client $PREFIX/bin/. +cp build/bin/slsDetectorGui $PREFIX/bin/. + + +#Which headers do we need for development?? + +# cp include/some_lib.h $PREFIX/include/. \ No newline at end of file diff --git a/recipe/copy_lib.sh b/recipe/copy_lib.sh new file mode 100644 index 000000000..4c427ee92 --- /dev/null +++ b/recipe/copy_lib.sh @@ -0,0 +1,23 @@ + +mkdir $PREFIX/lib +mkdir $PREFIX/bin +mkdir $PREFIX/include +mkdir $PREFIX/include/slsDetectorPackage + +#Shared and static libraries +cp build/bin/libSlsDetector.so $PREFIX/lib/. +cp build/bin/libSlsDetector.a $PREFIX/lib/. +cp build/bin/libSlsReceiver.so $PREFIX/lib/. +cp build/bin/libSlsReceiver.a $PREFIX/lib/. + +#Binaries +cp build/bin/sls_detector_acquire $PREFIX/bin/. +cp build/bin/sls_detector_get $PREFIX/bin/. +cp build/bin/sls_detector_put $PREFIX/bin/. +cp build/bin/sls_detector_help $PREFIX/bin/. +cp build/bin/slsReceiver $PREFIX/bin/. +cp build/bin/slsMultiReceiver $PREFIX/bin/. + +#Which headers do we need for development?? +cp build/install/include/* $PREFIX/include/slsDetectorPackage/ +# cp include/some_lib.h $PREFIX/include/. \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml new file mode 100644 index 000000000..b21249157 --- /dev/null +++ b/recipe/meta.yaml @@ -0,0 +1,89 @@ + +package: + name: sls_detector_software + version: "refactor" + +source: + - path: .. + +build: + number: 0 + rpaths: + - lib/ + +requirements: + build: + - {{ compiler('c') }} + - {{compiler('cxx')}} + - cmake + - qwt 6.* + - qt=4.8.7=7 + - zeromq=4.2.5=hfc679d8_5 + - pyzmq + - xorg-libx11 + - xorg-libice + - xorg-libxext + - xorg-libsm + - xorg-libxau + - xorg-libxrender + - xorg-libxfixes + - {{ cdt('mesa-libgl-devel') }} # [linux] + - {{ cdt('mesa-libegl-devel') }} # [linux] + - {{ cdt('mesa-dri-drivers') }} # [linux] + - {{ cdt('libselinux') }} # [linux] + - {{ cdt('libxdamage') }} # [linux] + - {{ cdt('libxxf86vm') }} # [linux] + + host: + - libstdcxx-ng + - libgcc-ng + - libpng >=1.6.32,<1.6.35 + - xorg-libx11 + - xorg-libice + - xorg-libxext + - xorg-libsm + - xorg-libxau + - xorg-libxrender + - xorg-libxfixes + + run: + - libstdcxx-ng + - libgcc-ng + +outputs: + - name: sls_detector_lib + version: "refactor" + script: copy_lib.sh + requirements: + build: + - {{ compiler('c') }} + - {{compiler('cxx')}} + - name: sls_detector_gui + version: "refactor" + script: copy_gui.sh + requirements: + build: + - {{ compiler('c') }} + - {{compiler('cxx')}} + - cmake + - qwt 6.* + - qt=4.8.7=7 + - zeromq=4.2.5=hfc679d8_5 + - pyzmq + - xorg-libx11 + - xorg-libice + - xorg-libxext + - xorg-libsm + - xorg-libxau + - xorg-libxrender + - xorg-libxfixes + - {{ cdt('mesa-libgl-devel') }} # [linux] + - {{ cdt('mesa-libegl-devel') }} # [linux] + - {{ cdt('mesa-dri-drivers') }} # [linux] + - {{ cdt('libselinux') }} # [linux] + - {{ cdt('libxdamage') }} # [linux] + - {{ cdt('libxxf86vm') }} # [linux] + run: + - sls_detector_lib=refactor + - qwt 6.* + - qt=4.8.7=7 From feeaebb7e43a7944c128c8391ab78b19e57c74a0 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Wed, 12 Dec 2018 16:28:58 +0100 Subject: [PATCH 2/6] removed branch condition --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3348a8b60..f361f236e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,6 @@ script: deploy: provider: script script: find $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \; - on: - branch: developer + # on: + # branch: developer From 659faa9aaa0d2eb51926f85b1f2f715774929407 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Wed, 12 Dec 2018 16:31:36 +0100 Subject: [PATCH 3/6] added it back --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f361f236e..18351265c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,6 @@ script: deploy: provider: script script: find $HOME/miniconda/conda-bld/${TRAVIS_OS_NAME}-64 -name "*.tar.bz2" -exec anaconda -t $CONDA_TOKEN upload --force {} \; - # on: - # branch: developer + on: + branch: refactor From 2dd809390519a49862ebebc64314ff4a6e536aa2 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Mon, 17 Dec 2018 14:55:19 +0100 Subject: [PATCH 4/6] added project to CMakeLists and path for installing --- CMakeLists.txt | 3 +++ slsDetectorSoftware/CMakeLists.txt | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e9ef97eb..772a0ba6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,7 @@ cmake_minimum_required(VERSION 2.8) + +project(slsDetectorPackage LANGUAGES CXX) + set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) set (CALIBRATE OFF) diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt index 186f0828c..d3c2ca86e 100644 --- a/slsDetectorSoftware/CMakeLists.txt +++ b/slsDetectorSoftware/CMakeLists.txt @@ -36,20 +36,22 @@ target_link_libraries(slsDetectorShared zmq ) + + set(PUBLICHEADERS - ../slsSupportLib/include/sls_detector_defs.h - ../slsSupportLib/include/sls_detector_funcs.h - ../slsSupportLib/include/error_defs.h - ../slsSupportLib/include/versionAPI.h - ../slsSupportLib/include/sls_detector_exceptions.h - ../slsSupportLib/include/utilties.h - ../slsSupportLib/include/container_utils.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/sls_detector_defs.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/sls_detector_funcs.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/error_defs.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/versionAPI.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/sls_detector_exceptions.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/utilities.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/container_utils.h sharedMemory/SharedMemory.h slsDetector/slsDetector.h slsDetector/slsDetectorUsers.h slsDetector/detectorData.h multiSlsDetector/multiSlsDetector.h - ../slsSupportLib/include/ClientInterface.h + ${PROJECT_SOURCE_DIR}/slsSupportLib/include/ClientInterface.h ) set_target_properties(slsDetectorShared PROPERTIES LIBRARY_OUTPUT_NAME SlsDetector From f68321af4341a3563c2ddf9e68bc6b0fdaf37285 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Mon, 17 Dec 2018 15:05:22 +0100 Subject: [PATCH 5/6] disable GUI in conda build --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index ccaa0f3d1..443b0f60e 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -6,7 +6,7 @@ cmake .. \ -DCMAKE_INSTALL_PREFIX=install \ -DUSE_TEXTCLIENT=ON \ -DUSE_RECEIVER=ON \ - -DUSE_GUI=ON \ + -DUSE_GUI=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_HDF5=OFF\ From 7a432befa3759da8ed944b58b79a7238cae50442 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Mon, 17 Dec 2018 15:19:14 +0100 Subject: [PATCH 6/6] removed gui from meta.yaml --- recipe/meta.yaml | 58 ++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b21249157..5b117e216 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -58,32 +58,32 @@ outputs: build: - {{ compiler('c') }} - {{compiler('cxx')}} - - name: sls_detector_gui - version: "refactor" - script: copy_gui.sh - requirements: - build: - - {{ compiler('c') }} - - {{compiler('cxx')}} - - cmake - - qwt 6.* - - qt=4.8.7=7 - - zeromq=4.2.5=hfc679d8_5 - - pyzmq - - xorg-libx11 - - xorg-libice - - xorg-libxext - - xorg-libsm - - xorg-libxau - - xorg-libxrender - - xorg-libxfixes - - {{ cdt('mesa-libgl-devel') }} # [linux] - - {{ cdt('mesa-libegl-devel') }} # [linux] - - {{ cdt('mesa-dri-drivers') }} # [linux] - - {{ cdt('libselinux') }} # [linux] - - {{ cdt('libxdamage') }} # [linux] - - {{ cdt('libxxf86vm') }} # [linux] - run: - - sls_detector_lib=refactor - - qwt 6.* - - qt=4.8.7=7 + # - name: sls_detector_gui + # version: "refactor" + # script: copy_gui.sh + # requirements: + # build: + # - {{ compiler('c') }} + # - {{compiler('cxx')}} + # - cmake + # - qwt 6.* + # - qt=4.8.7=7 + # - zeromq=4.2.5=hfc679d8_5 + # - pyzmq + # - xorg-libx11 + # - xorg-libice + # - xorg-libxext + # - xorg-libsm + # - xorg-libxau + # - xorg-libxrender + # - xorg-libxfixes + # - {{ cdt('mesa-libgl-devel') }} # [linux] + # - {{ cdt('mesa-libegl-devel') }} # [linux] + # - {{ cdt('mesa-dri-drivers') }} # [linux] + # - {{ cdt('libselinux') }} # [linux] + # - {{ cdt('libxdamage') }} # [linux] + # - {{ cdt('libxxf86vm') }} # [linux] + # run: + # - sls_detector_lib=refactor + # - qwt 6.* + # - qt=4.8.7=7