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: Fix verification under Cygwin Bash + CMake + Visual Studio; update

Browse Source 
Fix autodetection and use of the cygpath executable on Windows.

Add a new variable CI_CMAKE_TOOLCHAIN_FILE to ci_verify_cmake.sh.
This should help in future cross-platform testing.

Remove the implicit initialization of CI_CC, CI_LD and CI_LIBS from
ci_verify_makefiles.sh. This should help the testing of default values
of their respective make variables (CC, LD and LIBS).
This commit is contained in:
Cosmin Truta
2022-11-27 21:58:07 +02:00
parent b445aade83
commit 9db8cff6ef
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ci/ci_verify_makefiles.sh
View File

@@ -35,23 +35,14 @@ function ci_init_makefiles {
CI_SYSTEM_NAME="$(uname -s)"
CI_MACHINE_NAME="$(uname -m)"
CI_MAKE="${CI_MAKE:-make}"
case "$CI_SYSTEM_NAME" in
( Darwin | *BSD | DragonFly )
[[ -x $(command -v clang) ]] && CI_CC="${CI_CC:-clang}" ;;
( * )
[[ -x $(command -v gcc) ]] && CI_CC="${CI_CC:-gcc}" ;;
esac
CI_CC="${CI_CC:-cc}"
case "$CI_CC" in
( *clang* )
CI_MAKEFILES="${CI_MAKEFILES:-"scripts/makefile.clang"}" ;;
( *gcc* )
CI_MAKEFILES="${CI_MAKEFILES:-"scripts/makefile.gcc"}" ;;
( cc | c89 | c99 )
( * )
CI_MAKEFILES="${CI_MAKEFILES:-"scripts/makefile.std"}" ;;
esac
CI_LD="${CI_LD:-"$CI_CC"}"
CI_LIBS="${CI_LIBS:-"-lz -lm"}"
}
function ci_trace_makefiles {
@@ -113,7 +104,7 @@ function ci_build_makefiles {
[[ $CI_RANLIB ]] && ALL_MAKE_VARS+=(RANLIB="$CI_RANLIB")
[[ $CI_LD ]] && ALL_MAKE_VARS+=(LD="$CI_LD")
[[ $ALL_LD_FLAGS ]] && ALL_MAKE_VARS+=(LDFLAGS="$ALL_LD_FLAGS")
ALL_MAKE_VARS+=(LIBS="$CI_LIBS")
[[ $CI_LIBS ]] && ALL_MAKE_VARS+=(LIBS="$CI_LIBS")
ALL_MAKE_VARS+=($CI_MAKE_VARS)
# Build!
ci_spawn cd "$CI_SRCDIR"