[med-svn] [Git][med-team/camitk][upstream-ci/master] Preparing new version
Emmanuel Promayon
gitlab at salsa.debian.org
Mon Jul 6 15:51:15 BST 2020
Emmanuel Promayon pushed to branch upstream-ci/master at Debian Med / camitk
Commits:
59b2d4aa by Emmanuel Promayon at 2020-07-06T16:47:40+02:00
Preparing new version
- update bash test using latest version
- update metadata according to lintian info
- update rules to try to fix a lintian warning on 4.1.2 in debian ci
- - - - -
5 changed files:
- debian/rules
- debian/tests/cepgenerator-test.sh
- debian/tests/config-test.sh
- debian/tests/generate-coreschema-files.sh
- debian/upstream/metadata
Changes:
=====================================
debian/rules
=====================================
@@ -3,7 +3,6 @@
# DH_VERBOSE := 1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
# CamiTK version from d/changelog)
include /usr/share/dpkg/pkg-info.mk
@@ -22,27 +21,12 @@ pkg_data = libcamitk$(VER_MAJOR)-data
pkg_doc = libcamitk$(VER_MAJOR)-doc
pkg_imp = camitk-imp
pkg_asm = camitk-actionstatemachine
-
-# multi-arch support
-include /usr/share/dpkg/architecture.mk
-
-# dpkg-shlibdeps needs to know about camitk extension directories to manage inner-dependencies
-# between extensions (i.e., mml component extension depends on physicalmodel component extensions)
PKG_LIB_DIR := $(CURDIR)/debian/${pkg_lib}/usr/lib/camitk-${VER_SHORT}
-# for viewer extensions:
-LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(PKG_LIB_DIR)/viewers/
-# for component extensions:
-LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(PKG_LIB_DIR)/components/
-# for action extensions:
-LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(PKG_LIB_DIR)/actions/
-# for private libraries:
-LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(PKG_LIB_DIR)/
-# during test, the build dir path is also needed
LIB_BUILD_DIR := $(CURDIR)/camitk-build/lib
PRIVATE_LIB_BUILD_DIR := $(LIB_BUILD_DIR)/camitk-${VER_SHORT}
-LD_LIBRARY_PATH := $(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 for all d/rules subshell (test and dpkg-shlibdeps included)
-export LD_LIBRARY_PATH
+
+# multi-arch support
+include /usr/share/dpkg/architecture.mk
# CMake flags are of two types:
# - generic (to tell cmake to build proper binaries)
@@ -172,6 +156,15 @@ override_dh_install:
dh_install -p$(pkg_asm) --autodest debian/tmp/usr/share/pixmaps/camitk-actionstatemachine.xpm
dh_installman -p$(pkg_asm) debian/tmp/usr/share/man/man1/camitk-actionstatemachine.1
+# dpkg-shlibdeps needs to know about camitk extension directories to 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)
+# - any private libraries:
+# during test, the build dir path is also needed (for extensions, public and private libraries)
+override_dh_shlibdeps:
+ dh_shlibdeps -l$(PKG_LIB_DIR)/viewers/:$(PKG_LIB_DIR)/components/:$(PKG_LIB_DIR)/actions/:$(PKG_LIB_DIR)/:$(LIB_BUILD_DIR)/:$(PRIVATE_LIB_BUILD_DIR)/viewers/:$(PRIVATE_LIB_BUILD_DIR)/components/:$(PRIVATE_LIB_BUILD_DIR)/actions/:$(PRIVATE_LIB_BUILD_DIR)/
+
# see http://lists.debian.org/debian-mentors/2012/07/msg00124.html
get-orig-source:
mkdir -p ../tarballs
=====================================
debian/tests/cepgenerator-test.sh
=====================================
@@ -246,8 +246,10 @@ generateConfigureAndMake() {
cd build
echo "===== configuring... ====="
if [[ "$osName" == "Windows" ]]; then
- # no virtual X11 -DCMAKE_C_FLAGS:STRING="/MP" -DCMAKE_CXX_FLAGS="/MP"
- cmake $CMAKE_OPTIONS -Wno-dev -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE:STRING=Debug ../$srcDirName > ../cmake-log 2> ../cmake-error
+ # use the currently supported visual studio version (64 bit) with the Debug config
+ #cmake $CMAKE_OPTIONS -Wno-dev -G "Visual Studio 16 2019" -A x64 --config Debug ../$srcDirName > ../cmake-log 2> ../cmake-error
+ # choose the default msvc version and config from current install
+ cmake $CMAKE_OPTIONS -Wno-dev --config Debug ../$srcDirName > ../cmake-log 2> ../cmake-error
else
cmake $CMAKE_OPTIONS ../$srcDirName > ../cmake-log 2> ../cmake-error
fi
@@ -262,7 +264,7 @@ generateConfigureAndMake() {
echo "===== building... ====="
if [[ "$osName" == "Windows" ]]; then
- cmake --build . --config Debug > ../make-log 2> ../make-error
+ cmake --build . --config Debug --parallel 9 > ../make-log 2> ../make-error
else
# build (parallel)
make -j9 > ../make-log 2> ../make-error
@@ -325,5 +327,6 @@ testcepfile actionsExamplesLicence.xml 2
testcepfile actionsExamplesNoLicence.xml 2
testcepfile actionAndComponent.xml 2
testcepfile empty.xml 0
+testcepfile viewerExample.xml 2
exit $exitStatus
=====================================
debian/tests/config-test.sh
=====================================
@@ -21,14 +21,23 @@ set -e
# ---------------------- initTestData ----------------------
# values to check
initTestData() {
- # fill test data
- extensionCount=( [4.2]=41 [4.1]=41 [4.0]=31 )
- componentExtensionCount=( [4.2]=14 [4.1]=14 [4.0]=14 )
- actionExtensionCount=( [4.2]=27 [4.1]=27 [4.0]=27 )
- fileExtensionCount=( [4.2]=37 [4.1]=37 [4.0]=37 )
- actionCount=( [4.2]=105 [4.1]=105 [4.0]=105 )
+ #-- fill test data arrays
- # fill release date
+ # Number of component, action and viewer extensions
+ componentExtensionCount=( [4.2]=14 [4.1]=14 [4.0]=14 )
+ actionExtensionCount=( [4.2]=30 [4.1]=27 [4.0]=27 )
+ viewerExtensionCount=( [4.2]=10 )
+
+ # Number of different file format/extension manages by the component extensions
+ fileExtensionCount=( [4.2]=37 [4.1]=37 [4.0]=37 )
+
+ # Number of actions provided by the action extensions
+ actionCount=( [4.2]=108 [4.1]=105 [4.0]=105 )
+
+ # Number of viewers managed by the viewer extensions
+ viewerCount=( [4.2]=13 )
+
+ #-- Release date
releaseDate=( [4.2]="not yet released, current development version" \
[4.1]="15 July 2018" \
[4.0]="22 July 2016" \
@@ -38,7 +47,12 @@ initTestData() {
[3.2]="26 June 2013" \
[3.1]="1 March 2013" \
[3.0]="7 July 2012" )
-
+
+ #-- extensionCount is just the sum of all three extension counts
+ extensionCount=( [4.2]=$((componentExtensionCount[4.2] + actionExtensionCount[4.2] + viewerExtensionCount[4.2]))
+ [4.1]=$((componentExtensionCount[4.1] + actionExtensionCount[4.1]))
+ [4.0]=$((componentExtensionCount[4.0] + actionExtensionCount[4.0])) )
+
}
# ---------------------- declareTestData ----------------------
@@ -48,8 +62,10 @@ declareTestData() {
declare -Ag extensionCount
declare -Ag componentExtensionCount
declare -Ag actionExtensionCount
+ declare -Ag viewerExtensionCount
declare -Ag fileExtensionCount
declare -Ag actionCount
+ declare -Ag viewerCount
declare -Ag releaseDate
}
@@ -171,16 +187,22 @@ getExpectedValue() {
;;
"Number of Component Extensions")
echo ${componentExtensionCount[$shortVersion]}
- ;;
+ ;;
"Number of Action Extensions")
echo ${actionExtensionCount[$shortVersion]}
- ;;
+ ;;
+ "Number of Viewer Extensions")
+ echo ${viewerExtensionCount[$shortVersion]}
+ ;;
"Number of File Extensions Supported")
echo ${fileExtensionCount[$shortVersion]}
- ;;
+ ;;
"Number of Actions")
echo ${actionCount[$shortVersion]}
- ;;
+ ;;
+ "Number of Viewers")
+ echo ${viewerCount[$shortVersion]}
+ ;;
esac
}
@@ -284,7 +306,9 @@ else
fi
checkValue "Number of Component Extensions"
checkValue "Number of Action Extensions"
+checkValue "Number of Viewer Extensions"
checkValue "Number of File Extensions Supported"
checkValue "Number of Actions"
+checkValue "Number of Viewers"
exit $exitStatus
=====================================
debian/tests/generate-coreschema-files.sh
=====================================
@@ -529,3 +529,46 @@ $USERDEF_LICENCE_END$
</libraries>
</cep>
EOF
+
+
+# ---------------------- viewerExample.xml ----------------------
+# Example taken from distributed source ./sdk/libraries/cepcoreschema/testdata/viewerExample.xml
+cat <<EOF > viewerExample.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<cep xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://camitk.imag.fr/cepcoreschema"
+ xsi:schemaLocation="http://camitk.imag.fr/cepcoreschema ../cep.xsd">
+ <name>Test Viewer CEP</name>
+ <contact>
+ <email>Emmanuel.Promayon at univ-grenoble-alpes.fr</email>
+ </contact>
+ <description>Example of a CEP with two viewer extensions</description>
+ <viewerExtensions>
+ <viewerExtension>
+ <name>Test Viewer 1</name>
+ <description>This viewer extension manages a default viewer</description>
+ <registerDefaultViewer/>
+ <viewer>
+ <name>Test Viewer 1</name>
+ <description>Example of simple embedded viewer</description>
+ <type>EMBEDDED</type>
+ <component>MeshComponent</component>
+ <component>ImageComponent</component>
+ </viewer>
+ </viewerExtension>
+
+ <viewerExtension>
+ <name>Test Viewer 2</name>
+ <description>This viewer extension manages three named viewer</description>
+ <registerNewViewer>First Test Viewer</registerNewViewer>
+ <registerNewViewer>Second Test Viewer</registerNewViewer>
+ <viewer>
+ <name>Test Viewer 2</name>
+ <description>Example of simple docked viewer</description>
+ <type>DOCKED</type>
+ <component>Component</component>
+ </viewer>
+ </viewerExtension>
+ </viewerExtensions>
+</cep>
+EOF
=====================================
debian/upstream/metadata
=====================================
@@ -1,3 +1,5 @@
+Bug-Submit: https://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/issues/new?issue%5Bassignee_id%5D=&issue%5Bmilestone_id%5D=
+Name: CamiTK Community Edition
Reference:
- Author: >
Céline Fouard and Aurélien Deram and Yannick Keraval and Emmanuel Promayon
@@ -11,3 +13,6 @@ Reference:
DOI: 10.1007/8415_2012_118
URL: http://membres-timc.imag.fr/Emmanuel.Promayon/publications//FDK+12.php
Type: InBook
+Repository: https://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK.git
+Repository-Browse: https://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK
+Bug-Database: https://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/issues
View it on GitLab: https://salsa.debian.org/med-team/camitk/-/commit/59b2d4aa27e8609399529729702c4b4414e28462
--
View it on GitLab: https://salsa.debian.org/med-team/camitk/-/commit/59b2d4aa27e8609399529729702c4b4414e28462
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/20200706/f2b07310/attachment-0001.html>
More information about the debian-med-commit
mailing list