~cypheon/elfelli

d2626c50b4464daafbdbd3680684ab445df9acce — Johann Rudloff 1 year, 8 months ago 6b1ab0a
Use CMake in Travis build as well.
3 files changed, 18 insertions(+), 1 deletions(-)

M .travis.yml
M SConstruct
A ci/build.sh
M .travis.yml => .travis.yml +7 -1
@@ 4,6 4,12 @@ os:
  - linux
  - osx

env:
  # (default) build using CMake
  - USE_SCONS=
  # (deprecated) build using SCons
  - USE_SCONS=yes

addons:
  apt:
    packages:


@@ 18,4 24,4 @@ before_script:
  - export PATH=$PATH:/usr/local/opt/gettext/bin/

script:
  - scons -j3
  - ./ci/build.sh

M SConstruct => SConstruct +2 -0
@@ 77,3 77,5 @@ Options:""" + opts.GenerateHelpText(env))

Export('env')
SConscript(['src/SConscript', 'data/SConscript', 'po/SConscript'])

print ("WARNING: the SCons build for Elfelli is deprecated, please consider using CMake")

A ci/build.sh => ci/build.sh +9 -0
@@ 0,0 1,9 @@
#!/bin/sh

set -e

if [ -n "$USE_SCONS" ]; then
  scons -j3
else
  cmake . && make -j3
fi