mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

ci: Improve the support for cross-build verifications

Browse Source 
Introduce CI_TARGET_TRIPLET and CI_TARGET_ABI.

Rename CI_HOST_MACHINE and CI_TARGET_MACHINE, respectively, to
CI_HOST_ARCH and CI_TARGET_ARCH, following on the conventional
target triplet nomenclature.

Introduce CI_BUILD_SYSTEM and CI_BUILD_ARCH, following on the
GNU Autotools (host/build/target) practice and nomenclature.

Ensure that CI_TARGET_SYSTEM, CI_TARGET_ARCH and CI_TARGET_ABI
are all initialized when verifying a cross-platform build.

Work around an obscure CMake error by ensuring that CMake variables
(CMAKE_AR and CMAKE_RANLIB) are initialized to the full executable
paths of their CI_* equivalents (CI_AR and CI_RANLIB).

Implement other general-purpose improvements:
 * Check all CI_NO_* variables in an arithmetic context, to allow
   setting them explicitly to zero in external configurations.
 * Label the assertions with descriptions of what's being asserted.
 * Add more comments and tracing printouts.
This commit is contained in:
Cosmin Truta
2023-07-30 17:07:25 +03:00
parent f8e5fa92b0
commit ee9d6d7bf2
4 changed files with 122 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ci/lib/ci.lib.sh
View File

@@ -25,11 +25,23 @@ CI_SCRIPT_NAME="$(basename -- "$0")"
CI_SCRIPT_DIR="$(cd "$(dirname -- "$0")" && pwd)"
CI_TOPLEVEL_DIR="$(cd "$(dirname -- "${BASH_SOURCE[0]}")/../.." && pwd)"
# Initialize the global constants CI_{HOST,TARGET}_{SYSTEM,MACHINE}.
CI_HOST_SYSTEM="${CI_HOST_SYSTEM:-"$(uname -s | tr 'A-Z/\.-' 'a-z____')"}"
CI_HOST_MACHINE="${CI_HOST_MACHINE:-"$(uname -m | tr 'A-Z/\.-' 'a-z____')"}"
CI_TARGET_SYSTEM="${CI_TARGET_SYSTEM:-"$CI_HOST_SYSTEM"}"
CI_TARGET_MACHINE="${CI_TARGET_MACHINE:-"$CI_HOST_MACHINE"}"
# Initialize the global constants CI_BUILD_{...} for the host build platform.
CI_BUILD_ARCH="${CI_BUILD_ARCH:-"$(uname -m | tr 'A-Z/\.-' 'a-z____')"}"
CI_BUILD_SYSTEM="${CI_BUILD_SYSTEM:-"$(uname -s | tr 'A-Z/\.-' 'a-z____')"}"
# Initialize the global constants CI_TARGET_{...} for the target platform.
if [[ $CI_TARGET_ARCH && $CI_TARGET_SYSTEM && $CI_TARGET_ABI ]]
then
CI_TARGET_TRIPLET="${CI_TARGET_TRIPLET:-$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI}"
elif [[ $CI_TARGET_TRIPLET ]]
then
CI_TARGET_ARCH="${CI_TARGET_ARCH:-${CI_TARGET_TRIPLET%%-*}}"
CI_TARGET_DOUBLET_IMPL="${CI_TARGET_TRIPLET#*-}"
CI_TARGET_SYSTEM="${CI_TARGET_SYSTEM:-${CI_TARGET_DOUBLET_IMPL%%-*}}"
CI_TARGET_ABI="${CI_TARGET_ABI:-${CI_TARGET_DOUBLET_IMPL#*-}}"
fi
CI_TARGET_ARCH="${CI_TARGET_ARCH:-"$CI_BUILD_ARCH"}"
CI_TARGET_SYSTEM="${CI_TARGET_SYSTEM:-"$CI_BUILD_SYSTEM"}"
function ci_info {
printf >&2 "%s: %s\\n" "$CI_SCRIPT_NAME" "$*"
@@ -55,7 +67,12 @@ function ci_assert {
# Use the "test" built-in command instead of the "[[ ]]" syntax,
# to ensure the a-priori expansion of all assertion arguments.
# (Consistently, both "ci_assert" and "test" have a command-like behavior.)
test "$@" || ci_err_internal "failed:" test "$@"
[[ $# -ge 2 ]] ||
ci_err_internal "failed: ci_assert: bad or missing operands"
local label="$1"
shift
test "$@" ||
ci_err_internal "failed: $label:" test "$@"
}
function ci_spawn {
@@ -66,7 +83,20 @@ function ci_spawn {
}
# Ensure that the initialization is correct.
ci_assert "$CI_TOPLEVEL_DIR/ci/lib/ci.lib.sh" -ef "${BASH_SOURCE[0]}"
ci_assert "$CI_SCRIPT_DIR/$CI_SCRIPT_NAME" -ef "$0"
ci_assert -n "$CI_HOST_SYSTEM" -a -n "$CI_HOST_MACHINE"
ci_assert -n "$CI_TARGET_SYSTEM" -a -n "$CI_TARGET_MACHINE"
ci_assert "checking CI_TOPLEVEL_DIR" \
"$CI_TOPLEVEL_DIR/ci/lib/ci.lib.sh" -ef "${BASH_SOURCE[0]}"
ci_assert "checking CI_SCRIPT_DIR and CI_SCRIPT_NAME" \
"$CI_SCRIPT_DIR/$CI_SCRIPT_NAME" -ef "$0"
ci_assert "checking CI_BUILD_ARCH and CI_BUILD_SYSTEM" \
-n "$CI_BUILD_ARCH" -a -n "$CI_BUILD_SYSTEM"
ci_assert "checking CI_TARGET_ARCH and CI_TARGET_SYSTEM" \
-n "$CI_TARGET_ARCH" -a -n "$CI_TARGET_SYSTEM"
ci_assert "checking CI_TARGET_TRIPLET" \
x"$CI_TARGET_TRIPLET" = x"" -o \
x"$CI_TARGET_TRIPLET" = x"$CI_TARGET_ARCH-$CI_TARGET_SYSTEM-$CI_TARGET_ABI"
ci_assert "checking if CI_NO_TEST is boolean" \
$((CI_NO_TEST)) -eq $((!!CI_NO_TEST))
ci_assert "checking if CI_NO_INSTALL is boolean" \
$((CI_NO_INSTALL)) -eq $((!!CI_NO_INSTALL))
ci_assert "checking if CI_NO_CLEAN is boolean" \
$((CI_NO_CLEAN)) -eq $((!!CI_NO_CLEAN))