[med-svn] [Git][med-team/fast][master] 2 commits: Enable documentation generation

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / fast


Commits:
e6e81103 by Shayan Doust at 2019-08-10T13:51:06Z
Enable documentation generation

- - - - -
cd08624c by Shayan Doust at 2019-08-10T16:53:39Z
Shift some directories around
More work needed to shift necessary folders out of debian/fast/usr/fast then erradicate this folder

- - - - -


3 changed files:

- debian/patches/disable_tests.patch
- debian/patches/remove_unneeded_installs.patch
- debian/rules


Changes:

=====================================
debian/patches/disable_tests.patch
=====================================
@@ -6,9 +6,9 @@ Last-Update: 2019-08-08
 
 Index: fast/CMakeLists.txt
 ===================================================================
---- fast.orig/CMakeLists.txt	2019-08-08 15:28:56.276921985 +0100
-+++ fast/CMakeLists.txt	2019-08-08 15:28:56.276921985 +0100
-@@ -15,8 +15,8 @@
+--- fast.orig/CMakeLists.txt	2019-08-10 14:20:17.677955087 +0100
++++ fast/CMakeLists.txt	2019-08-10 14:20:57.230344471 +0100
+@@ -15,10 +15,10 @@
  include(cmake/Macros.cmake)
  
  #### Options
@@ -17,5 +17,8 @@ Index: fast/CMakeLists.txt
 +option(FAST_BUILD_TESTS "Build FAST tests." OFF)
 +option(FAST_BUILD_EXAMPLES "Build examples." ON)
  option(FAST_BUILD_TOOLS "Build tools." ON)
- option(FAST_BUILD_DOCS "Build API documentation" OFF)
+-option(FAST_BUILD_DOCS "Build API documentation" OFF)
++option(FAST_BUILD_DOCS "Build API documentation" ON)
  option(FAST_DOWNLOAD_TEST_DATA "Download test data automatically (> 1 GB)" OFF)
+ option(FAST_MODULE_VTK "Enable interoperability with VTK" OFF)
+ option(FAST_MODULE_ITK "Enable interoperability with ITK" OFF)


=====================================
debian/patches/remove_unneeded_installs.patch
=====================================
@@ -6,8 +6,8 @@ Last-Update: 2019-08-08
 
 Index: fast/cmake/InstallFAST.cmake
 ===================================================================
---- fast.orig/cmake/InstallFAST.cmake	2019-08-09 09:06:29.024662695 +0100
-+++ fast/cmake/InstallFAST.cmake	2019-08-09 09:07:15.965048539 +0100
+--- fast.orig/cmake/InstallFAST.cmake	2019-08-10 14:33:29.761600902 +0100
++++ fast/cmake/InstallFAST.cmake	2019-08-10 14:33:57.401871110 +0100
 @@ -47,9 +47,9 @@
  endif()
  
@@ -36,8 +36,18 @@ Index: fast/cmake/InstallFAST.cmake
  
  
  
-@@ -185,30 +185,30 @@
- )
+@@ -179,36 +179,36 @@
+ 
+ # Install license files for depedencies
+ # Qt5
+-file(GLOB LICENSE_FILES ${FAST_EXTERNAL_BUILD_DIR}/qt5/src/qt5/LICENSE.*)
+-install(FILES ${LICENSE_FILES}
+-		DESTINATION fast/licenses/qt5/
+-)
++#file(GLOB LICENSE_FILES ${FAST_EXTERNAL_BUILD_DIR}/qt5/src/qt5/LICENSE.*)
++#install(FILES ${LICENSE_FILES}
++#		DESTINATION fast/licenses/qt5/
++#)
  
  # Eigen
 -file(GLOB LICENSE_FILES ${FAST_EXTERNAL_BUILD_DIR}/eigen/src/eigen/COPYING.*)
@@ -86,3 +96,17 @@ Index: fast/cmake/InstallFAST.cmake
  
  if(FAST_MODULE_TensorFlow)
      # Tensorflow license
+@@ -217,8 +217,8 @@
+     )
+ endif()
+ 
+-if(FAST_BUILD_DOCS)
+-	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
+-        DESTINATION fast/doc
+-    )
+-endif()
++#if(FAST_BUILD_DOCS)
++#	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
++#       DESTINATION fast/doc
++#   )
++#endif()


=====================================
debian/rules
=====================================
@@ -16,3 +16,7 @@ override_dh_shlibdeps:
 override_dh_auto_install:
 	dh_auto_install
 	find debian/fast -empty -type d -delete
+	mkdir debian/fast/usr/lib debian/fast/usr/lib/fast
+	mv debian/fast/usr/fast/include debian/fast/usr
+	mv debian/fast/usr/fast/lib/* debian/fast/usr/lib/fast
+	



View it on GitLab: https://salsa.debian.org/med-team/fast/compare/7664684391eac0822d9703a86b4fea5b3eebf362...cd08624cf74f5573d5114ec78aae367a85ca2d78

-- 
View it on GitLab: https://salsa.debian.org/med-team/fast/compare/7664684391eac0822d9703a86b4fea5b3eebf362...cd08624cf74f5573d5114ec78aae367a85ca2d78
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/20190810/afc253a2/attachment-0001.html>