X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=contrib%2Fplatformtest.sh;h=dfefc1aa507d0742bf3c4876cd7c10f826a11b71;hp=0a518b8a7df0ad70d6eea687822c56cb3c7df2fa;hb=97b4fd8a086af9d4a979e8fa3a714352fcffdca3;hpb=513a75c9195f480b25a6bbd605a00ef066636211 diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index 0a518b8a..dfefc1aa 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -1,7 +1,7 @@ #!/bin/sh # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2009 Alexander Barton +# Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,25 +16,36 @@ NAME=`basename "$0"` VERBOSE= +CLEAN=1 PLATFORM= COMPILER="unknown" VERSION="unknown" DATE=`date "+%y-%m-%d"` - -CONFIGURE= -MAKE= -CHECK= -RUN= COMMENT= +R_CONFIGURE= +R_MAKE= +R_CHECK= +R_RUN= + +[ -n "$MAKE" ] || MAKE="make" +export MAKE CC + while [ $# -gt 0 ]; do case "$1" in "-v") VERBOSE=1 ;; + "-x") + CLEAN= + ;; *) - echo "Usage: $NAME [-v]" + echo "Usage: $NAME [-v] [-x]" + echo + echo " -v Verbose output" + echo " -x Don't regenerate build system, even when possible" + echo exit 2 esac shift @@ -51,30 +62,40 @@ if [ $? -ne 0 ]; then cd .. fi -echo "$NAME: Checking for ./configure script ..." -if [ ! -e ./configure ]; then - echo "$NAME: Not found. Running ./autogen.sh ..." +echo "$NAME: Checking for GIT tree ..." +if [ -d .git ]; then + echo "$NAME: Checking for \"git\" command ..." + git version >/dev/null 2>&1 + if [ $? -eq 0 -a -n "$CLEAN" ]; then + echo "$NAME: Running \"git clean\" ..." + [ -n "$VERBOSE" ] && git clean -dxf || git clean -dxf >/dev/null + fi +fi + +echo "$NAME: Checking for \"./configure\" script ..." +if [ ! -r ./configure ]; then + echo "$NAME: Running \"./autogen.sh\" ..." [ -n "$VERBOSE" ] && ./autogen.sh || ./autogen.sh >/dev/null fi -if [ -e ./configure ]; then +if [ -r ./configure ]; then echo "$NAME: Running \"./configure\" script ..." [ -n "$VERBOSE" ] && ./configure || ./configure >/dev/null - if [ $? -eq 0 -a -e ./Makefile ]; then - CONFIGURE=1 - echo "$NAME: Running \"make\" ..." - [ -n "$VERBOSE" ] && make || make >/dev/null + if [ $? -eq 0 -a -r ./Makefile ]; then + R_CONFIGURE=1 + echo "$NAME: Running \"$MAKE\" ..." + [ -n "$VERBOSE" ] && "$MAKE" || "$MAKE" >/dev/null if [ $? -eq 0 -a -x src/ngircd/ngircd ]; then - MAKE=1 - echo "$NAME: Running \"make check\" ..." - [ -n "$VERBOSE" ] && make check || make check >/dev/null + R_MAKE=1 + echo "$NAME: Running \"$MAKE check\" ..." + [ -n "$VERBOSE" ] && "$MAKE" check || "$MAKE" check >/dev/null if [ $? -eq 0 ]; then - CHECK=1 - RUN=$CHECK + R_CHECK=1 + R_RUN=$R_CHECK else ./src/ngircd/ngircd --help 2>/dev/null \ - | grep "^ngircd" >/dev/null - [ $? -eq 0 ] && RUN=1 + | grep "^ngIRCd" >/dev/null + [ $? -eq 0 ] && R_RUN=1 fi fi fi @@ -82,9 +103,9 @@ fi # Get target platform information if [ -r "src/config.h" ]; then - CPU=`grep "TARGET_CPU" "src/config.h" | cut -d'"' -f2` - OS=`grep "TARGET_OS" "src/config.h" | cut -d'"' -f2` - VENDOR=`grep "TARGET_VENDOR" "src/config.h" | cut -d'"' -f2` + CPU=`grep "HOST_CPU" "src/config.h" | cut -d'"' -f2` + OS=`grep "HOST_OS" "src/config.h" | cut -d'"' -f2` + VENDOR=`grep "HOST_VENDOR" "src/config.h" | cut -d'"' -f2` PLATFORM="$CPU/$VENDOR/$OS" fi if [ -z "$PLATFORM" ]; then @@ -93,51 +114,82 @@ fi # Get compiler information if [ -r "Makefile" ]; then - eval $(grep "^CC = " Makefile | sed -e 's/ //g') + CC=$(grep "^CC = " Makefile | cut -d' ' -f3) $CC --version 2>&1 | grep -i "GCC" >/dev/null if [ $? -eq 0 ]; then - COMPILER=$($CC --version | head -n 1 | awk "{ print \$3 }" \ - | cut -d'-' -f1) - COMPILER="gcc $COMPILER" + # GCC, or compiler that mimics GCC + $CC --version 2>&1 | grep -i "Open64" >/dev/null + if [ $? -eq 0 ]; then + COMPILER="Open64" + else + COMPILER=$($CC --version | head -1 \ + | cut -d')' -f2 | cut -d' ' -f2) + COMPILER="gcc $COMPILER" + fi + else + # Non-GCC compiler + $CC --version 2>&1 | grep -i "clang" >/dev/null + if [ $? -eq 0 ]; then + COMPILER=$($CC --version 2>/dev/null | head -1 \ + | cut -d'(' -f1 | cut -d'-' -f1 \ + | sed -e 's/version //g' | sed -e 's/Apple /A-/g' \ + | sed -e 's/Debian //g' | sed -e 's/LLVM /clang /g') + fi + $CC -version 2>&1 | grep -i "tcc" >/dev/null + if [ $? -eq 0 ]; then + COMPILER=$($CC -version 2>/dev/null | head -1 \ + | cut -d'(' -f1 | sed -e 's/version //g') + fi + if [ "$COMPILER" = "unknown" ]; then + v="`$CC --version 2>/dev/null | head -1`" + [ -z "$v" ] && v="`$CC -version 2>/dev/null | head -1`" + [ -n "$v" ] && COMPILER="$v" + fi fi fi # Get ngIRCd version information -if [ -d ".git" ]; then - VERSION=`git log --abbrev-commit --pretty=oneline HEAD~1.. \ - | head -1 | cut -d' ' -f1 | tr -d '.'` -elif [ -r "Makefile" ]; then - eval $(grep "^VERSION = " Makefile | sed -e 's/ //g') -fi +eval $(grep "^VERSION = " Makefile | sed -e 's/ //g') +case "$VERSION" in + *-*-*) + VERSION=`echo "$VERSION" | cut -d'-' -f3 | cut -b2-` + ;; +esac [ -n "$VERSION" ] || VERSION="unknown" # Get IO interface information if [ "$OS" = "linux-gnu" ]; then - COMMENT="(1)" + COMMENT="1" else grep "^#define HAVE_SYS_DEVPOLL_H 1" src/config.h >/dev/null 2>&1 - [ $? -eq 0 ] && COMMENT="(4)" + [ $? -eq 0 ] && COMMENT="4" grep "^#define HAVE_EPOLL_CREATE 1" src/config.h >/dev/null 2>&1 - [ $? -eq 0 ] && COMMENT="(5)" + [ $? -eq 0 ] && COMMENT="5" grep "^#define HAVE_KQUEUE 1" src/config.h >/dev/null 2>&1 - [ $? -eq 0 ] && COMMENT="(3)" + [ $? -eq 0 ] && COMMENT="3" fi -[ -n "$CONFIGURE" ] && C="Y" || C="N" -[ -n "$MAKE" ] && M="Y" || M="N" -[ -n "$CHECK" ] && T="Y" || T="N" -[ -n "$RUN" ] && R="Y" || R="N" +[ -n "$R_CONFIGURE" ] && C="Y" || C="N" +[ -n "$R_MAKE" ] && M="Y" || M="N" +[ -n "$R_CHECK" ] && T="Y" || T="N" +[ -n "$R_RUN" ] && R="Y" || R="N" [ -n "$COMMENT" ] && COMMENT=" $COMMENT" echo -echo " the executable works (\"runs\") as expected --+" -echo " tests run successfully (\"make check\") --+ |" -echo " ngIRCd compiles (\"make\") --+ | |" -echo " ./configure works --+ | | |" -echo " | | | |" -echo "Platform Compiler ngIRCd Date Tester C M T R See" -echo "--------------------------- ------------ ---------- -------- ------ - - - - ---" -printf "%-27s %-12s %-10s %s %-6s %s %s %s %s%s" \ - "$PLATFORM" "$COMPILER" "$VERSION" "$DATE" "$USER" \ - "$C" "$M" "$T" "$R" "$COMMENT" +echo " the executable works (\"runs\") as expected --+" +echo " tests run successfully (\"make check\") --+ |" +echo " ngIRCd compiles (\"make\") --+ | |" +echo " ./configure works --+ | | |" +echo " | | | |" +echo "Platform Compiler ngIRCd Date Tester C M T R *" +echo "--------------------------- ------------ ---------- -------- -------- - - - - -" +type printf >/dev/null 2>&1 +if [ $? -eq 0 ]; then + printf "%-27s %-12s %-10s %s %-8s %s %s %s %s%s" \ + "$PLATFORM" "$COMPILER" "$VERSION" "$DATE" "$USER" \ + "$C" "$M" "$T" "$R" "$COMMENT" +else + echo "$PLATFORM $COMPILER $VERSION $DATE $USER" \ + "$C" "$M" "$T" "$R" "$COMMENT" +fi echo; echo