diff --git a/.travis.yml b/.travis.yml index 99bb0c1e..8c66b2d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,17 @@ language: c env: matrix: # Note: luarocks does not work with Lua 5.0. - # - LUA=5.0 LUAPKG=50 LUALIB=/usr/lib/liblua50.so - - LUA=5.1 LGIVER= LUAPKG=5.1 LUALIB=/usr/lib/x86_64-linux-gnu/liblua5.1.so - - LUA=5.2 LGIVER= LUAPKG=5.2 LUALIB=/usr/lib/x86_64-linux-gnu/liblua5.2.so BUILD_APIDOC=true - - LUA=5.2 LGIVER=0.7.1 LUAPKG=5.2 LUALIB=/usr/lib/x86_64-linux-gnu/liblua5.2.so + - LUA=5.1 LGIVER= LUANAME=lua5.1 + - LUA=5.2 LGIVER= LUANAME=lua5.2 BUILD_APIDOC=true + - LUA=5.2 LGIVER=0.7.1 LUANAME=lua5.2 + # luajit: requires --lua-suffix=jit-2.0.0-beta9 in Ubuntu precise. + # Later versions seem to provide a `luajit` symlink, so `jit` would be enough. + # See http://packages.ubuntu.com/precise/i386/luajit/filelist. + - LUA=5.1 LGIVER= LUANAME=luajit-5.1 INSTALL_PKGS="luajit" LUAINCLUDE=/usr/include/luajit-2.0 LUAROCKS_ARGS=--lua-suffix=jit-2.0.0-beta9 global: # Secure token to push to gh-pages. - secure: "LZxt9559+V3qJMdVgmKW4RYTt8ZINooex/qsnoEJUtZloj/eFNG4COT2z6a2yeH2tKWzknCsmV9nLPJiNEA2KLcyqDhjFQvJwKmsBuhGUmLyeQgfenjweorRjO8NT18X1SAEUXAMnClPu+OeTDs4BAuVn5foGZ7xpcRg2E+j2mc=" - before_install: - cmake --version @@ -26,7 +28,7 @@ install: - sudo apt-get install libcairo2-dev xmlto asciidoc libpango1.0-dev gperf luadoc libxcb-xtest0-dev libxcb-icccm4-dev libxcb-randr0-dev libxcb-keysyms1-dev libxcb-xinerama0-dev libxcb-image0-dev libev-dev libimlib2-dev libdbus-1-dev libxdg-basedir-dev libstartup-notification0-dev imagemagick libxcb1-dev libxcb-shape0-dev libxcb-util0-dev libxcursor-dev libx11-xcb-dev # Install Lua (per env). - - sudo apt-get install liblua${LUAPKG}-dev lua${LUAPKG} + - sudo apt-get install lib${LUANAME}-dev ${LUANAME} ${INSTALL_PKGS} # For missing libxcb-cursor-dev. - sudo apt-get install -qq xutils-dev libxcb-render-util0-dev gperf @@ -68,11 +70,13 @@ install: # - sudo apt-get install -qq lua-lgi - sudo apt-get install -qq gir1.2-pango-1.0 + - if [ -z $LUAINCLUDE ]; then LUAINCLUDE=/usr/include/${LUANAME}; fi + # Install luarocks (for the selected Lua version). - wget http://keplerproject.github.io/luarocks/releases/luarocks-2.2.2.tar.gz - tar xf luarocks-2.2.2.tar.gz - cd luarocks-2.2.2 - - ./configure --lua-version=$LUA + - ./configure --lua-version=$LUA --with-lua-include=${LUAINCLUDE} ${LUAROCKS_ARGS} - make build - sudo make install - cd .. @@ -100,7 +104,7 @@ install: - 'if [ "$TRAVIS_PULL_REQUEST" != false ]; then AWESOME_VERSION="${AWESOME_VERSION}-PR${TRAVIS_PULL_REQUEST}"; fi' script: - - export CMAKE_ARGS="-DLUA_LIBRARY=${LUALIB} -DLUA_INCLUDE_DIR=/usr/include/lua${LUAPKG} -D OVERRIDE_VERSION=$AWESOME_VERSION" + - export CMAKE_ARGS="-DLUA_LIBRARY=/usr/lib/x86_64-linux-gnu/lib${LUANAME}.so -DLUA_INCLUDE_DIR=${LUAINCLUDE} -D OVERRIDE_VERSION=$AWESOME_VERSION" - make && sudo env PATH=$PATH make install && awesome --version && tests/run.sh after_success: