Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions scripts/build-lua.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ run_quiet() {
return 0
else
local rc=$?
echo " BUILD FAILED (exit $rc) output:"
echo " BUILD FAILED (exit $rc), output:"
cat "$log"
return $rc
fi
Expand Down Expand Up @@ -70,7 +70,7 @@ build_lua() {

if [[ -x "$BIN_DIR/$name" ]]; then
local size; size="$(wc -c < "$BIN_DIR/$name")"
echo " $name ($version) already built ($(human_size "$size")), skipping"
echo " $name ($version): already built ($(human_size "$size")), skipping"
return
fi

Expand All @@ -97,7 +97,7 @@ build_lua() {

local size; size="$(wc -c < "$BIN_DIR/$name")"
local reported; reported="$("$BIN_DIR/$name" -v 2>&1 | head -1)"
echo " $name ($version) done ($(elapsed_since "$start_time")s, $(human_size "$size")) [$reported]"
echo " $name ($version): done ($(elapsed_since "$start_time")s, $(human_size "$size")) [$reported]"
}

build_luajit() {
Expand All @@ -107,7 +107,7 @@ build_luajit() {

if [[ -x "$BIN_DIR/$name" ]]; then
local size; size="$(wc -c < "$BIN_DIR/$name")"
echo " $name ($version) already built ($(human_size "$size")), skipping"
echo " $name ($version): already built ($(human_size "$size")), skipping"
return
fi

Expand All @@ -126,7 +126,7 @@ build_luajit() {

local size; size="$(wc -c < "$BIN_DIR/$name")"
local reported; reported="$("$BIN_DIR/$name" -v 2>&1 | head -1)"
echo " $name ($version) done ($(elapsed_since "$start_time")s, $(human_size "$size")) [$reported]"
echo " $name ($version): done ($(elapsed_since "$start_time")s, $(human_size "$size")) [$reported]"
}

download_lune() {
Expand All @@ -135,7 +135,7 @@ download_lune() {

if [[ -x "$BIN_DIR/$name" ]]; then
local size; size="$(wc -c < "$BIN_DIR/$name")"
echo " $name ($version) already installed ($(human_size "$size")), skipping"
echo " $name ($version): already installed ($(human_size "$size")), skipping"
return
fi

Expand Down Expand Up @@ -163,10 +163,10 @@ download_lune() {

local size; size="$(wc -c < "$BIN_DIR/$name")"
local reported; reported="$("$BIN_DIR/$name" --version 2>&1 | head -1)"
echo " $name ($version) done ($(elapsed_since "$start_time")s, $(human_size "$size")) [$reported]"
echo " $name ($version): done ($(elapsed_since "$start_time")s, $(human_size "$size")) [$reported]"
}

echo "Building Lua runtimes $BIN_DIR"
echo "Building Lua runtimes -> $BIN_DIR"
echo "Platform: $PLATFORM"
echo ""

Expand Down
8 changes: 7 additions & 1 deletion scripts/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ check_optional luajit "just tstltest / tstl-test"
check_optional lua5.1 "just tstltest with Lua 5.1 target"
check_optional goimports "just fmt"
check_optional golangci-lint "just lint"
check_optional curl "just build-lua"
check_optional tar "just build-lua"
check_optional make "just build-lua"
check_optional cc "just build-lua"
check_optional unzip "just build-lua"
check_optional perl "just build-lua"

if [ "$err" -ne 0 ]; then
echo ""
Expand All @@ -50,7 +56,7 @@ echo "Applying TSTL patches..."

echo ""
echo "Installing npm dependencies..."
npm install
npm ci

echo ""
echo "Setting up TSTL test suite..."
Expand Down