Permalink
Browse files

update preapre for new luarocks, fix test script

  • Loading branch information...
1 parent 4d1c415 commit 3c71b222b9a825fb890795f01fb2481a698fdda7 @leafo committed Oct 24, 2014
Showing with 7 additions and 5 deletions.
  1. +1 −1 Makefile
  2. +3 −1 bin/compile
  3. +1 −1 opt/prepare.lua
  4. +1 −1 opt/prepare.moon
  5. +1 −1 test/package.rockspec
View
@@ -6,4 +6,4 @@ test::
-rm -rf tmp-build
mkdir -p tmp-build
cp test/package.rockspec tmp-build/
- ENV=local bin/compile tmp-build
+ ENV=local STACK=cedar bin/compile tmp-build
View
@@ -36,6 +36,8 @@ if [ "$ENV" != "local" ]; then
export PATH=$OPT_DIR/$STACK:$PATH
echo "LUA_INCDIR=[[$OPT_DIR/../include]]" >> $SITE_CONFIG
echo "LUA_LIBDIR=[[$OPT_DIR/../lib/$STACK/]]" >> $SITE_CONFIG
+else
+ LUA=lua5.1
fi
# use sed because grep halts script with -e when there is no match
@@ -52,5 +54,5 @@ if [[ -z "$ROCKSPEC" ]]; then
exit 1
fi
-$LUA "$OPT_DIR/prepare.lua" $ROCKSPEC $OPT_DIR 2>&1 | indent
+$LUA "$OPT_DIR/prepare.lua" $ROCKSPEC $OPT_DIR 2>&1 # | indent
View
@@ -69,7 +69,7 @@ do
end
path.use_tree(tree)
cfg.deploy_bin_dir = bin
-local success, msg = deps.fulfill_dependencies(rockspec)
+local success, msg = deps.fulfill_dependencies(rockspec, "one")
if not success then
error(msg)
end
View
@@ -59,7 +59,7 @@ path.use_tree tree
cfg.deploy_bin_dir = bin
-success, msg = deps.fulfill_dependencies rockspec
+success, msg = deps.fulfill_dependencies rockspec, "one"
error msg if not success
for extra in *extras
@@ -7,6 +7,6 @@ dependencies = {
config = {
rocks_servers = {
- "http://luarocks.giga.puc-rio.br/"
+ "http://rocks.moonscript.org/"
}
}

0 comments on commit 3c71b22

Please sign in to comment.