# HG changeset patch # User Mike Becker # Date 1762291934 -3600 # Node ID b1577ea008e55146b8c0156bdb46358b73818aae # Parent df47b7efb97d43c232e5def72dad785c19e9d7ea update uwproj diff -r df47b7efb97d -r b1577ea008e5 configure --- a/configure Fri Jun 06 19:21:03 2025 +0200 +++ b/configure Tue Nov 04 22:32:14 2025 +0100 @@ -319,7 +319,7 @@ # dependency archiver while true do - if command -v ar > /dev/null ; then + if command -v ar > /dev/null 2>&1 ; then : else break @@ -344,7 +344,7 @@ # dependency rmdir while true do - if command -v rm > /dev/null ; then + if command -v rm > /dev/null 2>&1 ; then : else break @@ -393,7 +393,7 @@ # dependency mkdir while true do - if command -v mkdir > /dev/null ; then + if command -v mkdir > /dev/null 2>&1 ; then : else break diff -r df47b7efb97d -r b1577ea008e5 make/configure.vm --- a/make/configure.vm Fri Jun 06 19:21:03 2025 +0200 +++ b/make/configure.vm Tue Nov 04 22:32:14 2025 +0100 @@ -400,7 +400,7 @@ fi #end #foreach( $test in $sub.tests ) - if $test > /dev/null ; then + if $test > /dev/null 2>&1 ; then : else break @@ -502,7 +502,6 @@ #foreach( $flags in $dependency.flags ) #if( $flags.exec ) - $flags.value > /dev/null if tmp_flags=`$flags.value` ; then TEMP_$flags.varName="$TEMP_$flags.varName $tmp_flags" else diff -r df47b7efb97d -r b1577ea008e5 make/project.xml --- a/make/project.xml Fri Jun 06 19:21:03 2025 +0200 +++ b/make/project.xml Tue Nov 04 22:32:14 2025 +0100 @@ -1,5 +1,5 @@ - + c diff -r df47b7efb97d -r b1577ea008e5 make/toolchain.sh --- a/make/toolchain.sh Fri Jun 06 19:21:03 2025 +0200 +++ b/make/toolchain.sh Tue Nov 04 22:32:14 2025 +0100 @@ -3,12 +3,19 @@ # toolchain detection # +TAIL=tail if isplatform "bsd" && notisplatform "openbsd"; then C_COMPILERS="clang gcc cc" CPP_COMPILERS="clang++ g++ CC" +elif isplatform "solaris"; then + C_COMPILERS="cc suncc gcc clang" + CPP_COMPILERS="CC sunCC g++ clang++" + if [ -f /usr/xpg4/bin/tail ]; then + TAIL=/usr/xpg4/bin/tail + fi else - C_COMPILERS="gcc clang suncc cc" - CPP_COMPILERS="g++ clang++ sunCC CC" + C_COMPILERS="gcc clang cc" + CPP_COMPILERS="g++ clang++ c++" fi unset TOOLCHAIN unset TOOLCHAIN_NAME @@ -91,47 +98,12 @@ fi } -check_c_lib() -{ - # $1: libname - # $2: optional include - if [ -z "$TOOLCHAIN_CC" ]; then - return 1 - fi - create_libtest_source "test.c" "$2" - rm -f "$TEMP_DIR/checklib" - $TOOLCHAIN_CC -o "$TEMP_DIR/checklib" $CFLAGS $LDFLAGS "-l$1" "$TEMP_DIR/test.c" 2> /dev/null -} - -check_cpp_lib() -{ - # $1: libname - # $2: optional include - if [ -z "$TOOLCHAIN_CXX" ]; then - return 1 - fi - create_libtest_source "test.cpp" "$2" - rm -f "$TEMP_DIR/checklib" - $TOOLCHAIN_CXX -o "$TEMP_DIR/checklib" $CXXFLAGS $LDFLAGS "-l$1" "$TEMP_DIR/test.cpp" 2> /dev/null -} - -check_lib() -{ - # $1: libname - # $2: optional include - if [ -n "$TOOLCHAIN_CC" ]; then - check_c_lib "$1" "$2" - elif [ -n "$TOOLCHAIN_CXX" ]; then - check_cpp_lib "$1" "$2" - fi -} - parse_toolchain_properties() { info_file="$1" - TOOLCHAIN=`grep '^toolchain:' "$info_file" | tail -c +11` + TOOLCHAIN=`grep '^toolchain:' "$info_file" | $TAIL -c +11` TOOLCHAIN_NAME=`echo "$TOOLCHAIN" | cut -f1 -d' ' -` - TOOLCHAIN_WSIZE=`grep '^wsize:' "$info_file" | tail -c +7` + TOOLCHAIN_WSIZE=`grep '^wsize:' "$info_file" | $TAIL -c +7` } detect_c_compiler() @@ -145,7 +117,7 @@ TOOLCHAIN_CC=$CC "$TEMP_DIR/checkcc" > "$TEMP_DIR/checkcc_out" parse_toolchain_properties "$TEMP_DIR/checkcc_out" - TOOLCHAIN_CSTD=`grep '^stdcversion:' "$TEMP_DIR/checkcc_out" | tail -c +13` + TOOLCHAIN_CSTD=`grep '^stdcversion:' "$TEMP_DIR/checkcc_out" | $TAIL -c +13` echo "$CC" return 0 else @@ -159,7 +131,7 @@ TOOLCHAIN_CC=$COMP "$TEMP_DIR/checkcc" > "$TEMP_DIR/checkcc_out" parse_toolchain_properties "$TEMP_DIR/checkcc_out" - TOOLCHAIN_CSTD=`grep '^stdcversion:' "$TEMP_DIR/checkcc_out" | tail -c +13` + TOOLCHAIN_CSTD=`grep '^stdcversion:' "$TEMP_DIR/checkcc_out" | $TAIL -c +13` echo "$COMP" return 0 fi diff -r df47b7efb97d -r b1577ea008e5 make/uwproj.xsd --- a/make/uwproj.xsd Fri Jun 06 19:21:03 2025 +0200 +++ b/make/uwproj.xsd Tue Nov 04 22:32:14 2025 +0100 @@ -3,7 +3,7 @@ xmlns="http://unixwork.de/uwproj" targetNamespace="http://unixwork.de/uwproj" elementFormDefault="qualified" - version="0.3" + version="0.4" >