From 4a0340087eb58572ea9cbd3de054ab6c19b16c1a Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Mon, 2 Sep 2019 10:19:11 +0200
Subject: [PATCH] fix path
---
deploy/docker_buildenv/Ubuntu16.04/Dockerfile | 3 +++
deploy/docker_buildenv/Ubuntu16.04/build.sh | 3 ++-
sphinx/source/conf.py | 4 ++--
worker/api/python/CMakeLists_Linux.cmake | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/deploy/docker_buildenv/Ubuntu16.04/Dockerfile b/deploy/docker_buildenv/Ubuntu16.04/Dockerfile
index 7cdc53109..45fe5432d 100644
--- a/deploy/docker_buildenv/Ubuntu16.04/Dockerfile
+++ b/deploy/docker_buildenv/Ubuntu16.04/Dockerfile
@@ -9,4 +9,7 @@ ADD install_curl.sh install_curl.sh
RUN ./install_curl.sh /curl
RUN apt install -y python-pip python3-pip && pip install --upgrade cython && pip3 install --upgrade cython
+RUN pip3 install sphinx
+
ADD build.sh /bin/build.sh
+
diff --git a/deploy/docker_buildenv/Ubuntu16.04/build.sh b/deploy/docker_buildenv/Ubuntu16.04/build.sh
index 48e7d972c..edebc5038 100755
--- a/deploy/docker_buildenv/Ubuntu16.04/build.sh
+++ b/deploy/docker_buildenv/Ubuntu16.04/build.sh
@@ -1,7 +1,8 @@
#!/usr/bin/env bash
cd /asapo/build
-cmake -DCMAKE_BUILD_TYPE="Release" -DLIBCURL_DIR=/curl ..
+cmake -DCMAKE_BUILD_TYPE="Release" -DLIBCURL_DIR=/curl -DBUILD_PYTHON_DOCS=ON ..
cd worker && make
cd ../producer && make
+cd ../sphinx && make
diff --git a/sphinx/source/conf.py b/sphinx/source/conf.py
index 8964c048c..7bcf43111 100644
--- a/sphinx/source/conf.py
+++ b/sphinx/source/conf.py
@@ -19,8 +19,8 @@
import os
import sys
-sys.path.insert(0, '/home/yakubov/projects/asapo/cmake-build-debug/worker/api/python')
-sys.path.insert(0, '/home/yakubov/projects/asapo/cmake-build-debug/producer/api/python')
+sys.path.insert(0, os.path.abspath('../../../worker/api/python'))
+sys.path.insert(0, os.path.abspath('../../../producer/api/python'))
import asapo_producer
diff --git a/worker/api/python/CMakeLists_Linux.cmake b/worker/api/python/CMakeLists_Linux.cmake
index ffe11d7ae..9c2d447fc 100644
--- a/worker/api/python/CMakeLists_Linux.cmake
+++ b/worker/api/python/CMakeLists_Linux.cmake
@@ -16,10 +16,10 @@ set (ASAPO_WORKER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cpp/include)
configure_files(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @ONLY)
ADD_CUSTOM_TARGET(python-lib2 ALL
- COMMAND python setup.py build_ext --inplace)
+ COMMAND python setup.py build_ext --inplace --force)
ADD_CUSTOM_TARGET(python-lib3 ALL
- COMMAND python3 setup.py build_ext --inplace)
+ COMMAND python3 setup.py build_ext --inplace --force)
ADD_DEPENDENCIES(python-lib2 asapo-worker)
ADD_DEPENDENCIES(python-lib3 asapo-worker)
--
GitLab