platformtest.sh: New option "-x", don't renegerate build system

[ngircd-alex.git] / contrib / platformtest.sh

diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh
index ac545757ffca9e44749477f56d64a6382a7637ee..dfefc1aa507d0742bf3c4876cd7c10f826a11b71 100755 (executable)
--- a/contrib/platformtest.sh
+++ b/contrib/platformtest.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors
+# 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,6 +16,7 @@
 
 NAME=`basename "$0"`
 VERBOSE=
+CLEAN=1
 
 PLATFORM=
 COMPILER="unknown"
@@ -36,8 +37,15 @@ while [ $# -gt 0 ]; do
                "-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
@@ -58,14 +66,14 @@ 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 ]; then
+       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 [ ! -e ./configure ]; then
+if [ ! -r ./configure ]; then
        echo "$NAME: Running \"./autogen.sh\" ..."
        [ -n "$VERBOSE" ] && ./autogen.sh || ./autogen.sh >/dev/null
 fi
@@ -109,6 +117,7 @@ if [ -r "Makefile" ]; then
        CC=$(grep "^CC = " Makefile | cut -d' ' -f3)
        $CC --version 2>&1 | grep -i "GCC" >/dev/null
        if [ $? -eq 0 ]; then
+               # GCC, or compiler that mimics GCC
                $CC --version 2>&1 | grep -i "Open64" >/dev/null
                if [ $? -eq 0 ]; then
                        COMPILER="Open64"
@@ -118,14 +127,22 @@ if [ -r "Makefile" ]; then
                        COMPILER="gcc $COMPILER"
                fi
        else
-               $CC --version 2>&1 | grep -i "LLVM" >/dev/null
+               # 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 | sed -e 's/version //g' \
-                         | sed -e 's/Apple /A-/g')
+                         | 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
@@ -142,14 +159,14 @@ esac
 
 # 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 "$R_CONFIGURE" ] && C="Y" || C="N"
@@ -159,16 +176,16 @@ fi
 [ -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 "--------------------------- ------------ ---------- -------- ------ - - - - ---"
+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 %-6s %s %s %s %s%s" \
+       printf "%-27s %-12s %-10s %s %-8s %s %s %s %s%s" \
         "$PLATFORM" "$COMPILER" "$VERSION" "$DATE" "$USER" \
         "$C" "$M" "$T" "$R" "$COMMENT"
 else