update bee

compile/ninja/android.ninja

@@ -96,17 +96,16 @@ 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_source_bootstrap
+rule cxx_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/source_bootstrap/main.obj: cxx_source_bootstrap $
-    bee.lua/bootstrap/main.cpp
+build $obj/bootstrap/main.obj: cxx_bootstrap bee.lua/bootstrap/main.cpp
 rule link_bootstrap
-  command = $cc $in -o $out -Wl,-E -lm -ldl -lstdc++ -Wl,-S,-x
+  command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++ -Wl,-S,-x
   description = Link    Exe $out
 rule copy
   command = cp -fv $in$input $out 1>/dev/null
@@ -116,7 +115,7 @@ rule test
   command = $bin/bootstrap bee.lua/test/test.lua --touch $out
   description = Run test.
   pool = console
-build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
+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 $

compile/ninja/freebsd.ninja

@@ -97,17 +97,16 @@ 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_source_bootstrap
+rule cxx_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/source_bootstrap/main.obj: cxx_source_bootstrap $
-    bee.lua/bootstrap/main.cpp
+build $obj/bootstrap/main.obj: cxx_bootstrap bee.lua/bootstrap/main.cpp
 rule link_bootstrap
-  command = $cc $in -o $out -Wl,-E -lm -linotify -L/usr/local/lib -pthread $
+  command = $cc $in -o $out -lm -Wl,-E -linotify -L/usr/local/lib -pthread $
     -Wl,--push-state,-Bstatic -lstdc++ -Wl,--pop-state -Wl,-S,-x
   description = Link    Exe $out
 rule copy
@@ -118,7 +117,7 @@ rule test
   command = $bin/bootstrap bee.lua/test/test.lua --touch $out
   description = Run test.
   pool = console
-build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
+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 $

compile/ninja/linux.ninja

@@ -97,17 +97,16 @@ 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_source_bootstrap
+rule cxx_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/source_bootstrap/main.obj: cxx_source_bootstrap $
-    bee.lua/bootstrap/main.cpp
+build $obj/bootstrap/main.obj: cxx_bootstrap bee.lua/bootstrap/main.cpp
 rule link_bootstrap
-  command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl -lstdc++fs $
+  command = $cc $in -o $out -lm -ldl -Wl,-E -static-libgcc -lstdc++fs $
     -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
   description = Link    Exe $out
 rule copy
@@ -118,7 +117,7 @@ rule test
   command = $bin/bootstrap bee.lua/test/test.lua --touch $out
   description = Run test.
   pool = console
-build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
+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 $

compile/ninja/macos.ninja

@@ -100,16 +100,15 @@ 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_source_bootstrap
+rule cxx_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 $
     $in
   description = Compile C++ $out
   deps = gcc
   depfile = $out.d
-build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
-    bee.lua/bootstrap/main.cpp
+build $obj/bootstrap/main.obj: cxx_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
@@ -122,7 +121,7 @@ rule test
   command = $bin/bootstrap bee.lua/test/test.lua --touch $out
   description = Run test.
   pool = console
-build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
+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 $

compile/ninja/mingw.ninja

@@ -113,19 +113,18 @@ 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 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/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 cxx_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
 rule link_bootstrap
   command = sh -c "$cc @$out.rsp -o $out $
     -Wl,--out-implib,$obj/bootstrap.lib -lntdll -lws2_32 -lole32 -luser32 $
@@ -154,7 +153,7 @@ 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/source_bootstrap/main.obj $obj/source_bee/lua-seri.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 $

compile/ninja/msvc.ninja

@@ -117,19 +117,18 @@ 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 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/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 cxx_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
 rule link_bootstrap
   command = $cc /nologo @$out.rsp /link /IMPLIB:$obj/bootstrap.lib $
     ntdll.lib ws2_32.lib ole32.lib user32.lib version.lib $
@@ -163,7 +162,7 @@ rule link_lua54
   rspfile = $out.rsp
   rspfile_content = $in_newline
 build $bin/bootstrap.exe: link_bootstrap $obj/bootstrap/bootstrap.obj $
-    $obj/source_bootstrap/main.obj $obj/source_bee/lua-seri.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 $

compile/ninja/netbsd.ninja

@@ -97,17 +97,16 @@ 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_source_bootstrap
+rule cxx_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/source_bootstrap/main.obj: cxx_source_bootstrap $
-    bee.lua/bootstrap/main.cpp
+build $obj/bootstrap/main.obj: cxx_bootstrap bee.lua/bootstrap/main.cpp
 rule link_bootstrap
-  command = $cc $in -o $out -Wl,-E -lm -l:libinotify.a -L/usr/pkg/lib $
+  command = $cc $in -o $out -lm -Wl,-E -l:libinotify.a -L/usr/pkg/lib $
     -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
   description = Link    Exe $out
 rule copy
@@ -118,7 +117,7 @@ rule test
   command = $bin/bootstrap bee.lua/test/test.lua --touch $out
   description = Run test.
   pool = console
-build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
+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 $

compile/ninja/openbsd.ninja

@@ -97,17 +97,16 @@ 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_source_bootstrap
+rule cxx_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/source_bootstrap/main.obj: cxx_source_bootstrap $
-    bee.lua/bootstrap/main.cpp
+build $obj/bootstrap/main.obj: cxx_bootstrap bee.lua/bootstrap/main.cpp
 rule link_bootstrap
-  command = $cc $in -o $out -Wl,-E -lm -l:libinotify.a $
+  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
   description = Link    Exe $out
@@ -119,7 +118,7 @@ rule test
   command = $bin/bootstrap bee.lua/test/test.lua --touch $out
   description = Run test.
   pool = console
-build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
+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 $