diff options
| author | Dave Beckett <dave@dajobe.org> | 2020-09-07 21:52:41 -0700 |
|---|---|---|
| committer | Dave Beckett <dave@dajobe.org> | 2020-09-07 21:52:41 -0700 |
| commit | 89ae1735f0dc4e1e840065d9d6925e3459334a40 (patch) | |
| tree | 6e35287f010d8af30bbf9c493de1b75db9000c74 | |
| parent | 8cd35e22647fd758381d685ab99ff4b0cbdb273e (diff) | |
| download | raptor-89ae1735f0dc4e1e840065d9d6925e3459334a40.tar.gz | |
Travis config and install-bison3.sh updates
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rwxr-xr-x | scripts/install-bison3.sh | 11 |
2 files changed, 10 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 072eb943..b746dc16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,32 +53,30 @@ matrix: allow_failures: - env: EXPERIMENTAL=yes - -before_install: - - if [ "$TRAVIS_OS_NAME" = "windows" ]; then BUILD_CMAKE="yes"; fi - - env | sort - install: - | if [ "$TRAVIS_OS_NAME" = "" ]; then TRAVIS_OS_NAME=linux; fi case "$TRAVIS_OS_NAME" in linux) - ./scripts/install-bison3.sh sudo apt-get update -qq -y sudo apt-get install -qq -y gtk-doc-tools libyajl-dev + ./scripts/install-bison3.sh ;; osx) brew update brew install bison gtk-doc yajl ln -sf /usr/local/Cellar/bison/*/bin/bison /usr/local/bin/bison + ./scripts/install-bison3.sh ;; windows) choco install WinFlexBison + BUILD_CNAME="yes" ;; esac script: - | + env | sort ./autogen.sh --disable-gtk-doc if [ "$BUILD_CMAKE" = yes ]; then mkdir -p work && cd work && cmake .. && make && ctest diff --git a/scripts/install-bison3.sh b/scripts/install-bison3.sh index 9eaebb2b..369ed721 100755 --- a/scripts/install-bison3.sh +++ b/scripts/install-bison3.sh @@ -14,9 +14,13 @@ package_name=${PACKAGE:-bison} ########### Should be generic for any GNU package below here ######## +AWK=${AWK:-awk} +CURL=${CURL:-curl} +WGET=${WGET:-wget} + package_ucname=$(echo "${package_name}" | tr '[:lower:]' '[:upper:]') -package_min_version=$(awk -F= "/^${package_ucname}_MIN_VERSION/ {print \$2}" configure.ac) -package_rec_version=$(awk -F= "/^${package_ucname}_REC_VERSION/ {print \$2}" configure.ac) +package_min_version=$($AWK -F= "/^${package_ucname}_MIN_VERSION/ {print \$2}" configure.ac) +package_rec_version=$($AWK -F= "/^${package_ucname}_REC_VERSION/ {print \$2}" configure.ac) # Package specific overrides @@ -30,9 +34,6 @@ case "$package_name" in ;; esac -AWK=${AWK:-awk} -CURL=${CURL:-curl} -WGET=${WGET:-wget} DESTDIR=${DESTDIR:-/usr} ROOT_DIR=${TMPDIR:-/tmp} |