From 414c8697b631f20c5b19b8b5d1ab758b561b09fe Mon Sep 17 00:00:00 2001 From: actboy168 Date: Tue, 7 May 2024 13:04:12 +0800 Subject: [PATCH] update bee --- bee.lua | 2 +- compile/ninja/android.ninja | 47 ++++++++++++++++-------------- compile/ninja/freebsd.ninja | 47 ++++++++++++++++-------------- compile/ninja/linux.ninja | 49 +++++++++++++++++-------------- compile/ninja/macos.ninja | 49 +++++++++++++++++-------------- compile/ninja/mingw.ninja | 55 +++++++++++++++++++---------------- compile/ninja/msvc.ninja | 57 ++++++++++++++++++++----------------- compile/ninja/netbsd.ninja | 49 +++++++++++++++++-------------- compile/ninja/openbsd.ninja | 50 +++++++++++++++++--------------- 9 files changed, 222 insertions(+), 183 deletions(-) diff --git a/bee.lua b/bee.lua index 72ac536..efdc469 160000 --- a/bee.lua +++ b/bee.lua @@ -1 +1 @@ -Subproject commit 72ac53691da270b164549cbca69309d02b9befe9 +Subproject commit efdc4695bf6943fc1bb92d26a47dd0a37df2d2df diff --git a/compile/ninja/android.ninja b/compile/ninja/android.ninja index 27857ae..2d752bb 100644 --- a/compile/ninja/android.ninja +++ b/compile/ninja/android.ninja @@ -35,6 +35,7 @@ build $obj/source_bee/bpoll_linux.obj: cxx_source_bee_1 $ bee.lua/bee/net/bpoll_linux.cpp build $obj/source_bee/endpoint.obj: cxx_source_bee_1 $ bee.lua/bee/net/endpoint.cpp +build $obj/source_bee/event.obj: cxx_source_bee_1 bee.lua/bee/net/event.cpp build $obj/source_bee/socket.obj: cxx_source_bee_1 bee.lua/bee/net/socket.cpp build $obj/source_bee/process_select.obj: cxx_source_bee_1 $ bee.lua/bee/subprocess/process_select.cpp @@ -66,6 +67,8 @@ rule cxx_source_bee_2 description = Compile C++ $out deps = gcc depfile = $out.d +build $obj/source_bee/lua_channel.obj: cxx_source_bee_2 $ + bee.lua/binding/lua_channel.cpp build $obj/source_bee/lua_debugging.obj: cxx_source_bee_2 $ bee.lua/binding/lua_debugging.cpp build $obj/source_bee/lua_epoll.obj: cxx_source_bee_2 $ @@ -96,16 +99,17 @@ rule c_source_lua depfile = $out.d build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c -rule cxx_bootstrap +rule cxx_source_bootstrap command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $ -DNDEBUG -o $out -c $in description = Compile C++ $out deps = gcc depfile = $out.d -build $obj/bootstrap/main.obj: cxx_bootstrap bee.lua/bootstrap/main.cpp +build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $ + bee.lua/bootstrap/main.cpp rule link_bootstrap - command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++ -Wl,-S,-x + command = $cc $in -o $out -Wl,-E -lm -ldl -lstdc++ -Wl,-S,-x description = Link Exe $out rule copy command = cp -fv $in$input $out 1>/dev/null @@ -115,11 +119,11 @@ rule test command = $bin/bootstrap bee.lua/test/test.lua --touch $out description = Run test. pool = console -build $bin/bootstrap: link_bootstrap $obj/bootstrap/main.obj $ - $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $ - $obj/source_bee/error.obj $obj/source_bee/filewatch_linux.obj $ - $obj/source_bee/file.obj $obj/source_bee/luaref.obj $ - $obj/source_bee/bpoll_linux.obj $obj/source_bee/endpoint.obj $ +build $bin/bootstrap: link_bootstrap $obj/source_bee/lua-seri.obj $ + $obj/source_bee/format.obj $obj/source_bee/error.obj $ + $obj/source_bee/filewatch_linux.obj $obj/source_bee/file.obj $ + $obj/source_bee/luaref.obj $obj/source_bee/bpoll_linux.obj $ + $obj/source_bee/endpoint.obj $obj/source_bee/event.obj $ $obj/source_bee/socket.obj $obj/source_bee/process_select.obj $ $obj/source_bee/subprocess_posix.obj $obj/source_bee/file_handle.obj $ $obj/source_bee/file_handle_linux.obj $ @@ -127,24 +131,25 @@ build $bin/bootstrap: link_bootstrap $obj/bootstrap/main.obj $ $obj/source_bee/path_posix.obj $obj/source_bee/atomic_sync.obj $ $obj/source_bee/setname.obj $obj/source_bee/simplethread_posix.obj $ $obj/source_bee/spinlock.obj $obj/source_bee/version.obj $ - $obj/source_bee/lua_debugging.obj $obj/source_bee/lua_epoll.obj $ - $obj/source_bee/lua_filesystem.obj $obj/source_bee/lua_filewatch.obj $ - $obj/source_bee/lua_platform.obj $obj/source_bee/lua_select.obj $ - $obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $ - $obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $ - $obj/source_bee/lua_time.obj $obj/source_lua/linit.obj $ - $obj/source_lua/onelua.obj + $obj/source_bee/lua_channel.obj $obj/source_bee/lua_debugging.obj $ + $obj/source_bee/lua_epoll.obj $obj/source_bee/lua_filesystem.obj $ + $obj/source_bee/lua_filewatch.obj $obj/source_bee/lua_platform.obj $ + $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $ + $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $ + $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $ + $obj/source_lua/linit.obj $obj/source_lua/onelua.obj $ + $obj/source_bootstrap/main.obj build $bin/main.lua: copy | $bin/bootstrap input = bee.lua/bootstrap/main.lua build $obj/test.stamp: test bee.lua/test/glibc-version.lua $ bee.lua/test/ltest.lua bee.lua/test/shell.lua $ bee.lua/test/supported.lua bee.lua/test/test.lua $ - bee.lua/test/test_epoll.lua bee.lua/test/test_filesystem.lua $ - bee.lua/test/test_filewatch.lua bee.lua/test/test_lua.lua $ - bee.lua/test/test_serialization.lua bee.lua/test/test_skip.lua $ - bee.lua/test/test_socket.lua bee.lua/test/test_subprocess.lua $ - bee.lua/test/test_thread.lua bee.lua/test/test_time.lua | $ - $bin/bootstrap copy_script + bee.lua/test/test_channel.lua bee.lua/test/test_epoll.lua $ + bee.lua/test/test_filesystem.lua bee.lua/test/test_filewatch.lua $ + bee.lua/test/test_lua.lua bee.lua/test/test_serialization.lua $ + bee.lua/test/test_skip.lua bee.lua/test/test_socket.lua $ + bee.lua/test/test_subprocess.lua bee.lua/test/test_thread.lua $ + bee.lua/test/test_time.lua | $bin/bootstrap copy_script build luamake: copy | $bin/bootstrap input = $bin/bootstrap build bootstrap: phony $bin/bootstrap diff --git a/compile/ninja/freebsd.ninja b/compile/ninja/freebsd.ninja index 73abb80..3d35c95 100644 --- a/compile/ninja/freebsd.ninja +++ b/compile/ninja/freebsd.ninja @@ -36,6 +36,7 @@ build $obj/source_bee/bpoll_bsd.obj: cxx_source_bee_1 $ bee.lua/bee/net/bpoll_bsd.cpp build $obj/source_bee/endpoint.obj: cxx_source_bee_1 $ bee.lua/bee/net/endpoint.cpp +build $obj/source_bee/event.obj: cxx_source_bee_1 bee.lua/bee/net/event.cpp build $obj/source_bee/socket.obj: cxx_source_bee_1 bee.lua/bee/net/socket.cpp build $obj/source_bee/process_select.obj: cxx_source_bee_1 $ bee.lua/bee/subprocess/process_select.cpp @@ -67,6 +68,8 @@ rule cxx_source_bee_2 description = Compile C++ $out deps = gcc depfile = $out.d +build $obj/source_bee/lua_channel.obj: cxx_source_bee_2 $ + bee.lua/binding/lua_channel.cpp build $obj/source_bee/lua_debugging.obj: cxx_source_bee_2 $ bee.lua/binding/lua_debugging.cpp build $obj/source_bee/lua_epoll.obj: cxx_source_bee_2 $ @@ -97,16 +100,17 @@ rule c_source_lua depfile = $out.d build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c -rule cxx_bootstrap +rule cxx_source_bootstrap command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $ -DNDEBUG -o $out -c $in description = Compile C++ $out deps = gcc depfile = $out.d -build $obj/bootstrap/main.obj: cxx_bootstrap bee.lua/bootstrap/main.cpp +build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $ + bee.lua/bootstrap/main.cpp rule link_bootstrap - command = $cc $in -o $out -lm -Wl,-E -linotify -L/usr/local/lib -pthread $ + command = $cc $in -o $out -Wl,-E -linotify -L/usr/local/lib -pthread -lm $ -Wl,--push-state,-Bstatic -lstdc++ -Wl,--pop-state -Wl,-S,-x description = Link Exe $out rule copy @@ -117,11 +121,11 @@ rule test command = $bin/bootstrap bee.lua/test/test.lua --touch $out description = Run test. pool = console -build $bin/bootstrap: link_bootstrap $obj/bootstrap/main.obj $ - $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $ - $obj/source_bee/error.obj $obj/source_bee/filewatch_bsd.obj $ - $obj/source_bee/file.obj $obj/source_bee/luaref.obj $ - $obj/source_bee/bpoll_bsd.obj $obj/source_bee/endpoint.obj $ +build $bin/bootstrap: link_bootstrap $obj/source_bee/lua-seri.obj $ + $obj/source_bee/format.obj $obj/source_bee/error.obj $ + $obj/source_bee/filewatch_bsd.obj $obj/source_bee/file.obj $ + $obj/source_bee/luaref.obj $obj/source_bee/bpoll_bsd.obj $ + $obj/source_bee/endpoint.obj $obj/source_bee/event.obj $ $obj/source_bee/socket.obj $obj/source_bee/process_select.obj $ $obj/source_bee/subprocess_posix.obj $obj/source_bee/file_handle.obj $ $obj/source_bee/file_handle_bsd.obj $ @@ -129,24 +133,25 @@ build $bin/bootstrap: link_bootstrap $obj/bootstrap/main.obj $ $obj/source_bee/path_posix.obj $obj/source_bee/atomic_sync.obj $ $obj/source_bee/setname.obj $obj/source_bee/simplethread_posix.obj $ $obj/source_bee/spinlock.obj $obj/source_bee/version.obj $ - $obj/source_bee/lua_debugging.obj $obj/source_bee/lua_epoll.obj $ - $obj/source_bee/lua_filesystem.obj $obj/source_bee/lua_filewatch.obj $ - $obj/source_bee/lua_platform.obj $obj/source_bee/lua_select.obj $ - $obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $ - $obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $ - $obj/source_bee/lua_time.obj $obj/source_lua/linit.obj $ - $obj/source_lua/onelua.obj + $obj/source_bee/lua_channel.obj $obj/source_bee/lua_debugging.obj $ + $obj/source_bee/lua_epoll.obj $obj/source_bee/lua_filesystem.obj $ + $obj/source_bee/lua_filewatch.obj $obj/source_bee/lua_platform.obj $ + $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $ + $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $ + $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $ + $obj/source_lua/linit.obj $obj/source_lua/onelua.obj $ + $obj/source_bootstrap/main.obj build $bin/main.lua: copy | $bin/bootstrap input = bee.lua/bootstrap/main.lua build $obj/test.stamp: test bee.lua/test/glibc-version.lua $ bee.lua/test/ltest.lua bee.lua/test/shell.lua $ bee.lua/test/supported.lua bee.lua/test/test.lua $ - bee.lua/test/test_epoll.lua bee.lua/test/test_filesystem.lua $ - bee.lua/test/test_filewatch.lua bee.lua/test/test_lua.lua $ - bee.lua/test/test_serialization.lua bee.lua/test/test_skip.lua $ - bee.lua/test/test_socket.lua bee.lua/test/test_subprocess.lua $ - bee.lua/test/test_thread.lua bee.lua/test/test_time.lua | $ - $bin/bootstrap copy_script + bee.lua/test/test_channel.lua bee.lua/test/test_epoll.lua $ + bee.lua/test/test_filesystem.lua bee.lua/test/test_filewatch.lua $ + bee.lua/test/test_lua.lua bee.lua/test/test_serialization.lua $ + bee.lua/test/test_skip.lua bee.lua/test/test_socket.lua $ + bee.lua/test/test_subprocess.lua bee.lua/test/test_thread.lua $ + bee.lua/test/test_time.lua | $bin/bootstrap copy_script build luamake: copy | $bin/bootstrap input = $bin/bootstrap build bootstrap: phony $bin/bootstrap diff --git a/compile/ninja/linux.ninja b/compile/ninja/linux.ninja index b55d131..909e283 100644 --- a/compile/ninja/linux.ninja +++ b/compile/ninja/linux.ninja @@ -36,6 +36,7 @@ build $obj/source_bee/bpoll_linux.obj: cxx_source_bee_1 $ bee.lua/bee/net/bpoll_linux.cpp build $obj/source_bee/endpoint.obj: cxx_source_bee_1 $ bee.lua/bee/net/endpoint.cpp +build $obj/source_bee/event.obj: cxx_source_bee_1 bee.lua/bee/net/event.cpp build $obj/source_bee/socket.obj: cxx_source_bee_1 bee.lua/bee/net/socket.cpp build $obj/source_bee/process_select.obj: cxx_source_bee_1 $ bee.lua/bee/subprocess/process_select.cpp @@ -67,6 +68,8 @@ rule cxx_source_bee_2 description = Compile C++ $out deps = gcc depfile = $out.d +build $obj/source_bee/lua_channel.obj: cxx_source_bee_2 $ + bee.lua/binding/lua_channel.cpp build $obj/source_bee/lua_debugging.obj: cxx_source_bee_2 $ bee.lua/binding/lua_debugging.cpp build $obj/source_bee/lua_epoll.obj: cxx_source_bee_2 $ @@ -97,17 +100,18 @@ rule c_source_lua depfile = $out.d build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c -rule cxx_bootstrap +rule cxx_source_bootstrap command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $ -DNDEBUG -fPIC -o $out -c $in description = Compile C++ $out deps = gcc depfile = $out.d -build $obj/bootstrap/main.obj: cxx_bootstrap bee.lua/bootstrap/main.cpp +build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $ + bee.lua/bootstrap/main.cpp rule link_bootstrap - command = $cc $in -o $out -lm -ldl -Wl,-E -static-libgcc -lstdc++fs $ - -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s + command = $cc $in -o $out -Wl,-E -static-libgcc -lstdc++fs -pthread -lm $ + -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s description = Link Exe $out rule copy command = cp -fv $in$input $out 1>/dev/null @@ -117,11 +121,11 @@ rule test command = $bin/bootstrap bee.lua/test/test.lua --touch $out description = Run test. pool = console -build $bin/bootstrap: link_bootstrap $obj/bootstrap/main.obj $ - $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $ - $obj/source_bee/error.obj $obj/source_bee/filewatch_linux.obj $ - $obj/source_bee/file.obj $obj/source_bee/luaref.obj $ - $obj/source_bee/bpoll_linux.obj $obj/source_bee/endpoint.obj $ +build $bin/bootstrap: link_bootstrap $obj/source_bee/lua-seri.obj $ + $obj/source_bee/format.obj $obj/source_bee/error.obj $ + $obj/source_bee/filewatch_linux.obj $obj/source_bee/file.obj $ + $obj/source_bee/luaref.obj $obj/source_bee/bpoll_linux.obj $ + $obj/source_bee/endpoint.obj $obj/source_bee/event.obj $ $obj/source_bee/socket.obj $obj/source_bee/process_select.obj $ $obj/source_bee/subprocess_posix.obj $obj/source_bee/file_handle.obj $ $obj/source_bee/file_handle_linux.obj $ @@ -129,24 +133,25 @@ build $bin/bootstrap: link_bootstrap $obj/bootstrap/main.obj $ $obj/source_bee/path_posix.obj $obj/source_bee/atomic_sync.obj $ $obj/source_bee/setname.obj $obj/source_bee/simplethread_posix.obj $ $obj/source_bee/spinlock.obj $obj/source_bee/version.obj $ - $obj/source_bee/lua_debugging.obj $obj/source_bee/lua_epoll.obj $ - $obj/source_bee/lua_filesystem.obj $obj/source_bee/lua_filewatch.obj $ - $obj/source_bee/lua_platform.obj $obj/source_bee/lua_select.obj $ - $obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $ - $obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $ - $obj/source_bee/lua_time.obj $obj/source_lua/linit.obj $ - $obj/source_lua/onelua.obj + $obj/source_bee/lua_channel.obj $obj/source_bee/lua_debugging.obj $ + $obj/source_bee/lua_epoll.obj $obj/source_bee/lua_filesystem.obj $ + $obj/source_bee/lua_filewatch.obj $obj/source_bee/lua_platform.obj $ + $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $ + $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $ + $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $ + $obj/source_lua/linit.obj $obj/source_lua/onelua.obj $ + $obj/source_bootstrap/main.obj build $bin/main.lua: copy | $bin/bootstrap input = bee.lua/bootstrap/main.lua build $obj/test.stamp: test bee.lua/test/glibc-version.lua $ bee.lua/test/ltest.lua bee.lua/test/shell.lua $ bee.lua/test/supported.lua bee.lua/test/test.lua $ - bee.lua/test/test_epoll.lua bee.lua/test/test_filesystem.lua $ - bee.lua/test/test_filewatch.lua bee.lua/test/test_lua.lua $ - bee.lua/test/test_serialization.lua bee.lua/test/test_skip.lua $ - bee.lua/test/test_socket.lua bee.lua/test/test_subprocess.lua $ - bee.lua/test/test_thread.lua bee.lua/test/test_time.lua | $ - $bin/bootstrap copy_script + bee.lua/test/test_channel.lua bee.lua/test/test_epoll.lua $ + bee.lua/test/test_filesystem.lua bee.lua/test/test_filewatch.lua $ + bee.lua/test/test_lua.lua bee.lua/test/test_serialization.lua $ + bee.lua/test/test_skip.lua bee.lua/test/test_socket.lua $ + bee.lua/test/test_subprocess.lua bee.lua/test/test_thread.lua $ + bee.lua/test/test_time.lua | $bin/bootstrap copy_script build luamake: copy | $bin/bootstrap input = $bin/bootstrap build bootstrap: phony $bin/bootstrap diff --git a/compile/ninja/macos.ninja b/compile/ninja/macos.ninja index 51e5762..a9ce212 100644 --- a/compile/ninja/macos.ninja +++ b/compile/ninja/macos.ninja @@ -38,6 +38,7 @@ build $obj/source_bee/bpoll_osx.obj: cxx_source_bee_1 $ bee.lua/bee/net/bpoll_osx.cpp build $obj/source_bee/endpoint.obj: cxx_source_bee_1 $ bee.lua/bee/net/endpoint.cpp +build $obj/source_bee/event.obj: cxx_source_bee_1 bee.lua/bee/net/event.cpp build $obj/source_bee/socket.obj: cxx_source_bee_1 bee.lua/bee/net/socket.cpp build $obj/source_bee/process_select.obj: cxx_source_bee_1 $ bee.lua/bee/subprocess/process_select.cpp @@ -69,6 +70,8 @@ rule cxx_source_bee_2 description = Compile C++ $out deps = gcc depfile = $out.d +build $obj/source_bee/lua_channel.obj: cxx_source_bee_2 $ + bee.lua/binding/lua_channel.cpp build $obj/source_bee/lua_debugging.obj: cxx_source_bee_2 $ bee.lua/binding/lua_debugging.cpp build $obj/source_bee/lua_epoll.obj: cxx_source_bee_2 $ @@ -100,7 +103,7 @@ rule c_source_lua depfile = $out.d build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c -rule cxx_bootstrap +rule cxx_source_bootstrap command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -fvisibility=hidden -mmacosx-version-min=10.15 -Ibee.lua/3rd/lua $ -Ibee.lua -DLUA_USE_MACOSX -DNDEBUG -Wunguarded-availability -o $out -c $ @@ -108,10 +111,11 @@ rule cxx_bootstrap description = Compile C++ $out deps = gcc depfile = $out.d -build $obj/bootstrap/main.obj: cxx_bootstrap bee.lua/bootstrap/main.cpp +build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $ + bee.lua/bootstrap/main.cpp rule link_bootstrap - command = $cc $in -o $out -lm -ldl -framework Foundation -framework $ - CoreFoundation -framework CoreServices -lstdc++ -Wl,-S,-x + command = $cc $in -o $out -framework Foundation -framework CoreFoundation $ + -framework CoreServices -lm -ldl -lstdc++ -Wl,-S,-x description = Link Exe $out rule copy command = ditto $in$input $out 1>/dev/null @@ -121,11 +125,11 @@ rule test command = $bin/bootstrap bee.lua/test/test.lua --touch $out description = Run test. pool = console -build $bin/bootstrap: link_bootstrap $obj/bootstrap/main.obj $ - $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $ - $obj/source_bee/error.obj $obj/source_bee/filewatch_osx.obj $ - $obj/source_bee/file.obj $obj/source_bee/luaref.obj $ - $obj/source_bee/bpoll_osx.obj $obj/source_bee/endpoint.obj $ +build $bin/bootstrap: link_bootstrap $obj/source_bee/lua-seri.obj $ + $obj/source_bee/format.obj $obj/source_bee/error.obj $ + $obj/source_bee/filewatch_osx.obj $obj/source_bee/file.obj $ + $obj/source_bee/luaref.obj $obj/source_bee/bpoll_osx.obj $ + $obj/source_bee/endpoint.obj $obj/source_bee/event.obj $ $obj/source_bee/socket.obj $obj/source_bee/process_select.obj $ $obj/source_bee/subprocess_posix.obj $obj/source_bee/file_handle.obj $ $obj/source_bee/file_handle_osx.obj $ @@ -133,24 +137,25 @@ build $bin/bootstrap: link_bootstrap $obj/bootstrap/main.obj $ $obj/source_bee/path_posix.obj $obj/source_bee/atomic_sync.obj $ $obj/source_bee/setname.obj $obj/source_bee/simplethread_posix.obj $ $obj/source_bee/spinlock.obj $obj/source_bee/version.obj $ - $obj/source_bee/lua_debugging.obj $obj/source_bee/lua_epoll.obj $ - $obj/source_bee/lua_filesystem.obj $obj/source_bee/lua_filewatch.obj $ - $obj/source_bee/lua_platform.obj $obj/source_bee/lua_select.obj $ - $obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $ - $obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $ - $obj/source_bee/lua_time.obj $obj/source_lua/linit.obj $ - $obj/source_lua/onelua.obj + $obj/source_bee/lua_channel.obj $obj/source_bee/lua_debugging.obj $ + $obj/source_bee/lua_epoll.obj $obj/source_bee/lua_filesystem.obj $ + $obj/source_bee/lua_filewatch.obj $obj/source_bee/lua_platform.obj $ + $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $ + $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $ + $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $ + $obj/source_lua/linit.obj $obj/source_lua/onelua.obj $ + $obj/source_bootstrap/main.obj build $bin/main.lua: copy | $bin/bootstrap input = bee.lua/bootstrap/main.lua build $obj/test.stamp: test bee.lua/test/glibc-version.lua $ bee.lua/test/ltest.lua bee.lua/test/shell.lua $ bee.lua/test/supported.lua bee.lua/test/test.lua $ - bee.lua/test/test_epoll.lua bee.lua/test/test_filesystem.lua $ - bee.lua/test/test_filewatch.lua bee.lua/test/test_lua.lua $ - bee.lua/test/test_serialization.lua bee.lua/test/test_skip.lua $ - bee.lua/test/test_socket.lua bee.lua/test/test_subprocess.lua $ - bee.lua/test/test_thread.lua bee.lua/test/test_time.lua | $ - $bin/bootstrap copy_script + bee.lua/test/test_channel.lua bee.lua/test/test_epoll.lua $ + bee.lua/test/test_filesystem.lua bee.lua/test/test_filewatch.lua $ + bee.lua/test/test_lua.lua bee.lua/test/test_serialization.lua $ + bee.lua/test/test_skip.lua bee.lua/test/test_socket.lua $ + bee.lua/test/test_subprocess.lua bee.lua/test/test_thread.lua $ + bee.lua/test/test_time.lua | $bin/bootstrap copy_script build luamake: copy | $bin/bootstrap input = $bin/bootstrap build bootstrap: phony $bin/bootstrap diff --git a/compile/ninja/mingw.ninja b/compile/ninja/mingw.ninja index 95cf9ba..54d4489 100644 --- a/compile/ninja/mingw.ninja +++ b/compile/ninja/mingw.ninja @@ -35,6 +35,7 @@ build $obj/source_bee/bpoll_win.obj: cxx_source_bee_1 $ bee.lua/bee/net/bpoll_win.cpp build $obj/source_bee/endpoint.obj: cxx_source_bee_1 $ bee.lua/bee/net/endpoint.cpp +build $obj/source_bee/event.obj: cxx_source_bee_1 bee.lua/bee/net/event.cpp build $obj/source_bee/socket.obj: cxx_source_bee_1 bee.lua/bee/net/socket.cpp build $obj/source_bee/process_select.obj: cxx_source_bee_1 $ bee.lua/bee/subprocess/process_select.cpp @@ -72,6 +73,8 @@ rule cxx_source_bee_2 description = Compile C++ $out deps = gcc depfile = $out.d +build $obj/source_bee/lua_channel.obj: cxx_source_bee_2 $ + bee.lua/binding/lua_channel.cpp build $obj/source_bee/lua_debugging.obj: cxx_source_bee_2 $ bee.lua/binding/lua_debugging.cpp build $obj/source_bee/lua_epoll.obj: cxx_source_bee_2 $ @@ -113,18 +116,19 @@ rule cxx_bee_utf8_crt depfile = $out.d build $obj/bee_utf8_crt/bee_utf8_crt.obj: cxx_bee_utf8_crt $ bee.lua/3rd/lua/bee_utf8_crt.cpp -rule rc_bootstrap - command = windres -i $in -o $out - description = Compile Res $out -build $obj/bootstrap/bootstrap.obj: rc_bootstrap $ - bee.lua/bootstrap/bootstrap.rc -rule cxx_bootstrap +rule cxx_source_bootstrap command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -Ibee.lua/3rd/lua -Ibee.lua -D_WIN32_WINNT=0x0602 -DNDEBUG -o $out -c $in description = Compile C++ $out deps = gcc depfile = $out.d -build $obj/bootstrap/main.obj: cxx_bootstrap bee.lua/bootstrap/main.cpp +build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $ + bee.lua/bootstrap/main.cpp +rule rc_bootstrap + command = windres -i $in -o $out + description = Compile Res $out +build $obj/bootstrap/bootstrap.obj: rc_bootstrap $ + bee.lua/bootstrap/bootstrap.rc rule link_bootstrap command = sh -c "$cc @$out.rsp -o $out $ -Wl,--out-implib,$obj/bootstrap.lib -lntdll -lws2_32 -lole32 -luser32 $ @@ -153,11 +157,11 @@ rule link_lua54 command = $cc --shared $in -o $out -lstdc++ -s description = Link Dll $out build $bin/bootstrap.exe: link_bootstrap $obj/bootstrap/bootstrap.obj $ - $obj/bootstrap/main.obj $obj/source_bee/lua-seri.obj $ - $obj/source_bee/format.obj $obj/source_bee/error.obj $ - $obj/source_bee/filewatch_win.obj $obj/source_bee/file.obj $ - $obj/source_bee/luaref.obj $obj/source_bee/bpoll_win.obj $ - $obj/source_bee/endpoint.obj $obj/source_bee/socket.obj $ + $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $ + $obj/source_bee/error.obj $obj/source_bee/filewatch_win.obj $ + $obj/source_bee/file.obj $obj/source_bee/luaref.obj $ + $obj/source_bee/bpoll_win.obj $obj/source_bee/endpoint.obj $ + $obj/source_bee/event.obj $obj/source_bee/socket.obj $ $obj/source_bee/process_select.obj $obj/source_bee/subprocess_win.obj $ $obj/source_bee/file_handle.obj $obj/source_bee/file_handle_win.obj $ $obj/source_bee/path_win.obj $obj/source_bee/atomic_sync.obj $ @@ -166,25 +170,26 @@ build $bin/bootstrap.exe: link_bootstrap $obj/bootstrap/bootstrap.obj $ $obj/source_bee/afd.obj $obj/source_bee/poller.obj $ $obj/source_bee/poller_fd.obj $obj/source_bee/module_version.obj $ $obj/source_bee/unicode.obj $obj/source_bee/wtf8.obj $ - $obj/source_bee/lua_debugging.obj $obj/source_bee/lua_epoll.obj $ - $obj/source_bee/lua_filesystem.obj $obj/source_bee/lua_filewatch.obj $ - $obj/source_bee/lua_platform.obj $obj/source_bee/lua_select.obj $ - $obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $ - $obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $ - $obj/source_bee/lua_time.obj $obj/source_bee/lua_windows.obj $ - $obj/source_lua/linit.obj $obj/source_lua/onelua.obj $ + $obj/source_bee/lua_channel.obj $obj/source_bee/lua_debugging.obj $ + $obj/source_bee/lua_epoll.obj $obj/source_bee/lua_filesystem.obj $ + $obj/source_bee/lua_filewatch.obj $obj/source_bee/lua_platform.obj $ + $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $ + $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $ + $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $ + $obj/source_bee/lua_windows.obj $obj/source_lua/linit.obj $ + $obj/source_lua/onelua.obj $obj/source_bootstrap/main.obj $ $obj/bee_utf8_crt/bee_utf8_crt.obj build $bin/main.lua: copy | $bin/bootstrap.exe input = bee.lua/bootstrap/main.lua build $obj/test.stamp: test bee.lua/test/glibc-version.lua $ bee.lua/test/ltest.lua bee.lua/test/shell.lua $ bee.lua/test/supported.lua bee.lua/test/test.lua $ - bee.lua/test/test_epoll.lua bee.lua/test/test_filesystem.lua $ - bee.lua/test/test_filewatch.lua bee.lua/test/test_lua.lua $ - bee.lua/test/test_serialization.lua bee.lua/test/test_skip.lua $ - bee.lua/test/test_socket.lua bee.lua/test/test_subprocess.lua $ - bee.lua/test/test_thread.lua bee.lua/test/test_time.lua | $ - $bin/bootstrap.exe copy_script + bee.lua/test/test_channel.lua bee.lua/test/test_epoll.lua $ + bee.lua/test/test_filesystem.lua bee.lua/test/test_filewatch.lua $ + bee.lua/test/test_lua.lua bee.lua/test/test_serialization.lua $ + bee.lua/test/test_skip.lua bee.lua/test/test_socket.lua $ + bee.lua/test/test_subprocess.lua bee.lua/test/test_thread.lua $ + bee.lua/test/test_time.lua | $bin/bootstrap.exe copy_script build luamake.exe: copy | $bin/bootstrap.exe input = $bin/bootstrap.exe build compile/lua/forward_lua.c: runlua bee.lua/3rd/lua/lauxlib.h $ diff --git a/compile/ninja/msvc.ninja b/compile/ninja/msvc.ninja index 747d31c..7ded850 100644 --- a/compile/ninja/msvc.ninja +++ b/compile/ninja/msvc.ninja @@ -35,6 +35,7 @@ build $obj/source_bee/bpoll_win.obj: cxx_source_bee_1 $ bee.lua/bee/net/bpoll_win.cpp build $obj/source_bee/endpoint.obj: cxx_source_bee_1 $ bee.lua/bee/net/endpoint.cpp +build $obj/source_bee/event.obj: cxx_source_bee_1 bee.lua/bee/net/event.cpp build $obj/source_bee/socket.obj: cxx_source_bee_1 bee.lua/bee/net/socket.cpp build $obj/source_bee/process_select.obj: cxx_source_bee_1 $ bee.lua/bee/subprocess/process_select.cpp @@ -72,6 +73,8 @@ rule cxx_source_bee_2 /utf-8 /std:c++17 /GR- description = Compile C++ $out deps = msvc +build $obj/source_bee/lua_channel.obj: cxx_source_bee_2 $ + bee.lua/binding/lua_channel.cpp build $obj/source_bee/lua_debugging.obj: cxx_source_bee_2 $ bee.lua/binding/lua_debugging.cpp build $obj/source_bee/lua_epoll.obj: cxx_source_bee_2 $ @@ -117,18 +120,19 @@ rule cxx_bee_utf8_crt deps = msvc build $obj/bee_utf8_crt/bee_utf8_crt.obj: cxx_bee_utf8_crt $ bee.lua/3rd/lua/bee_utf8_crt.cpp -rule rc_bootstrap - command = rc /nologo /fo $out $in - description = Compile Res $out -build $obj/bootstrap/bootstrap.obj: rc_bootstrap $ - bee.lua/bootstrap/bootstrap.rc -rule cxx_bootstrap +rule cxx_source_bootstrap command = $cc /nologo /showIncludes -c $in /Fo$out /EHsc /Zc:__cplusplus $ /O2 /Zc:inline /W3 /permissive- /MD /GL /Ibee.lua/3rd/lua /Ibee.lua $ /D_WIN32_WINNT=0x0602 /DNDEBUG /utf-8 /std:c++17 /GR- description = Compile C++ $out deps = msvc -build $obj/bootstrap/main.obj: cxx_bootstrap bee.lua/bootstrap/main.cpp +build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $ + bee.lua/bootstrap/main.cpp +rule rc_bootstrap + command = rc /nologo /fo $out $in + description = Compile Res $out +build $obj/bootstrap/bootstrap.obj: rc_bootstrap $ + bee.lua/bootstrap/bootstrap.rc rule link_bootstrap command = $cc /nologo @$out.rsp /link /IMPLIB:$obj/bootstrap.lib $ ntdll.lib ws2_32.lib ole32.lib user32.lib version.lib $ @@ -162,11 +166,11 @@ rule link_lua54 rspfile = $out.rsp rspfile_content = $in_newline build $bin/bootstrap.exe: link_bootstrap $obj/bootstrap/bootstrap.obj $ - $obj/bootstrap/main.obj $obj/source_bee/lua-seri.obj $ - $obj/source_bee/format.obj $obj/source_bee/error.obj $ - $obj/source_bee/filewatch_win.obj $obj/source_bee/file.obj $ - $obj/source_bee/luaref.obj $obj/source_bee/bpoll_win.obj $ - $obj/source_bee/endpoint.obj $obj/source_bee/socket.obj $ + $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $ + $obj/source_bee/error.obj $obj/source_bee/filewatch_win.obj $ + $obj/source_bee/file.obj $obj/source_bee/luaref.obj $ + $obj/source_bee/bpoll_win.obj $obj/source_bee/endpoint.obj $ + $obj/source_bee/event.obj $obj/source_bee/socket.obj $ $obj/source_bee/process_select.obj $obj/source_bee/subprocess_win.obj $ $obj/source_bee/file_handle.obj $obj/source_bee/file_handle_win.obj $ $obj/source_bee/path_win.obj $obj/source_bee/atomic_sync.obj $ @@ -175,25 +179,26 @@ build $bin/bootstrap.exe: link_bootstrap $obj/bootstrap/bootstrap.obj $ $obj/source_bee/afd.obj $obj/source_bee/poller.obj $ $obj/source_bee/poller_fd.obj $obj/source_bee/module_version.obj $ $obj/source_bee/unicode.obj $obj/source_bee/wtf8.obj $ - $obj/source_bee/lua_debugging.obj $obj/source_bee/lua_epoll.obj $ - $obj/source_bee/lua_filesystem.obj $obj/source_bee/lua_filewatch.obj $ - $obj/source_bee/lua_platform.obj $obj/source_bee/lua_select.obj $ - $obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $ - $obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $ - $obj/source_bee/lua_time.obj $obj/source_bee/lua_windows.obj $ - $obj/source_lua/fast_setjmp_x86_64.obj $obj/source_lua/linit.obj $ - $obj/source_lua/onelua.obj $obj/bee_utf8_crt/bee_utf8_crt.obj + $obj/source_bee/lua_channel.obj $obj/source_bee/lua_debugging.obj $ + $obj/source_bee/lua_epoll.obj $obj/source_bee/lua_filesystem.obj $ + $obj/source_bee/lua_filewatch.obj $obj/source_bee/lua_platform.obj $ + $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $ + $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $ + $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $ + $obj/source_bee/lua_windows.obj $obj/source_lua/fast_setjmp_x86_64.obj $ + $obj/source_lua/linit.obj $obj/source_lua/onelua.obj $ + $obj/source_bootstrap/main.obj $obj/bee_utf8_crt/bee_utf8_crt.obj build $bin/main.lua: copy | $bin/bootstrap.exe input = bee.lua/bootstrap/main.lua build $obj/test.stamp: test bee.lua/test/glibc-version.lua $ bee.lua/test/ltest.lua bee.lua/test/shell.lua $ bee.lua/test/supported.lua bee.lua/test/test.lua $ - bee.lua/test/test_epoll.lua bee.lua/test/test_filesystem.lua $ - bee.lua/test/test_filewatch.lua bee.lua/test/test_lua.lua $ - bee.lua/test/test_serialization.lua bee.lua/test/test_skip.lua $ - bee.lua/test/test_socket.lua bee.lua/test/test_subprocess.lua $ - bee.lua/test/test_thread.lua bee.lua/test/test_time.lua | $ - $bin/bootstrap.exe copy_script + bee.lua/test/test_channel.lua bee.lua/test/test_epoll.lua $ + bee.lua/test/test_filesystem.lua bee.lua/test/test_filewatch.lua $ + bee.lua/test/test_lua.lua bee.lua/test/test_serialization.lua $ + bee.lua/test/test_skip.lua bee.lua/test/test_socket.lua $ + bee.lua/test/test_subprocess.lua bee.lua/test/test_thread.lua $ + bee.lua/test/test_time.lua | $bin/bootstrap.exe copy_script build luamake.exe: copy | $bin/bootstrap.exe input = $bin/bootstrap.exe build compile/lua/forward_lua.c: runlua bee.lua/3rd/lua/lauxlib.h $ diff --git a/compile/ninja/netbsd.ninja b/compile/ninja/netbsd.ninja index 89fbf8d..819ba8c 100644 --- a/compile/ninja/netbsd.ninja +++ b/compile/ninja/netbsd.ninja @@ -36,6 +36,7 @@ build $obj/source_bee/bpoll_bsd.obj: cxx_source_bee_1 $ bee.lua/bee/net/bpoll_bsd.cpp build $obj/source_bee/endpoint.obj: cxx_source_bee_1 $ bee.lua/bee/net/endpoint.cpp +build $obj/source_bee/event.obj: cxx_source_bee_1 bee.lua/bee/net/event.cpp build $obj/source_bee/socket.obj: cxx_source_bee_1 bee.lua/bee/net/socket.cpp build $obj/source_bee/process_select.obj: cxx_source_bee_1 $ bee.lua/bee/subprocess/process_select.cpp @@ -67,6 +68,8 @@ rule cxx_source_bee_2 description = Compile C++ $out deps = gcc depfile = $out.d +build $obj/source_bee/lua_channel.obj: cxx_source_bee_2 $ + bee.lua/binding/lua_channel.cpp build $obj/source_bee/lua_debugging.obj: cxx_source_bee_2 $ bee.lua/binding/lua_debugging.cpp build $obj/source_bee/lua_epoll.obj: cxx_source_bee_2 $ @@ -97,17 +100,18 @@ rule c_source_lua depfile = $out.d build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c -rule cxx_bootstrap +rule cxx_source_bootstrap command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $ -DNDEBUG -o $out -c $in description = Compile C++ $out deps = gcc depfile = $out.d -build $obj/bootstrap/main.obj: cxx_bootstrap bee.lua/bootstrap/main.cpp +build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $ + bee.lua/bootstrap/main.cpp rule link_bootstrap - command = $cc $in -o $out -lm -Wl,-E -l:libinotify.a -L/usr/pkg/lib $ - -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s + command = $cc $in -o $out -Wl,-E -l:libinotify.a -L/usr/pkg/lib -pthread $ + -lm -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s description = Link Exe $out rule copy command = cp -fv $in$input $out 1>/dev/null @@ -117,11 +121,11 @@ rule test command = $bin/bootstrap bee.lua/test/test.lua --touch $out description = Run test. pool = console -build $bin/bootstrap: link_bootstrap $obj/bootstrap/main.obj $ - $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $ - $obj/source_bee/error.obj $obj/source_bee/filewatch_bsd.obj $ - $obj/source_bee/file.obj $obj/source_bee/luaref.obj $ - $obj/source_bee/bpoll_bsd.obj $obj/source_bee/endpoint.obj $ +build $bin/bootstrap: link_bootstrap $obj/source_bee/lua-seri.obj $ + $obj/source_bee/format.obj $obj/source_bee/error.obj $ + $obj/source_bee/filewatch_bsd.obj $obj/source_bee/file.obj $ + $obj/source_bee/luaref.obj $obj/source_bee/bpoll_bsd.obj $ + $obj/source_bee/endpoint.obj $obj/source_bee/event.obj $ $obj/source_bee/socket.obj $obj/source_bee/process_select.obj $ $obj/source_bee/subprocess_posix.obj $obj/source_bee/file_handle.obj $ $obj/source_bee/file_handle_bsd.obj $ @@ -129,24 +133,25 @@ build $bin/bootstrap: link_bootstrap $obj/bootstrap/main.obj $ $obj/source_bee/path_posix.obj $obj/source_bee/atomic_sync.obj $ $obj/source_bee/setname.obj $obj/source_bee/simplethread_posix.obj $ $obj/source_bee/spinlock.obj $obj/source_bee/version.obj $ - $obj/source_bee/lua_debugging.obj $obj/source_bee/lua_epoll.obj $ - $obj/source_bee/lua_filesystem.obj $obj/source_bee/lua_filewatch.obj $ - $obj/source_bee/lua_platform.obj $obj/source_bee/lua_select.obj $ - $obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $ - $obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $ - $obj/source_bee/lua_time.obj $obj/source_lua/linit.obj $ - $obj/source_lua/onelua.obj + $obj/source_bee/lua_channel.obj $obj/source_bee/lua_debugging.obj $ + $obj/source_bee/lua_epoll.obj $obj/source_bee/lua_filesystem.obj $ + $obj/source_bee/lua_filewatch.obj $obj/source_bee/lua_platform.obj $ + $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $ + $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $ + $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $ + $obj/source_lua/linit.obj $obj/source_lua/onelua.obj $ + $obj/source_bootstrap/main.obj build $bin/main.lua: copy | $bin/bootstrap input = bee.lua/bootstrap/main.lua build $obj/test.stamp: test bee.lua/test/glibc-version.lua $ bee.lua/test/ltest.lua bee.lua/test/shell.lua $ bee.lua/test/supported.lua bee.lua/test/test.lua $ - bee.lua/test/test_epoll.lua bee.lua/test/test_filesystem.lua $ - bee.lua/test/test_filewatch.lua bee.lua/test/test_lua.lua $ - bee.lua/test/test_serialization.lua bee.lua/test/test_skip.lua $ - bee.lua/test/test_socket.lua bee.lua/test/test_subprocess.lua $ - bee.lua/test/test_thread.lua bee.lua/test/test_time.lua | $ - $bin/bootstrap copy_script + bee.lua/test/test_channel.lua bee.lua/test/test_epoll.lua $ + bee.lua/test/test_filesystem.lua bee.lua/test/test_filewatch.lua $ + bee.lua/test/test_lua.lua bee.lua/test/test_serialization.lua $ + bee.lua/test/test_skip.lua bee.lua/test/test_socket.lua $ + bee.lua/test/test_subprocess.lua bee.lua/test/test_thread.lua $ + bee.lua/test/test_time.lua | $bin/bootstrap copy_script build luamake: copy | $bin/bootstrap input = $bin/bootstrap build bootstrap: phony $bin/bootstrap diff --git a/compile/ninja/openbsd.ninja b/compile/ninja/openbsd.ninja index c9370d0..a0b0989 100644 --- a/compile/ninja/openbsd.ninja +++ b/compile/ninja/openbsd.ninja @@ -36,6 +36,7 @@ build $obj/source_bee/bpoll_bsd.obj: cxx_source_bee_1 $ bee.lua/bee/net/bpoll_bsd.cpp build $obj/source_bee/endpoint.obj: cxx_source_bee_1 $ bee.lua/bee/net/endpoint.cpp +build $obj/source_bee/event.obj: cxx_source_bee_1 bee.lua/bee/net/event.cpp build $obj/source_bee/socket.obj: cxx_source_bee_1 bee.lua/bee/net/socket.cpp build $obj/source_bee/process_select.obj: cxx_source_bee_1 $ bee.lua/bee/subprocess/process_select.cpp @@ -67,6 +68,8 @@ rule cxx_source_bee_2 description = Compile C++ $out deps = gcc depfile = $out.d +build $obj/source_bee/lua_channel.obj: cxx_source_bee_2 $ + bee.lua/binding/lua_channel.cpp build $obj/source_bee/lua_debugging.obj: cxx_source_bee_2 $ bee.lua/binding/lua_debugging.cpp build $obj/source_bee/lua_epoll.obj: cxx_source_bee_2 $ @@ -97,18 +100,18 @@ rule c_source_lua depfile = $out.d build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua/onelua.c -rule cxx_bootstrap +rule cxx_source_bootstrap command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $ -DNDEBUG -o $out -c $in description = Compile C++ $out deps = gcc depfile = $out.d -build $obj/bootstrap/main.obj: cxx_bootstrap bee.lua/bootstrap/main.cpp +build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $ + bee.lua/bootstrap/main.cpp rule link_bootstrap - command = $cc $in -o $out -lm -Wl,-E -l:libinotify.a $ - -L/usr/local/lib/inotify -pthread -Wl,--push-state,-Bstatic -lstdc++ $ - -Wl,--pop-state -Wl,-S,-x + command = $cc $in -o $out -Wl,-E -l:libinotify.a -L/usr/local/lib/inotify $ + -pthread -lm -Wl,--push-state,-Bstatic -lstdc++ -Wl,--pop-state -Wl,-S,-x description = Link Exe $out rule copy command = cp -fv $in$input $out 1>/dev/null @@ -118,11 +121,11 @@ rule test command = $bin/bootstrap bee.lua/test/test.lua --touch $out description = Run test. pool = console -build $bin/bootstrap: link_bootstrap $obj/bootstrap/main.obj $ - $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $ - $obj/source_bee/error.obj $obj/source_bee/filewatch_bsd.obj $ - $obj/source_bee/file.obj $obj/source_bee/luaref.obj $ - $obj/source_bee/bpoll_bsd.obj $obj/source_bee/endpoint.obj $ +build $bin/bootstrap: link_bootstrap $obj/source_bee/lua-seri.obj $ + $obj/source_bee/format.obj $obj/source_bee/error.obj $ + $obj/source_bee/filewatch_bsd.obj $obj/source_bee/file.obj $ + $obj/source_bee/luaref.obj $obj/source_bee/bpoll_bsd.obj $ + $obj/source_bee/endpoint.obj $obj/source_bee/event.obj $ $obj/source_bee/socket.obj $obj/source_bee/process_select.obj $ $obj/source_bee/subprocess_posix.obj $obj/source_bee/file_handle.obj $ $obj/source_bee/file_handle_bsd.obj $ @@ -130,24 +133,25 @@ build $bin/bootstrap: link_bootstrap $obj/bootstrap/main.obj $ $obj/source_bee/path_posix.obj $obj/source_bee/atomic_sync.obj $ $obj/source_bee/setname.obj $obj/source_bee/simplethread_posix.obj $ $obj/source_bee/spinlock.obj $obj/source_bee/version.obj $ - $obj/source_bee/lua_debugging.obj $obj/source_bee/lua_epoll.obj $ - $obj/source_bee/lua_filesystem.obj $obj/source_bee/lua_filewatch.obj $ - $obj/source_bee/lua_platform.obj $obj/source_bee/lua_select.obj $ - $obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $ - $obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $ - $obj/source_bee/lua_time.obj $obj/source_lua/linit.obj $ - $obj/source_lua/onelua.obj + $obj/source_bee/lua_channel.obj $obj/source_bee/lua_debugging.obj $ + $obj/source_bee/lua_epoll.obj $obj/source_bee/lua_filesystem.obj $ + $obj/source_bee/lua_filewatch.obj $obj/source_bee/lua_platform.obj $ + $obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $ + $obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $ + $obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $ + $obj/source_lua/linit.obj $obj/source_lua/onelua.obj $ + $obj/source_bootstrap/main.obj build $bin/main.lua: copy | $bin/bootstrap input = bee.lua/bootstrap/main.lua build $obj/test.stamp: test bee.lua/test/glibc-version.lua $ bee.lua/test/ltest.lua bee.lua/test/shell.lua $ bee.lua/test/supported.lua bee.lua/test/test.lua $ - bee.lua/test/test_epoll.lua bee.lua/test/test_filesystem.lua $ - bee.lua/test/test_filewatch.lua bee.lua/test/test_lua.lua $ - bee.lua/test/test_serialization.lua bee.lua/test/test_skip.lua $ - bee.lua/test/test_socket.lua bee.lua/test/test_subprocess.lua $ - bee.lua/test/test_thread.lua bee.lua/test/test_time.lua | $ - $bin/bootstrap copy_script + bee.lua/test/test_channel.lua bee.lua/test/test_epoll.lua $ + bee.lua/test/test_filesystem.lua bee.lua/test/test_filewatch.lua $ + bee.lua/test/test_lua.lua bee.lua/test/test_serialization.lua $ + bee.lua/test/test_skip.lua bee.lua/test/test_socket.lua $ + bee.lua/test/test_subprocess.lua bee.lua/test/test_thread.lua $ + bee.lua/test/test_time.lua | $bin/bootstrap copy_script build luamake: copy | $bin/bootstrap input = $bin/bootstrap build bootstrap: phony $bin/bootstrap