Update travis for autotools

diff --git a/.travis.yml b/.travis.yml
index f8a3de6f4ee02ce15c865c7ad3b233757db1e123..f97443355feb96b78683a5d9580db6fe158e21bc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ install:
 script:
   - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/check-safe-wrappers.sh
   - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/check-formatting.sh
-  - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC -e CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Werror" ${BASENAME} make all mans -j ASAN=1
+  - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${BASENAME} /bin/sh -c 'autoreconf -fi && mkdir -p build && cd build && (../configure || (cat config.log; false)) && make -j CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Werror"'
   - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/check-spelling.pl
   - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${BASENAME} ./travis/run-tests.sh
   - ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/debian-build.sh deb/debian-amd64/DIST

diff --git a/Makefile.am b/Makefile.am
index 21f57e5bfbb40625cf1cd8fc86ec581df6e82f6b..57d5b0192557ad2bdc8e2a224d9a81f415e42d47 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
 @CODE_COVERAGE_RULES@
 
+echo-version:
+       @echo "@I3_VERSION@"
+
 bin_PROGRAMS = \
        i3 \
        i3bar/i3bar \

diff --git a/configure.ac b/configure.ac
index 01b4d3090dec582e75313905e6207a247de8c3e5..3c47c6b59b7cea507e9832a3549ea6213e7880ae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AS_IF([test -d ${srcdir}/.git],
         I3_VERSION="$(cat ${srcdir}/I3_VERSION)"
         is_release="$(grep -q non-git ${srcdir}/I3_VERSION && echo no || echo yes)"
       ])
+AC_SUBST([I3_VERSION], [$I3_VERSION])
 MAJOR_VERSION="$(echo ${VERSION} | cut -d '.' -f 1)"
 MINOR_VERSION="$(echo ${VERSION} | cut -d '.' -f 2)"
 PATCH_VERSION="$(echo ${VERSION} | cut -d '.' -f 3)"

diff --git a/travis/check-spelling.pl b/travis/check-spelling.pl
index 71feec31a57855e20036001a98a14c1ab26f777e..6d070136b9640370feeb6a5ac1bbb504314b41fc 100755 (executable)
--- a/travis/check-spelling.pl
+++ b/travis/check-spelling.pl
@@ -29,13 +29,13 @@ my $binary_spelling_exceptions = {
     'betwen' => 1, # asan_flags.inc contains this spelling error.
 };
 my @binaries = qw(
-    i3
-    i3-config-wizard/i3-config-wizard
-    i3-dump-log/i3-dump-log
-    i3-input/i3-input
-    i3-msg/i3-msg
-    i3-nagbar/i3-nagbar
-    i3bar/i3bar
+    build/i3
+    build/i3-config-wizard/i3-config-wizard
+    build/i3-dump-log/i3-dump-log
+    build/i3-input/i3-input
+    build/i3-msg/i3-msg
+    build/i3-nagbar/i3-nagbar
+    build/i3bar/i3bar
 );
 for my $binary (@binaries) {
     check_spelling(slurp($binary), $binary_spelling_exceptions, sub {
@@ -50,7 +50,7 @@ for my $binary (@binaries) {
 my $manpage_spelling_exceptions = {
 };
 
-for my $name (glob('man/*.1')) {
+for my $name (glob('build/man/*.1')) {
     for my $line (split(/\n/, slurp($name))) {
         next if $line =~ /^\.\\\"/o;
         check_spelling($line, $manpage_spelling_exceptions, sub {

diff --git a/travis/clang-analyze.sh b/travis/clang-analyze.sh
index 05d541191c370fd9248b466211bacab53566327e..97c11fccda91b80386bb932d71a0fa7db0cdff16 100755 (executable)
--- a/travis/clang-analyze.sh
+++ b/travis/clang-analyze.sh
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-mkdir -p deb/DIST-clang
+mkdir -p deb/DIST-clang/build
 tar xf *.tar.bz2 -C deb/DIST-clang --strip-components=1
-(cd deb/DIST-clang && scan-build -o ../CLANG --html-title="Analysis of i3 v$(git describe --tags)" make -j8)
+(cd deb/DIST-clang/build && scan-build -o ../../CLANG ../configure && scan-build -o ../../CLANG --html-title="Analysis of i3 v$(git describe --tags)" make -j8)
 mv deb/CLANG/*/* deb/CLANG

diff --git a/travis/debian-build.sh b/travis/debian-build.sh
index 655bd5c41e8bd4ac0917fff052b8769ab1ac70a0..9ce5a5aff6838e3279733079246c18ae8c9d1be5 100755 (executable)
--- a/travis/debian-build.sh
+++ b/travis/debian-build.sh
@@ -5,12 +5,15 @@ set -x
 
 DEST=$1
 
-make store_git_version
-make dist
+mkdir -p build
+cd build
+../configure
+make echo-version > ../I3_VERSION
+make dist-bzip2
 # unpack dist tarball
 mkdir -p "${DEST}"
 tar xf *.tar.bz2 -C "${DEST}" --strip-components=1
-cp -r debian "${DEST}"
+cp -r ../debian "${DEST}"
 sed -i '/^\s*libxcb-xrm-dev/d' deb/ubuntu-*/DIST/debian/control || true
 cd "${DEST}"
 debchange -m -l+g$(git describe --tags) 'Automatically built'

diff --git a/travis/run-tests.sh b/travis/run-tests.sh
index d8a40d77027e38aab69be908bdf47202a20e1cbb..44df81d2ffbdf257fdb0c428999290c56c711db5 100755 (executable)
--- a/travis/run-tests.sh
+++ b/travis/run-tests.sh
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-cd testcases
+cd build
 
 # TODO: remove this workaround once https://bugs.debian.org/836723 is fixed
 # Found at https://llvm.org/bugs/show_bug.cgi?id=27310#c8:
@@ -26,7 +26,7 @@ fi
 
 # Try running the tests in parallel so that the common case (tests pass) is
 # quick, but fall back to running them in sequence to make debugging easier.
-if ! xvfb-run ./complete-run.pl
+if ! xvfb-run make check
 then
-       xvfb-run ./complete-run.pl --parallel=1 || (cat latest/complete-run.log; false)
+       xvfb-run ./testcases/complete-run.pl --parallel=1 || (cat latest/complete-run.log; false)
 fi