From dbca306198275bdaeadacf1e2bf485059028b716 Mon Sep 17 00:00:00 2001
From: Aditya Alok <dev.aditya.alok@gmail.com>
Date: Sat, 16 Oct 2021 17:53:20 +0530
Subject: [PATCH] lua-language-server: update to 2.4.5

lua-language-server: fix `install_path.patch`

lua-language-server: update `unittests.patch`

lua-language-server: update `unittests.patch` and rename to `make.lua.patch`
---
 packages/lua-language-server/install_os.patch | 11 ------
 .../lua-language-server/install_path.patch    | 13 +++++++
 packages/lua-language-server/make.lua.patch   | 39 +++++++++++++++++++
 packages/lua-language-server/unittests.patch  | 19 ---------
 4 files changed, 52 insertions(+), 30 deletions(-)
 delete mode 100644 packages/lua-language-server/install_os.patch
 create mode 100644 packages/lua-language-server/install_path.patch
 create mode 100644 packages/lua-language-server/make.lua.patch
 delete mode 100644 packages/lua-language-server/unittests.patch

diff --git a/packages/lua-language-server/install_os.patch b/packages/lua-language-server/install_os.patch
deleted file mode 100644
index d79366cf5..000000000
--- a/packages/lua-language-server/install_os.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lua-language-server/make/install.lua	2021-08-09 14:36:08.073522963 +0530
-+++ lua-language-server-patch/make/install.lua	2021-08-10 10:55:34.845906577 +0530
-@@ -3,7 +3,7 @@
- local pf = require 'bee.platform'
- 
- local CWD = fs.current_path()
--local output = CWD / 'bin' / pf.OS
-+local output = CWD / 'bin' / 'Android'
- local bindir = CWD / builddir / 'bin'
- local exe = pf.OS == 'Windows' and ".exe" or ""
- local dll = pf.OS == 'Windows' and ".dll" or ".so"
diff --git a/packages/lua-language-server/install_path.patch b/packages/lua-language-server/install_path.patch
new file mode 100644
index 000000000..835762126
--- /dev/null
+++ b/packages/lua-language-server/install_path.patch
@@ -0,0 +1,13 @@
+'pf.OS' returns 'linux' but output is expected in 'android' dir
+
+--- lua-language-server/make/install.lua	2021-10-15 19:14:29.794791240 +0530
++++ lua-language-server-patch/make/install.lua	2021-10-15 19:16:39.334791191 +0530
+@@ -1,7 +1,7 @@
+ local fs = require 'bee.filesystem'
+ local pf = require 'bee.platform'
+ local CWD = fs.current_path()
+-local output = CWD / 'bin' / pf.OS
++local output = CWD / 'bin' / 'Android'
+ 
+ if pf.OS == 'Windows' then
+     require 'msvc'.copy_vcrt('x64', output)
diff --git a/packages/lua-language-server/make.lua.patch b/packages/lua-language-server/make.lua.patch
new file mode 100644
index 000000000..476837446
--- /dev/null
+++ b/packages/lua-language-server/make.lua.patch
@@ -0,0 +1,39 @@
+--- lua-language-server/make.lua	2021-10-16 18:04:03.750643184 +0530
++++ lua-language-server-patch/make.lua	2021-10-16 18:24:55.260642707 +0530
+@@ -2,7 +2,7 @@
+ local platform = require 'bee.platform'
+ local exe      = platform.OS == 'Windows' and ".exe" or ""
+ 
+-lm.bindir = "bin/"..platform.OS
++lm.bindir = "bin/Android"
+ 
+ lm.EXE_DIR = ""
+ lm.INTERNAL = "on"
+@@ -40,25 +40,8 @@
+     output = lm.bindir.."/main.lua",
+ }
+ 
+-lm:build "bee-test" {
+-    lm.bindir.."/lua-language-server"..exe, "3rd/bee.lua/test/test.lua",
+-    pool = "console",
+-    deps = {
+-        "lua-language-server",
+-        "copy_bootstrap"
+-    },
+-}
+-
+-lm:build 'unit-test' {
+-    lm.bindir.."/lua-language-server"..exe, 'test.lua',
+-    pool = "console",
+-    deps = {
+-        "bee-test",
+-    }
+-}
+-
+ lm:default {
+-    "bee-test",
+-    "unit-test",
++    "lua-language-server",
++    "copy_bootstrap",
+     "install",
+ }
diff --git a/packages/lua-language-server/unittests.patch b/packages/lua-language-server/unittests.patch
deleted file mode 100644
index afcb54ca1..000000000
--- a/packages/lua-language-server/unittests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- lua-language-server/make.lua	2021-10-04 00:13:48.079999941 +0530
-+++ lua-language-server-patch/make.lua	2021-10-04 00:18:30.059999834 +0530
-@@ -21,16 +21,3 @@
-         'bee',
-     }
- }
--
--local fs = require 'bee.filesystem'
--local pf = require 'bee.platform'
--local exe = pf.OS == 'Windows' and ".exe" or ""
--lm:build 'unittest' {
--    fs.path 'bin' / pf.OS / ('lua-language-server' .. exe), 'test.lua', '-E',
--    pool = "console",
--    deps = {
--        'install',
--    }
--}
--
--lm:default 'unittest'