[med-svn] [Git][med-team/camitk][master] Providing the paths to the JDK shared libs for build-time tests

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Med / camitk


Commits:
88f47720 by Pierre Gruet at 2023-02-10T20:46:15+01:00
Providing the paths to the JDK shared libs for build-time tests

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -5,6 +5,10 @@ camitk (5.0.2-5) UNRELEASED; urgency=medium
     Closes: #1013153
   * Standards-Version: 4.6.2
 
+  [ Pierre Gruet ]
+  * Providing the directories of needed JDK shared libs in LD_LIBRARY_PATH
+    for the build-time tests
+
   [ Emmanuel Promayon ]
   * VTK9 compat, disabling dicom component for now
 


=====================================
debian/rules
=====================================
@@ -4,6 +4,8 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+export JAVA_HOME=/usr/lib/jvm/default-java
+
 # CamiTK version from d/changelog)
 include /usr/share/dpkg/pkg-info.mk
 FULL_VERSION := $(shell echo '$(DEB_VERSION)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//')
@@ -79,7 +81,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# to know about all camitk extension directories and properly manage inner-dependencies
 	# between extensions (i.e., mml component extension depends on physicalmodel component extensions)
 	# Lib dependencies can be in any extensions (viewers, component and action extensions) lib directory
-	export LD_LIBRARY_PATH=$(LIB_BUILD_DIR)/:$(PRIVATE_LIB_BUILD_DIR)/viewers/:$(PRIVATE_LIB_BUILD_DIR)/components/:$(PRIVATE_LIB_BUILD_DIR)/actions/:$(PRIVATE_LIB_BUILD_DIR)/ ; \
+	export LD_LIBRARY_PATH=$(LIB_BUILD_DIR)/:$(PRIVATE_LIB_BUILD_DIR)/viewers/:$(PRIVATE_LIB_BUILD_DIR)/components/:$(PRIVATE_LIB_BUILD_DIR)/actions/:$(PRIVATE_LIB_BUILD_DIR)/:$(JAVA_HOME)/lib/:$(JAVA_HOME)/lib/server/ ; \
 	(cd camitk-build && xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" ctest -V --timeout 1800)
 endif
 



View it on GitLab: https://salsa.debian.org/med-team/camitk/-/commit/88f47720f203d12bece9d8822d7fea1fd677edcc

-- 
View it on GitLab: https://salsa.debian.org/med-team/camitk/-/commit/88f47720f203d12bece9d8822d7fea1fd677edcc
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/20230210/9ca096fb/attachment-0001.htm>