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: Update the CI scripts

Browse Source 
Apply the following changes:
 * Update CI_BUILDDIR and CI_INSTALLDIR to reflect the new script
   names.
 * Introduce CI_SRCDIR_FROM_BUILDDIR and CI_INSTALLDIR_FROM_BUILDDIR
   to the cmake build, to ensure that the Windows tools can handle
   native Windows paths correctly when executed via Bash-on-Windows.
 * Stop guessing and using CI_SRCDIR_NATIVE and CI_INSTALLDIR_NATIVE
   in the cmake build, since we now have a better solution.
 * Show the ninja program version in ninja-based cmake builds.
 * Move the cleanup of previous builds into separate functions, and
   do it in a cleaner manner. No pun intended.
This commit is contained in:
Cosmin Truta
2023-02-05 17:09:00 +02:00
parent 59fa76e164
commit 66fede80d2
3 changed files with 97 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ci/ci_verify_makefiles.sh
View File

@@ -4,7 +4,7 @@ set -e
# ci_verify_makefiles.sh
# Continuously integrate libpng using the legacy makefiles.
#
# Copyright (c) 2019-2022 Cosmin Truta.
# Copyright (c) 2019-2023 Cosmin Truta.
#
# This software is released under the libpng license.
# For conditions of distribution and use, see the disclaimer
@@ -13,7 +13,6 @@ set -e
CI_SCRIPTNAME="$(basename "$0")"
CI_SCRIPTDIR="$(cd "$(dirname "$0")" && pwd)"
CI_SRCDIR="$(dirname "$CI_SCRIPTDIR")"
CI_BUILDDIR="$CI_SRCDIR"
function ci_info {
printf >&2 "%s: %s\\n" "$CI_SCRIPTNAME" "$*"
@@ -31,7 +30,7 @@ function ci_spawn {
"$@"
}
function ci_init_makefiles {
function ci_init_makefiles_build {
CI_SYSTEM_NAME="$(uname -s)"
CI_MACHINE_NAME="$(uname -m)"
CI_MAKE="${CI_MAKE:-make}"
@@ -45,12 +44,11 @@ function ci_init_makefiles {
esac
}
function ci_trace_makefiles {
function ci_trace_makefiles_build {
ci_info "## START OF CONFIGURATION ##"
ci_info "system name: $CI_SYSTEM_NAME"
ci_info "machine hardware name: $CI_MACHINE_NAME"
ci_info "source directory: $CI_SRCDIR"
ci_info "build directory: $CI_BUILDDIR"
ci_info "environment option: \$CI_MAKEFILES: '$CI_MAKEFILES'"
ci_info "environment option: \$CI_MAKE: '$CI_MAKE'"
ci_info "environment option: \$CI_MAKE_FLAGS: '$CI_MAKE_FLAGS'"
@@ -81,6 +79,19 @@ function ci_trace_makefiles {
ci_info "## END OF CONFIGURATION ##"
}
function ci_cleanup_old_makefiles_build {
# Any old makefile-based build will most likely leave a mess
# of object files behind if interrupted, e.g., via Ctrl+C.
# There may be other files behind, depending on what makefile
# had been used. We cannot easily enumerate all of those.
# Fortunately, for a clean makefiles-based build, it should be
# sufficient to remove the old object files only.
[[ -z $(find "$CI_SRCDIR" -maxdepth 1 -name "*.o") ]] ||
ci_spawn rm -f "$CI_SRCDIR"/*.o
[[ -z $(find "$CI_SRCDIR" -maxdepth 1 -name "*.obj") ]] ||
ci_spawn rm -f "$CI_SRCDIR"/*.obj
}
function ci_build_makefiles {
ci_info "## START OF BUILD ##"
# Initialize ALL_CC_FLAGS and ALL_LD_FLAGS as strings.
@@ -91,8 +102,8 @@ function ci_build_makefiles {
ALL_LD_FLAGS="-fsanitize=$CI_SANITIZERS $ALL_LD_FLAGS"
}
# Initialize ALL_MAKE_FLAGS and ALL_MAKE_VARS as arrays.
local -a ALL_MAKE_FLAGS=($CI_MAKE_FLAGS)
local -a ALL_MAKE_VARS=()
local ALL_MAKE_FLAGS=($CI_MAKE_FLAGS)
local ALL_MAKE_VARS=()
[[ $CI_CC ]] && ALL_MAKE_VARS+=(CC="$CI_CC")
[[ $ALL_CC_FLAGS ]] && ALL_MAKE_VARS+=(CFLAGS="$ALL_CC_FLAGS")
[[ $CI_CPP ]] && ALL_MAKE_VARS+=(CPP="$CI_CPP")
@@ -107,7 +118,7 @@ function ci_build_makefiles {
[[ $CI_LIBS ]] && ALL_MAKE_VARS+=(LIBS="$CI_LIBS")
ALL_MAKE_VARS+=($CI_MAKE_VARS)
# Build!
ci_spawn cd "$CI_SRCDIR"
cd "$CI_SRCDIR"
local MY_MAKEFILE
for MY_MAKEFILE in $CI_MAKEFILES
do
@@ -129,10 +140,15 @@ function ci_build_makefiles {
ci_info "## END OF BUILD ##"
}
ci_init_makefiles
ci_trace_makefiles
[[ $# -eq 0 ]] || {
ci_info "note: this program accepts environment options only"
ci_err "unexpected command arguments: '$*'"
function main {
[[ $# -eq 0 ]] || {
ci_info "note: this program accepts environment options only"
ci_err "unexpected command arguments: '$*'"
}
ci_init_makefiles_build
ci_trace_makefiles_build
ci_cleanup_old_makefiles_build
ci_build_makefiles
}
ci_build_makefiles
main "$@"