build: use lua v5.4.6 from xmake-repo

LiteLDev · Jan 25, 2024 · 1f251fc · 1f251fc
1 parent 929cc00
commit 1f251fc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,13 +18,13 @@ jobs:
 
       - uses: xmake-io/github-action-setup-xmake@v1
 
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/AppData/Local/.xmake
-          key: xmake-${{ hashFiles('xmake.lua') }}
-          restore-keys: |
-            xmake-
+      # - uses: actions/cache@v4
+      #   with:
+      #     path: |
+      #       ~/AppData/Local/.xmake
+      #     key: xmake-${{ hashFiles('xmake.lua') }}
+      #     restore-keys: |
+      #       xmake-
 
       - run: |
           xmake repo -u

diff --git a/xmake.lua b/xmake.lua
@@ -23,15 +23,6 @@ option("backend")
     set_default("lua")
     set_values("libnode", "lua", "python310", "quickjs")
 
-package("lua")
-    add_urls("https://github.com/LiteLDev/ScriptX/releases/download/v0.1.0/lua-5.4.2_Win64_vc17_lib.zip")
-    add_versions("0.0.0", "ea586157b104e3d4635dfa9ae2fa2245ba6afca22b5a93147c398a43d2d5688b")
-
-    on_install(function (package)
-        os.cp("include/*", package:installdir("include"))
-        os.cp("lua54.lib", package:installdir("lib"))
-    end)
-
 package("quickjs")
     add_urls("https://github.com/LiteLDev/ScriptX/releases/download/v0.1.0/scriptx-windows-x64.zip")
     add_versions("0.0.0", "d47729b73f37eaeb6c5dead4301e16feffd692ca10156a42449826997a1256c2")
@@ -44,7 +35,7 @@ package("quickjs")
 package("scriptx")
     add_configs("backend", {default = "lua", values = {"libnode", "lua", "python310", "quickjs"}})
     add_includedirs(
-        "include/scriptx/src/include/"
+        "include/src/include/"
     )
     add_urls("https://github.com/LiteLDev/ScriptX/releases/download/v0.1.0/scriptx-windows-x64.zip")
     add_versions("0.0.0", "d47729b73f37eaeb6c5dead4301e16feffd692ca10156a42449826997a1256c2")
@@ -66,6 +57,13 @@ package("scriptx")
     on_load(function (package)
         local backend = package:config("backend")
 
+        local deps = {
+            libnode = "v8",
+            lua = "lua v5.4.6",
+            python310 = "python",
+            quickjs = "quickjs",
+        }
+
         local scriptx_backends = {
             libnode = "V8",
             lua = "Lua",
@@ -77,7 +75,7 @@ package("scriptx")
 
         package:add("defines", "SCRIPTX_BACKEND=" .. scriptx_backends[backend])
         package:add("defines", "SCRIPTX_BACKEND_TRAIT_PREFIX=../backend/" .. scriptx_backends[backend] .. "/trait/Trait")
-        package:add("deps", backend)
+        package:add("deps", deps[backend])
     end)
 
 target("legacy-script-engine")