diff options
| author | Tristan Gingold <tgingold@free.fr> | 2017-12-16 21:37:06 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2017-12-18 06:06:52 +0100 |
| commit | 89eb6839ac8c429ef4c626ab2216411a2f5cc80c (patch) | |
| tree | e42707e0721758eb3e0222288017c18d2efdd77c /dist | |
| parent | 42b68d5ff95a15e684c16b53a0f1afbde5955f7a (diff) | |
| download | ghdl-89eb6839ac8c429ef4c626ab2216411a2f5cc80c.tar.gz ghdl-89eb6839ac8c429ef4c626ab2216411a2f5cc80c.tar.bz2 ghdl-89eb6839ac8c429ef4c626ab2216411a2f5cc80c.zip | |
travis: comments, minor rewrite.
Diffstat (limited to 'dist')
| -rwxr-xr-x | dist/linux/build.sh | 16 | ||||
| -rwxr-xr-x | dist/linux/test.sh | 2 | ||||
| -rwxr-xr-x | dist/linux/travis-ci.sh | 1 |
3 files changed, 10 insertions, 9 deletions
diff --git a/dist/linux/build.sh b/dist/linux/build.sh index d6f5a3a20..2f0e6c705 100755 --- a/dist/linux/build.sh +++ b/dist/linux/build.sh @@ -101,10 +101,6 @@ case "$BLD" in echo "$ANSI_RED[GHDL - build] Unknown build $BLD $ANSI_NOCOLOR" exit 1;; esac -DEP_CLANG="" -if [ "$CXX" != "" ]; then - DEP_CLANG="`$CXX --version | grep 'clang'`" -fi echo "../configure --prefix=$prefix $config_opts" ../configure "--prefix=$prefix" $config_opts echo "travis_fold:end:configure" @@ -133,10 +129,14 @@ echo "travis_fold:end:tar.bin" #--- build tools versions -printf "%s\n" \ - "`make --version | grep 'Make'`" \ - "`gnat --version | grep 'GNAT'`" \ - "`gcc --version | grep 'gcc'`" "$DEP_CLANG" > BUILD_TOOLS +{ + make --version | grep 'Make' + gnatls --version | grep 'GNATLS' + gcc --version | grep 'gcc' + if [ "$CXX" != "" ]; then + $CXX --version | grep 'clang' + fi +} > BUILD_TOOLS #--- diff --git a/dist/linux/test.sh b/dist/linux/test.sh index f2eb4e176..e95bccbb6 100755 --- a/dist/linux/test.sh +++ b/dist/linux/test.sh @@ -32,7 +32,7 @@ done rm -f test_ok -export ENABLECOLOR TASK +export ENABLECOLOR if [ "$GHDL" = "" ]; then export GHDL="$prefix/bin/ghdl" fi diff --git a/dist/linux/travis-ci.sh b/dist/linux/travis-ci.sh index d423db9e6..93e7241ba 100755 --- a/dist/linux/travis-ci.sh +++ b/dist/linux/travis-ci.sh @@ -67,6 +67,7 @@ elif expr "$TRAVIS_TAG" : 'v[0-9].*' > /dev/null; then # Remove leading 'v' in tags in the filenames. PKG_TAG="$(echo $TRAVIS_TAG | cut -c2-)" else + # Regular tag (like snapshots), nothing to change. PKG_TAG="$TRAVIS_TAG" fi |