From 6ae6875bbafd3b3c8133095312e28a9583bf7845 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Fri, 4 Sep 2015 17:22:07 +0200 Subject: [PATCH 1/3] Add .travis.yml --- .travis.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..2f6e93dd5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,17 @@ +sudo: required + +arch: + packages: + - cmake + - xorg-server-xwayland + - asciidoc + - pcre + - json-c + # aur + - wlc-git + script: + - "cmake ." + - "make" + +script: + - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" From cf1176c7286657e4c56cbd5bc599ba85482317b9 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Fri, 4 Sep 2015 19:38:19 +0200 Subject: [PATCH 2/3] Build wlc as part of build step --- .ci/build.sh | 17 +++++++++++++++++ .travis.yml | 13 +++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100755 .ci/build.sh diff --git a/.ci/build.sh b/.ci/build.sh new file mode 100755 index 000000000..e2d2ced98 --- /dev/null +++ b/.ci/build.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# clone and build wlc +git clone https://github.com/Cloudef/wlc.git +cd wlc +git submodule update --init --recursive # - initialize and fetch submodules +mkdir target && cd target # - create build target directory +cmake -DCMAKE_BUILD_TYPE=Upstream .. # - run CMake +make # - compile + +cd ../.. + +# build sway +cmake \ + -DWLC_LIBRARIES=wlc/target/src/libwlc.so \ + -DWLC_INCLUDE_DIRS=wlc/include . +make diff --git a/.travis.yml b/.travis.yml index 2f6e93dd5..5d1f8faaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,16 @@ arch: - asciidoc - pcre - json-c - # aur - - wlc-git + - pixman + - wayland + - libxkbcommon + - libinput + - libx11 + - libxcb + - libgl + - mesa script: - - "cmake ." - - "make" + - "bash .ci/build.sh" script: - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" From 7ad157ebe2970be6f63d250af30f00a23dfec948 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Fri, 4 Sep 2015 21:08:44 +0200 Subject: [PATCH 3/3] make install wlc as part of the build --- .ci/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.ci/build.sh b/.ci/build.sh index e2d2ced98..ece5b2a35 100755 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -7,11 +7,10 @@ git submodule update --init --recursive # - initialize and fetch submodules mkdir target && cd target # - create build target directory cmake -DCMAKE_BUILD_TYPE=Upstream .. # - run CMake make # - compile +sudo make install # - install cd ../.. # build sway -cmake \ - -DWLC_LIBRARIES=wlc/target/src/libwlc.so \ - -DWLC_INCLUDE_DIRS=wlc/include . +cmake . make