Fix lua build script

jangko · Dec 4, 2023 · 0a38323 · 0a38323
1 parent 3b12a20
commit 0a38323
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -228,7 +228,7 @@ jobs:
           mkdir -p "$EXTPATH"
           curl -L https://www.lua.org/ftp/lua-5.3.5.tar.gz -o "$EXTPATH/lua_source.tar.gz"
           tar xfz "$EXTPATH/lua_source.tar.gz" -C "$EXTPATH"
-          mv "$EXTPATH/lua-5.3.5" "$EXTPATH/lua"
+          mv "$EXTPATH/lua-5.3.5" lua
           cd nimLUA
           nim e scripts/build_static_lib.nims
           cd ..

diff --git a/nimLUA.nimble b/nimLUA.nimble
@@ -28,9 +28,11 @@ proc test(env, path: string) =
 
   if not dirExists "build":
     mkDir "build"
-  exec "nim " & lang & " " & env &
+  let cmd = "nim " & lang & " " & env &
     " --outdir:build -r --hints:off --warnings:off " &
     " -d:lua_static_lib --passL:\"-Lexternal -llua " & libm & " \" " & path
+  echo cmd
+  exec cmd
 
 task test, "Run all tests":
   test "-d:nimDebugDlOpen", "tests/test_features"

diff --git a/scripts/build.nims b/scripts/build.nims
@@ -44,7 +44,7 @@ proc toString(names: seq[string]): string =
     result.add c
     result.add " "
 
-let src = getCFiles("external" / "lua" / "src")
+let src = getCFiles("lua" / "src")
 var objs: seq[string] = @[]
 
 for x in src:

diff --git a/scripts/build_static_lib.nims b/scripts/build_static_lib.nims
@@ -23,7 +23,7 @@ proc toString(names: seq[string]): string =
     result.add " "
 
 proc objList(): string =
-  let src = getCFiles("external" / "lua" / "src")
+  let src = getCFiles("lua" / "src")
   var objs: seq[string] = @[]
 
   for x in src: