[med-svn] [Git][med-team/fast][master] 2 commits: Fix pathing with the new asset location

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / fast


Commits:
0055b4c0 by Shayan Doust at 2019-08-31T02:51:40Z
Fix pathing with the new asset location

- - - - -
b2cb5556 by Shayan Doust at 2019-08-31T02:53:53Z
Use lowercase "FAST"

- - - - -


3 changed files:

- debian/libfast-data.install
- debian/patches/modify_assets_location.patch
- debian/patches/modify_libs_and_output.patch


Changes:

=====================================
debian/libfast-data.install
=====================================
@@ -1 +1,3 @@
 debian/missing-sources/FAST_Test_Data.xz usr/lib/fast
+doc/fonts usr/share/doc/fast/assets
+doc/images usr/share/doc/fast/assets


=====================================
debian/patches/modify_assets_location.patch
=====================================
@@ -1,13 +1,22 @@
 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
+--- fast.orig/source/FAST/Config.cpp	2019-08-31 03:52:37.422447649 +0100
++++ fast/source/FAST/Config.cpp	2019-08-31 03:53:13.398310010 +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";
++			mDocumentationPath = getPath() + "../usr/share/doc/fast/assets/";
  			mPipelinePath = getPath() + "../pipelines/";
  #ifdef WIN32
              mLibraryPath = getPath() + "/bin/";
+@@ -199,7 +199,7 @@
+ 			mTestDataPath = getPath() + "../data/";
+ 			mKernelSourcePath = getPath() + "../source/FAST/";
+ 			mKernelBinaryPath = getPath() + "kernel_binaries/";
+-			mDocumentationPath = getPath() + "../doc/";
++			mDocumentationPath = getPath() + "../usr/share/doc/fast/assets/";
+ 			mPipelinePath = getPath() + "../pipelines/";
+ 			loadConfiguration();
+ 		}


=====================================
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-30 20:05:17.209725641 +0100
-+++ fast/CMakeLists.txt	2019-08-30 20:05:54.753582003 +0100
+--- fast.orig/CMakeLists.txt	2019-08-31 03:53:21.358279557 +0100
++++ fast/CMakeLists.txt	2019-08-31 03:53:45.362187721 +0100
 @@ -34,7 +34,7 @@
  option(FAST_MODULE_WholeSlideImaging "Build whole slide imaging module" OFF)
  option(FAST_MODULE_Clarius "Build clarius ultrasound module" OFF)
@@ -60,9 +60,9 @@ Index: fast/CMakeLists.txt
      # 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)
++execute_process(COMMAND mkdir -p usr/share/doc/fast/assets)
++execute_process(COMMAND cp -r ../doc/fonts usr/share/doc/fast/assets)
++execute_process(COMMAND cp -r ../doc/images usr/share/doc/fast/assets)
 +install(TARGETS FAST-STATIC DESTINATION .)
 +install(TARGETS FAST DESTINATION .)
  



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

-- 
View it on GitLab: https://salsa.debian.org/med-team/fast/compare/2c3406d877d048085d792e92ba6524129b63ee9a...b2cb5556721f48f9d99c629bf6c203e35421222f
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/20190831/f6bfef8b/attachment-0001.html>