分离3个平台的bin

65 files changed, 19 insertions, 18 deletions

diff --git a/.gitignore b/.gitignore
index ba0fe619..cacc09c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ node_modules
 .vscode-test
 .vscode/ipch
 /server/log
-/server/bin
 /server/*.so
 /publish
 /build/
diff --git a/server/bin-linux/bee.so b/server/bin-linux/bee.so
new file mode 100644
index 00000000..0ad25b90
--- /dev/null
+++ b/server/bin-linux/bee.so
diff --git a/server/bin-linux/lni.so b/server/bin-linux/lni.so
new file mode 100644
index 00000000..27b13291
--- /dev/null
+++ b/server/bin-linux/lni.so
diff --git a/server/bin-linux/lpeglabel.so b/server/bin-linux/lpeglabel.so
new file mode 100644
index 00000000..d42dc55d
--- /dev/null
+++ b/server/bin-linux/lpeglabel.so
diff --git a/server/bin-linux/lua-language-server b/server/bin-linux/lua-language-server
new file mode 100644
index 00000000..d4eb7132
--- /dev/null
+++ b/server/bin-linux/lua-language-server
diff --git a/server/bin-macos/bee.so b/server/bin-macos/bee.so
new file mode 100644
index 00000000..811e6ffe
--- /dev/null
+++ b/server/bin-macos/bee.so
diff --git a/server/bin-macos/lni.so b/server/bin-macos/lni.so
new file mode 100644
index 00000000..ba414472
--- /dev/null
+++ b/server/bin-macos/lni.so
diff --git a/server/bin-macos/lpeglabel.so b/server/bin-macos/lpeglabel.so
new file mode 100644
index 00000000..e4f334b5
--- /dev/null
+++ b/server/bin-macos/lpeglabel.so
diff --git a/server/bin-macos/lua-language-server b/server/bin-macos/lua-language-server
new file mode 100644
index 00000000..cdc8b473
--- /dev/null
+++ b/server/bin-macos/lua-language-server
diff --git a/server/bin-windows/api-ms-win-core-console-l1-1-0.dll b/server/bin-windows/api-ms-win-core-console-l1-1-0.dll
new file mode 100644
index 00000000..528187c0
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-console-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-console-l1-2-0.dll b/server/bin-windows/api-ms-win-core-console-l1-2-0.dll
new file mode 100644
index 00000000..4545f22c
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-console-l1-2-0.dll
diff --git a/server/bin-windows/api-ms-win-core-datetime-l1-1-0.dll b/server/bin-windows/api-ms-win-core-datetime-l1-1-0.dll
new file mode 100644
index 00000000..4395104f
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-datetime-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-debug-l1-1-0.dll b/server/bin-windows/api-ms-win-core-debug-l1-1-0.dll
new file mode 100644
index 00000000..343fa8e7
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-debug-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-errorhandling-l1-1-0.dll b/server/bin-windows/api-ms-win-core-errorhandling-l1-1-0.dll
new file mode 100644
index 00000000..072e0dc9
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-errorhandling-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-file-l1-1-0.dll b/server/bin-windows/api-ms-win-core-file-l1-1-0.dll
new file mode 100644
index 00000000..38c645ba
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-file-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-file-l1-2-0.dll b/server/bin-windows/api-ms-win-core-file-l1-2-0.dll
new file mode 100644
index 00000000..6f99bb83
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-file-l1-2-0.dll
diff --git a/server/bin-windows/api-ms-win-core-file-l2-1-0.dll b/server/bin-windows/api-ms-win-core-file-l2-1-0.dll
new file mode 100644
index 00000000..91a95599
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-file-l2-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-handle-l1-1-0.dll b/server/bin-windows/api-ms-win-core-handle-l1-1-0.dll
new file mode 100644
index 00000000..efaf918a
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-handle-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-heap-l1-1-0.dll b/server/bin-windows/api-ms-win-core-heap-l1-1-0.dll
new file mode 100644
index 00000000..8368d956
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-heap-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-interlocked-l1-1-0.dll b/server/bin-windows/api-ms-win-core-interlocked-l1-1-0.dll
new file mode 100644
index 00000000..2626b5f2
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-interlocked-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-libraryloader-l1-1-0.dll b/server/bin-windows/api-ms-win-core-libraryloader-l1-1-0.dll
new file mode 100644
index 00000000..62b03d54
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-libraryloader-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-localization-l1-2-0.dll b/server/bin-windows/api-ms-win-core-localization-l1-2-0.dll
new file mode 100644
index 00000000..4d9cf6eb
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-localization-l1-2-0.dll
diff --git a/server/bin-windows/api-ms-win-core-memory-l1-1-0.dll b/server/bin-windows/api-ms-win-core-memory-l1-1-0.dll
new file mode 100644
index 00000000..2c42c9ab
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-memory-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-namedpipe-l1-1-0.dll b/server/bin-windows/api-ms-win-core-namedpipe-l1-1-0.dll
new file mode 100644
index 00000000..b92a7e32
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-namedpipe-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-processenvironment-l1-1-0.dll b/server/bin-windows/api-ms-win-core-processenvironment-l1-1-0.dll
new file mode 100644
index 00000000..1607de8a
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-processenvironment-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-processthreads-l1-1-0.dll b/server/bin-windows/api-ms-win-core-processthreads-l1-1-0.dll
new file mode 100644
index 00000000..73fe6630
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-processthreads-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-processthreads-l1-1-1.dll b/server/bin-windows/api-ms-win-core-processthreads-l1-1-1.dll
new file mode 100644
index 00000000..c194fef3
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-processthreads-l1-1-1.dll
diff --git a/server/bin-windows/api-ms-win-core-profile-l1-1-0.dll b/server/bin-windows/api-ms-win-core-profile-l1-1-0.dll
new file mode 100644
index 00000000..53c22643
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-profile-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-rtlsupport-l1-1-0.dll b/server/bin-windows/api-ms-win-core-rtlsupport-l1-1-0.dll
new file mode 100644
index 00000000..215af2e7
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-rtlsupport-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-string-l1-1-0.dll b/server/bin-windows/api-ms-win-core-string-l1-1-0.dll
new file mode 100644
index 00000000..eb16d630
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-string-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-synch-l1-1-0.dll b/server/bin-windows/api-ms-win-core-synch-l1-1-0.dll
new file mode 100644
index 00000000..a8325604
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-synch-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-synch-l1-2-0.dll b/server/bin-windows/api-ms-win-core-synch-l1-2-0.dll
new file mode 100644
index 00000000..98afd0cc
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-synch-l1-2-0.dll
diff --git a/server/bin-windows/api-ms-win-core-sysinfo-l1-1-0.dll b/server/bin-windows/api-ms-win-core-sysinfo-l1-1-0.dll
new file mode 100644
index 00000000..e87aa679
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-sysinfo-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-timezone-l1-1-0.dll b/server/bin-windows/api-ms-win-core-timezone-l1-1-0.dll
new file mode 100644
index 00000000..9759c75d
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-timezone-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-core-util-l1-1-0.dll b/server/bin-windows/api-ms-win-core-util-l1-1-0.dll
new file mode 100644
index 00000000..7260a18b
--- /dev/null
+++ b/server/bin-windows/api-ms-win-core-util-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-conio-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-conio-l1-1-0.dll
new file mode 100644
index 00000000..04804096
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-conio-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-convert-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-convert-l1-1-0.dll
new file mode 100644
index 00000000..591a0195
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-convert-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-environment-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-environment-l1-1-0.dll
new file mode 100644
index 00000000..b88ac28a
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-environment-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-filesystem-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-filesystem-l1-1-0.dll
new file mode 100644
index 00000000..c60772a3
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-filesystem-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-heap-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-heap-l1-1-0.dll
new file mode 100644
index 00000000..d413aada
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-heap-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-locale-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-locale-l1-1-0.dll
new file mode 100644
index 00000000..e1bb5434
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-locale-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-math-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-math-l1-1-0.dll
new file mode 100644
index 00000000..b90ddb52
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-math-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-multibyte-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-multibyte-l1-1-0.dll
new file mode 100644
index 00000000..1eecd421
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-multibyte-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-private-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-private-l1-1-0.dll
new file mode 100644
index 00000000..3051e757
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-private-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-process-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-process-l1-1-0.dll
new file mode 100644
index 00000000..ab8d6327
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-process-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-runtime-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-runtime-l1-1-0.dll
new file mode 100644
index 00000000..ff1c19af
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-runtime-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-stdio-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-stdio-l1-1-0.dll
new file mode 100644
index 00000000..9e9e6e17
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-stdio-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-string-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-string-l1-1-0.dll
new file mode 100644
index 00000000..af71a1ab
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-string-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-time-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-time-l1-1-0.dll
new file mode 100644
index 00000000..8ed94cda
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-time-l1-1-0.dll
diff --git a/server/bin-windows/api-ms-win-crt-utility-l1-1-0.dll b/server/bin-windows/api-ms-win-crt-utility-l1-1-0.dll
new file mode 100644
index 00000000..e836e8c1
--- /dev/null
+++ b/server/bin-windows/api-ms-win-crt-utility-l1-1-0.dll
diff --git a/server/bin-windows/bee.dll b/server/bin-windows/bee.dll
new file mode 100644
index 00000000..e921ebf4
--- /dev/null
+++ b/server/bin-windows/bee.dll
diff --git a/server/bin-windows/concrt140.dll b/server/bin-windows/concrt140.dll
new file mode 100644
index 00000000..66f454eb
--- /dev/null
+++ b/server/bin-windows/concrt140.dll
diff --git a/server/bin-windows/lni.dll b/server/bin-windows/lni.dll
new file mode 100644
index 00000000..40a8797a
--- /dev/null
+++ b/server/bin-windows/lni.dll
diff --git a/server/bin-windows/lpeglabel.dll b/server/bin-windows/lpeglabel.dll
new file mode 100644
index 00000000..b14646c3
--- /dev/null
+++ b/server/bin-windows/lpeglabel.dll
diff --git a/server/bin-windows/lua-language-server.exe b/server/bin-windows/lua-language-server.exe
new file mode 100644
index 00000000..6ec57665
--- /dev/null
+++ b/server/bin-windows/lua-language-server.exe
diff --git a/server/bin-windows/lua54.dll b/server/bin-windows/lua54.dll
new file mode 100644
index 00000000..3f923d8e
--- /dev/null
+++ b/server/bin-windows/lua54.dll
diff --git a/server/bin-windows/msvcp140.dll b/server/bin-windows/msvcp140.dll
new file mode 100644
index 00000000..47065157
--- /dev/null
+++ b/server/bin-windows/msvcp140.dll
diff --git a/server/bin-windows/msvcp140_1.dll b/server/bin-windows/msvcp140_1.dll
new file mode 100644
index 00000000..e98be2cc
--- /dev/null
+++ b/server/bin-windows/msvcp140_1.dll
diff --git a/server/bin-windows/msvcp140_2.dll b/server/bin-windows/msvcp140_2.dll
new file mode 100644
index 00000000..f7296c23
--- /dev/null
+++ b/server/bin-windows/msvcp140_2.dll
diff --git a/server/bin-windows/ucrtbase.dll b/server/bin-windows/ucrtbase.dll
new file mode 100644
index 00000000..e05d4de2
--- /dev/null
+++ b/server/bin-windows/ucrtbase.dll
diff --git a/server/bin-windows/vcruntime140.dll b/server/bin-windows/vcruntime140.dll
new file mode 100644
index 00000000..64e50168
--- /dev/null
+++ b/server/bin-windows/vcruntime140.dll
diff --git a/server/main.lua b/server/main.lua
index 754e3759..cc136079 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -3,11 +3,7 @@ local rootPath = currentPath:gsub('[^/\\]-$', '')
 if rootPath == '' then
     rootPath = './'
 end
-package.cpath = rootPath .. 'bin/?.so'
-      .. ';' .. rootPath .. 'bin/?.dll'
-package.path  = rootPath .. 'src/?.lua'
-      .. ';' .. rootPath .. 'src/?/init.lua'
-
+dofile(rootPath .. 'platform.lua')
 local fs = require 'bee.filesystem'
 ROOT = fs.absolute(fs.path(rootPath):parent_path())
 LANG = LANG or 'en-US'
diff --git a/server/platform.lua b/server/platform.lua
new file mode 100644
index 00000000..cfed5287
--- /dev/null
+++ b/server/platform.lua
@@ -0,0 +1,16 @@
+local currentPath = debug.getinfo(1, 'S').source:sub(2)
+local rootPath = currentPath:gsub('[^/\\]-$', '')
+if rootPath == '' then
+    rootPath = './'
+end
+
+package.path  = rootPath .. 'src/?.lua'
+      .. ';' .. rootPath .. 'src/?/init.lua'
+
+if package.loadlib(rootPath .. '/bin-macos/bee.so', 'luaopen_bee_platform') then
+    package.cpath = rootPath .. 'bin-macos/?.so'
+elseif package.loadlib(rootPath .. '/bin-linux/bee.so', 'luaopen_bee_platform') then
+    package.cpath = rootPath .. 'bin-linux/?.so'
+elseif package.loadlib(rootPath .. '/bin-windows/bee.dll', 'luaopen_bee_platform') then
+    package.cpath = rootPath .. 'bin-windows/?.dll'
+end
diff --git a/server/publish.lua b/server/publish.lua
index 94a2521a..9437d85e 100644
--- a/server/publish.lua
+++ b/server/publish.lua
@@ -3,11 +3,7 @@ local rootPath = currentPath:gsub('[^/\\]-$', '')
 if rootPath == '' then
     rootPath = './'
 end
-package.cpath = rootPath .. 'bin/?.so'
-      .. ';' .. rootPath .. 'bin/?.dll'
-package.path  = rootPath .. 'src/?.lua'
-      .. ';' .. rootPath .. 'src/?/init.lua'
-
+dofile(rootPath .. 'platform.lua')
 local fs = require 'bee.filesystem'
 local subprocess = require 'bee.subprocess'
 local platform = require 'bee.platform'
diff --git a/server/test.lua b/server/test.lua
index b1945a0e..b6ff2c7c 100644
--- a/server/test.lua
+++ b/server/test.lua
@@ -3,13 +3,7 @@ local rootPath = currentPath:gsub('[^/\\]-$', '')
 if rootPath == '' then
     rootPath = './'
 end
-package.cpath = rootPath .. 'bin/?.so'
-      .. ';' .. rootPath .. 'bin/?.dll'
-package.path  = rootPath .. 'test/?.lua'
-      .. ';' .. rootPath .. 'test/?/init.lua'
-      .. ';' .. rootPath .. 'src/?.lua'
-      .. ';' .. rootPath .. 'src/?/init.lua'
-
+dofile(rootPath .. 'platform.lua')
 local fs = require 'bee.filesystem'
 ROOT = fs.absolute(fs.path(rootPath):parent_path())
 LANG = 'en-US'