diff options
author | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2015-09-04 19:38:19 +0200 |
---|---|---|
committer | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2015-09-04 19:38:19 +0200 |
commit | cf1176c7286657e4c56cbd5bc599ba85482317b9 (patch) | |
tree | 4e989fd5b54324f5a9801ec00560f0fe3267e8b2 | |
parent | Add .travis.yml (diff) | |
download | sway-cf1176c7286657e4c56cbd5bc599ba85482317b9.tar.gz sway-cf1176c7286657e4c56cbd5bc599ba85482317b9.tar.zst sway-cf1176c7286657e4c56cbd5bc599ba85482317b9.zip |
Build wlc as part of build step
-rwxr-xr-x | .ci/build.sh | 17 | ||||
-rw-r--r-- | .travis.yml | 13 |
2 files changed, 26 insertions, 4 deletions
diff --git a/.ci/build.sh b/.ci/build.sh new file mode 100755 index 00000000..e2d2ced9 --- /dev/null +++ b/.ci/build.sh | |||
@@ -0,0 +1,17 @@ | |||
1 | #!/bin/bash | ||
2 | |||
3 | # clone and build wlc | ||
4 | git clone https://github.com/Cloudef/wlc.git | ||
5 | cd wlc | ||
6 | git submodule update --init --recursive # - initialize and fetch submodules | ||
7 | mkdir target && cd target # - create build target directory | ||
8 | cmake -DCMAKE_BUILD_TYPE=Upstream .. # - run CMake | ||
9 | make # - compile | ||
10 | |||
11 | cd ../.. | ||
12 | |||
13 | # build sway | ||
14 | cmake \ | ||
15 | -DWLC_LIBRARIES=wlc/target/src/libwlc.so \ | ||
16 | -DWLC_INCLUDE_DIRS=wlc/include . | ||
17 | make | ||
diff --git a/.travis.yml b/.travis.yml index 2f6e93dd..5d1f8faa 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -7,11 +7,16 @@ arch: | |||
7 | - asciidoc | 7 | - asciidoc |
8 | - pcre | 8 | - pcre |
9 | - json-c | 9 | - json-c |
10 | # aur | 10 | - pixman |
11 | - wlc-git | 11 | - wayland |
12 | - libxkbcommon | ||
13 | - libinput | ||
14 | - libx11 | ||
15 | - libxcb | ||
16 | - libgl | ||
17 | - mesa | ||
12 | script: | 18 | script: |
13 | - "cmake ." | 19 | - "bash .ci/build.sh" |
14 | - "make" | ||
15 | 20 | ||
16 | script: | 21 | script: |
17 | - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" | 22 | - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" |