Skip to content

Commit

Permalink
Use luajit binary for luarocks
Browse files Browse the repository at this point in the history
  • Loading branch information
coldfix committed Mar 8, 2017
1 parent 86e9966 commit dfd3120
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 16 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ before_install:
- SILENT .travis/build_nfft3.sh
# - SILENT .travis/build_nlopt2.sh

# For coverage:
- SILENT .travis/build_luarocks.sh
- SILENT luarocks install luacov
- SILENT luarocks install luacov-coveralls

# Build MAD:
install:
- cd src
Expand All @@ -45,11 +50,6 @@ install:
- mkdir -p $PREFIX/bin
- ln -s $(readlink -f ./src/mad) $PREFIX/bin

# These should be before_install, but we can't install them until we have 'mad':
- SILENT .travis/build_luarocks.sh
- SILENT luarocks install luacov
- SILENT luarocks install luacov-coveralls

# Run tests:
script:
- cd tests/utests
Expand Down
5 changes: 3 additions & 2 deletions .travis/build_luarocks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ tar -xzf $LUAROCKS.tar.gz
# build
cd $LUAROCKS
./configure --prefix=${PREFIX-$MAD_ROOT/install} \
--with-lua-bin=$MAD_ROOT/.travis \
--with-lua-bin=$LUA_ROOT/bin \
--with-lua-include=$LUA_ROOT/include/luajit-2.1 \
--with-lua=$LUA_ROOT
--with-lua=$LUA_ROOT \
--lua-suffix=jit
make build
make install
9 changes: 0 additions & 9 deletions .travis/lua51

This file was deleted.

0 comments on commit dfd3120

Please sign in to comment.