mirror of
https://github.com/servalproject/serval-dna.git
synced 2024-12-18 20:57:56 +00:00
71cbe86566
This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
129 lines
3.7 KiB
Bash
129 lines
3.7 KiB
Bash
# Definitions for test suites using Java.
|
|
# Copyright 2014 Serval Project Inc.
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License
|
|
# as published by the Free Software Foundation; either version 2
|
|
# of the License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
source "${0%/*}/../testconfig.sh"
|
|
|
|
# Utility function for setting up servald JNI fixtures:
|
|
# - check that libservald.so is present
|
|
# - set LD_LIBRARY_PATH so that libservald.so can be found
|
|
setup_servald_so() {
|
|
assert [ -r "$servald_build_root/libservald.so" ]
|
|
export LD_LIBRARY_PATH="$servald_build_root"
|
|
}
|
|
|
|
compile_java_classes() {
|
|
assert --message='Java compiler was detected by ./configure' type -p "$JAVAC" >/dev/null
|
|
mkdir classes
|
|
assert find "$servald_source_root"/java* -name *.java | xargs $JAVAC -Xlint:unchecked -d classes
|
|
assert [ -r classes/org/servalproject/servaldna/ServalDCommand.class ]
|
|
assert [ -r classes/org/servalproject/servaldna/IJniResults.class ]
|
|
assert [ -r classes/org/servalproject/test/ServalDTests.class ]
|
|
}
|
|
|
|
_executeJava() {
|
|
local func="${1?}"
|
|
shift
|
|
local opts=()
|
|
while [ $# -ne 0 ]; do
|
|
case "$1" in
|
|
--) shift; break;;
|
|
--*) opts+=("$1"); shift;;
|
|
*) break;;
|
|
esac
|
|
done
|
|
"$func" "${opts[@]}" java "-Djava.library.path=$LD_LIBRARY_PATH" -classpath "$PWD/classes" "$@"
|
|
}
|
|
|
|
_run() {
|
|
tfw_log "$@"
|
|
"$@"
|
|
}
|
|
|
|
runJava() {
|
|
_executeJava _run "$@"
|
|
}
|
|
|
|
executeJava() {
|
|
_executeJava execute --core-backtrace "$@"
|
|
}
|
|
|
|
executeJavaOk() {
|
|
_executeJava executeOk --core-backtrace "$@"
|
|
}
|
|
|
|
# Utility function:
|
|
#
|
|
# unset_vars_with_prefix PREFIX
|
|
#
|
|
# Unsets all shell variables whose names starting with the given PREFIX
|
|
unset_vars_with_prefix() {
|
|
local __prefix="${1?}"
|
|
local __varname
|
|
for __varname in $(declare -p | sed -n -e "s/^declare -[^ ]* \($__prefix[A-Za-z0-9_]\+\)=.*/\1/p"); do
|
|
unset $__varname
|
|
done
|
|
}
|
|
|
|
# Utility function:
|
|
#
|
|
# unpack_vars PREFIX TEXT
|
|
#
|
|
# parses the given TEXT which must have the form:
|
|
#
|
|
# ident1=..., ident2=...., ... identN=...
|
|
#
|
|
# into shell variables:
|
|
#
|
|
# PREFIXident1=...
|
|
# PREFIXident2=...
|
|
# ...
|
|
# PREFIXidentN=...
|
|
#
|
|
# Sets the UNPACKED_VAR_NAMES[] array variable to a list of the names of the
|
|
# variables that were set (names include the PREFIX).
|
|
#
|
|
# Warning: overwrites existing shell variables. Names of overwritten shell
|
|
# variables are derived directly from the output of the command, so cannot be
|
|
# controlled. PREFIX should be used to ensure that special variables cannot
|
|
# be clobbered by accident.
|
|
unpack_vars() {
|
|
local __prefix="${1?}"
|
|
local __text="${2?}"
|
|
local __oo
|
|
tfw_shopt __oo -s extglob
|
|
UNPACKED_VAR_NAMES=()
|
|
while [ -n "$__text" ]; do
|
|
case "$__text" in
|
|
[A-Za-z_.]+([A-Za-z_.0-9])=*)
|
|
local __ident="${__text%%=*}"
|
|
__ident="${__ident//./__}"
|
|
__text="${__text#*=}"
|
|
local __value="${__text%%, [A-Za-z_.]+([A-Za-z_.0-9])=*}"
|
|
__text="${__text:${#__value}}"
|
|
__text="${__text#, }"
|
|
UNPACKED_VAR_NAMES+=("$__ident")
|
|
eval ${__prefix}${__ident}=\"\$__value\"
|
|
;;
|
|
*)
|
|
fail "cannot unpack variable from '$__text'"
|
|
;;
|
|
esac
|
|
done
|
|
tfw_shopt_restore __oo
|
|
}
|
|
|