b13a2b27e9
"shared/nm-meta-setting.[hc]" contains meta data about settings. As such it is similarly used by libnm-core (as internal API) and by clients (as extension of public API of libnm). However, it must be compiled twice, because while it defines in both cases a NMMetaSettingInfo type, these types are different between internal and public API. Hence, the files must also be compiled twice (and differently), once against libnm-core and once against the client helper library. Previously, the file was under "shared/", but there it's a bit odd it doesn't clearly belong anywhere. There are two goals here: - copy the file to the two places where it is used. We also have a "check-tree" unit test that ensures those files don't diverge in the future. - we no longer require CFLAGS set during built. Instead, the sources should control the build. For that we have new (simple) headers "nm-meta-setting-base.h" that define the right behavior for the impl files. There is still an ugliness (among several): the files must be named the same for libnm-core and clients/common. Preferably, all our sources have unique names, but that is not possible with this scheme (without introducing other ugliness). To mitigate that, include the files only at one exact place.
25 lines
549 B
Bash
Executable File
25 lines
549 B
Bash
Executable File
#!/bin/bash
|
|
|
|
set -e
|
|
|
|
TOP_DIR="$(dirname "$0")/.."
|
|
|
|
die() {
|
|
printf 'FAIL: %s\n' "$*" >&2
|
|
exit 1
|
|
}
|
|
|
|
check_cmp() {
|
|
local a="$1"
|
|
local b="$2"
|
|
|
|
cmp "$TOP_DIR/$a" "$TOP_DIR/$b" && return 0
|
|
|
|
diff "$TOP_DIR/$a" "$TOP_DIR/$b" || :
|
|
die "files \"$a\" and \"$b\" differ!"
|
|
}
|
|
|
|
check_cmp shared/nm-base/nm-ethtool-utils-base.h libnm/nm-ethtool-utils.h
|
|
check_cmp libnm-core/nm-meta-setting-base-impl.h clients/common/nm-meta-setting-base-impl.h
|
|
check_cmp libnm-core/nm-meta-setting-base-impl.c clients/common/nm-meta-setting-base-impl.c
|