aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml1
-rwxr-xr-xmakedist7
2 files changed, 7 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 466177f9..72f96db4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,6 +64,7 @@ install:
64 64
65script: 65script:
66 - lua -v 66 - lua -v
67 - ./makedist scm
67 - busted -o gtest --verbose -Xhelper "lua_dir=$PWD/lua_install,travis" 68 - busted -o gtest --verbose -Xhelper "lua_dir=$PWD/lua_install,travis"
68 - busted -o gtest --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full" 69 - busted -o gtest --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full"
69 70
diff --git a/makedist b/makedist
index 5e22b688..5e5e3461 100755
--- a/makedist
+++ b/makedist
@@ -1,4 +1,4 @@
1#!/bin/sh 1#!/bin/bash -e
2 2
3if ! [ "$1" ] 3if ! [ "$1" ]
4then 4then
@@ -14,6 +14,9 @@ fi
14 14
15make clean || exit 1 15make clean || exit 1
16 16
17if [ "$1" != "scm" ]
18then
19
17grep -q "\"$1\"" rockspec || { 20grep -q "\"$1\"" rockspec || {
18 echo 21 echo
19 echo "version in rockspec is incorrect. Please fix it." 22 echo "version in rockspec is incorrect. Please fix it."
@@ -53,6 +56,8 @@ grep -q "vars.VERSION = \"$program_series\"" install.bat || {
53 exit 1 56 exit 1
54} 57}
55 58
59fi
60
56out="luarocks-$1" 61out="luarocks-$1"
57rm -rf "$out" 62rm -rf "$out"
58mkdir "$out" 63mkdir "$out"