[med-svn] [Git][med-team/fast][master] Attempt to doc as assets for testing and examples

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / fast


Commits:
2c3406d8 by Shayan Doust at 2019-08-30T19:34:27Z
Attempt to doc as assets for testing and examples
Advise for a better location than /usr/share/doc/FAST

- - - - -


4 changed files:

- debian/patches/fast_opencl_header_dir_move.patch
- + debian/patches/modify_assets_location.patch
- debian/patches/modify_libs_and_output.patch
- debian/patches/series


Changes:

=====================================
debian/patches/fast_opencl_header_dir_move.patch
=====================================
@@ -6,7 +6,7 @@ Last-Update: 2019-08-19
 
 Index: fast/source/CL/OpenCL.hpp
 ===================================================================
---- fast.orig/source/CL/OpenCL.hpp	2019-08-19 23:55:24.000000000 +0100
+--- fast.orig/source/CL/OpenCL.hpp	2019-08-30 20:00:23.966847547 +0100
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,13 +0,0 @@
 -#ifndef OPENCL_HPP_
@@ -25,7 +25,7 @@ Index: fast/source/CL/OpenCL.hpp
 Index: fast/source/FAST/OpenCL.hpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ fast/source/FAST/OpenCL.hpp	2019-08-19 23:55:24.000000000 +0100
++++ fast/source/FAST/OpenCL.hpp	2019-08-30 20:00:23.962847562 +0100
 @@ -0,0 +1,13 @@
 +#ifndef OPENCL_HPP_
 +#define OPENCL_HPP_


=====================================
debian/patches/modify_assets_location.patch
=====================================
@@ -0,0 +1,13 @@
+Index: fast/source/FAST/Config.cpp
+===================================================================
+--- fast.orig/source/FAST/Config.cpp	2019-08-30 18:00:33.000000000 +0100
++++ fast/source/FAST/Config.cpp	2019-08-30 20:08:05.737080879 +0100
+@@ -78,7 +78,7 @@
+ 			mTestDataPath = getPath() + "../data/";
+ 			mKernelSourcePath = getPath() + "../source/FAST/";
+ 			mKernelBinaryPath = getPath() + "kernel_binaries/";
+-			mDocumentationPath = getPath() + "../doc/";
++			mDocumentationPath = getPath() + "../share/doc/FAST/assets";
+ 			mPipelinePath = getPath() + "../pipelines/";
+ #ifdef WIN32
+             mLibraryPath = getPath() + "/bin/";


=====================================
debian/patches/modify_libs_and_output.patch
=====================================
@@ -5,8 +5,8 @@ Author: Shayan Doust <hello at shayandoust.me>
 
 Index: fast/CMakeLists.txt
 ===================================================================
---- fast.orig/CMakeLists.txt	2019-08-21 04:18:49.220804478 +0100
-+++ fast/CMakeLists.txt	2019-08-21 04:19:26.697111063 +0100
+--- fast.orig/CMakeLists.txt	2019-08-30 20:05:17.209725641 +0100
++++ fast/CMakeLists.txt	2019-08-30 20:05:54.753582003 +0100
 @@ -34,7 +34,7 @@
  option(FAST_MODULE_WholeSlideImaging "Build whole slide imaging module" OFF)
  option(FAST_MODULE_Clarius "Build clarius ultrasound module" OFF)
@@ -56,12 +56,15 @@ Index: fast/CMakeLists.txt
  ## Build test executable
  if(FAST_BUILD_TESTS)
      add_executable(testFAST ${FAST_TEST_SOURCE_FILES} source/FAST/Algorithms/CoherentPointDrift/Rigid.cpp source/FAST/Algorithms/CoherentPointDrift/Rigid.hpp source/FAST/Algorithms/CoherentPointDrift/Affine.cpp source/FAST/Algorithms/CoherentPointDrift/Affine.hpp)
-@@ -243,5 +264,8 @@
+@@ -242,6 +263,11 @@
+     # dlls automatically to the bin folder. 
      include(cmake/FASTCustomCommands.cmake)
  endif(NOT FAST_BUILD_QT5 AND WIN32)
- 
++execute_process(COMMAND mkdir -p share/doc/FAST/assets)
++execute_process(COMMAND cp -r ../doc/fonts share/doc/FAST/assets)
++execute_process(COMMAND cp -r ../doc/images share/doc/FAST/assets)
 +install(TARGETS FAST-STATIC DESTINATION .)
 +install(TARGETS FAST DESTINATION .)
-+
+ 
  include(cmake/ModulePython.cmake)
  include(cmake/InstallFAST.cmake)


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
+modify_assets_location.patch
 opencl_header.patch
 fix_source_openigtlink.patch
 prevent_cmake_downloading.patch



View it on GitLab: https://salsa.debian.org/med-team/fast/commit/2c3406d877d048085d792e92ba6524129b63ee9a

-- 
View it on GitLab: https://salsa.debian.org/med-team/fast/commit/2c3406d877d048085d792e92ba6524129b63ee9a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190830/2ba1e03a/attachment-0001.html>