Skip to content

Commit

Permalink
update bee
Browse files Browse the repository at this point in the history
  • Loading branch information
@actboy168
actboy168 committed Apr 6, 2024
1 parent fe0bc78 commit 1010e66
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion bee.lua
Submodule bee.lua updated 39 files
+4 −9 bee/filewatch/filewatch.h
+26 −30 bee/filewatch/filewatch_linux.cpp
+0 −7 bee/filewatch/filewatch_osx.cpp
+2 −9 bee/filewatch/filewatch_win.cpp
+4 −22 bee/lua/binding.h
+2 −2 bee/net/fd.h
+10 −10 bee/net/socket.cpp
+1 −1 bee/nonstd/debugging.h
+1 −1 bee/platform/version.cpp
+2 −2 bee/subprocess/subprocess_posix.cpp
+2 −2 bee/subprocess/subprocess_win.cpp
+1 −1 bee/subprocess/subprocess_win.h
+4 −3 bee/thread/simplethread_posix.cpp
+10 −9 bee/thread/simplethread_win.cpp
+0 −3 bee/utility/file_handle.h
+1 −1 bee/utility/path_helper.cpp
+1 −1 bee/utility/zstring_view.h
+1 −2 binding/lua_debugging.cpp
+84 −81 binding/lua_filesystem.cpp
+11 −15 binding/lua_filewatch.cpp
+1 −2 binding/lua_platform.cpp
+15 −14 binding/lua_select.cpp
+16 −23 binding/lua_socket.cpp
+21 −7 binding/lua_subprocess.cpp
+16 −18 binding/lua_thread.cpp
+20 −30 binding/lua_time.cpp
+1 −0 binding/port/lua_windows.cpp
+1 −1 compile/bootstrap.lua
+6 −11 compile/clang-format.lua
+1 −1 compile/config.lua
+1 −1 compile/emcc.lua
+1 −1 test.lua
+3 −0 test/shell.lua
+1 −1 test/test.lua
+8 −8 test/test_filesystem.lua
+1 −1 test/test_filewatch.lua
+23 −23 test/test_socket.lua
+21 −21 test/test_subprocess.lua
+9 −9 test/test_thread.lua
14 changes: 7 additions & 7 deletions compile/ninja/mingw.ninja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ ar = ar
luamake = luamake
rule c_source_bee
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Itools/lua54 $
-D_WIN32_WINNT=0x0601 -DNDEBUG -o $out -c $in
-D_WIN32_WINNT=0x0602 -DNDEBUG -o $out -c $in
description = Compile C $out
deps = gcc
depfile = $out.d
build $obj/source_bee/lua-seri.obj: c_source_bee $
bee.lua/3rd/lua-seri/lua-seri.c
rule cxx_source_bee
command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-D_WIN32_WINNT=0x0601 -DNDEBUG -o $out -c $in
-D_WIN32_WINNT=0x0602 -DNDEBUG -o $out -c $in
description = Compile C++ $out
deps = gcc
depfile = $out.d
build $obj/source_bee/format.obj: cxx_source_bee bee.lua/3rd/fmt/format.cc
rule cxx_source_bee_1
command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-Ibee.lua -D_WIN32_WINNT=0x0601 -DNDEBUG -o $out -c $in
-Ibee.lua -D_WIN32_WINNT=0x0602 -DNDEBUG -o $out -c $in
description = Compile C++ $out
deps = gcc
depfile = $out.d
Expand Down Expand Up @@ -60,7 +60,7 @@ build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $
bee.lua/bee/utility/path_helper.cpp
rule cxx_source_bee_2
command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-Ibee.lua -Itools/lua54 -D_WIN32_WINNT=0x0601 -DBEE_STATIC $
-Ibee.lua -Itools/lua54 -D_WIN32_WINNT=0x0602 -DBEE_STATIC $
-D_CRT_SECURE_NO_WARNINGS -DNDEBUG -o $out -c $in
description = Compile C++ $out
deps = gcc
Expand Down Expand Up @@ -89,14 +89,14 @@ build $obj/source_bee/lua_windows.obj: cxx_source_bee_2 $
bee.lua/binding/port/lua_windows.cpp
rule c_source_lua
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-D_WIN32_WINNT=0x0601 -DNDEBUG -o $out -c $in
-D_WIN32_WINNT=0x0602 -DNDEBUG -o $out -c $in
description = Compile C $out
deps = gcc
depfile = $out.d
build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c
rule c_source_lua_1
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-D_WIN32_WINNT=0x0601 -DMAKE_LIB -DLUA_BUILD_AS_DLL -DNDEBUG $
-D_WIN32_WINNT=0x0602 -DMAKE_LIB -DLUA_BUILD_AS_DLL -DNDEBUG $
-Wno-maybe-uninitialized -o $out -c $in
description = Compile C $out
deps = gcc
Expand All @@ -105,7 +105,7 @@ build $obj/source_lua/linit.obj: c_source_lua_1 bee.lua/3rd/lua/linit.c
build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c
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=0x0601 -DNDEBUG -o $out -c $in
-Ibee.lua/3rd/lua -Ibee.lua -D_WIN32_WINNT=0x0602 -DNDEBUG -o $out -c $in
description = Compile C++ $out
deps = gcc
depfile = $out.d
Expand Down
14 changes: 7 additions & 7 deletions compile/ninja/msvc.ninja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ luamake = luamake
rule c_source_bee
command = $cc /nologo /showIncludes -c $in /Fo$out /EHsc /Zc:__cplusplus $
/O2 /Zc:inline /W3 /permissive- /MD /GL /Itools/lua54 $
/D_WIN32_WINNT=0x0601 /DNDEBUG /utf-8 /wd4244 /std:c11
/D_WIN32_WINNT=0x0602 /DNDEBUG /utf-8 /wd4244 /std:c11
description = Compile C $out
deps = msvc
build $obj/source_bee/lua-seri.obj: c_source_bee $
bee.lua/3rd/lua-seri/lua-seri.c
rule cxx_source_bee
command = $cc /nologo /showIncludes -c $in /Fo$out /EHsc /Zc:__cplusplus $
/O2 /Zc:inline /W3 /permissive- /MD /GL /D_WIN32_WINNT=0x0601 /DNDEBUG $
/O2 /Zc:inline /W3 /permissive- /MD /GL /D_WIN32_WINNT=0x0602 /DNDEBUG $
/utf-8 /std:c++17 /GR-
description = Compile C++ $out
deps = msvc
build $obj/source_bee/format.obj: cxx_source_bee bee.lua/3rd/fmt/format.cc
rule cxx_source_bee_1
command = $cc /nologo /showIncludes -c $in /Fo$out /EHsc /Zc:__cplusplus $
/O2 /Zc:inline /W3 /permissive- /MD /GL /Ibee.lua /D_WIN32_WINNT=0x0601 $
/O2 /Zc:inline /W3 /permissive- /MD /GL /Ibee.lua /D_WIN32_WINNT=0x0602 $
/DNDEBUG /utf-8 /std:c++17 /GR-
description = Compile C++ $out
deps = msvc
Expand Down Expand Up @@ -61,7 +61,7 @@ build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $
rule cxx_source_bee_2
command = $cc /nologo /showIncludes -c $in /Fo$out /EHsc /Zc:__cplusplus $
/O2 /Zc:inline /W3 /permissive- /MD /GL /Ibee.lua /Itools/lua54 $
/D_WIN32_WINNT=0x0601 /DBEE_STATIC /D_CRT_SECURE_NO_WARNINGS /DNDEBUG $
/D_WIN32_WINNT=0x0602 /DBEE_STATIC /D_CRT_SECURE_NO_WARNINGS /DNDEBUG $
/utf-8 /std:c++17 /GR-
description = Compile C++ $out
deps = msvc
Expand Down Expand Up @@ -89,7 +89,7 @@ build $obj/source_bee/lua_windows.obj: cxx_source_bee_2 $
bee.lua/binding/port/lua_windows.cpp
rule c_source_lua
command = $cc /nologo /showIncludes -c $in /Fo$out /EHsc /Zc:__cplusplus $
/O2 /Zc:inline /W3 /permissive- /MD /GL /D_WIN32_WINNT=0x0601 /DNDEBUG $
/O2 /Zc:inline /W3 /permissive- /MD /GL /D_WIN32_WINNT=0x0602 /DNDEBUG $
/utf-8 /std:c11
description = Compile C $out
deps = msvc
Expand All @@ -101,7 +101,7 @@ build $obj/source_lua/fast_setjmp_x86_64.obj: asm_source_lua $
bee.lua/3rd/lua/fast_setjmp_x86_64.s
rule c_source_lua_1
command = $cc /nologo /showIncludes -c $in /Fo$out /EHsc /Zc:__cplusplus $
/O2 /Zc:inline /W3 /permissive- /MD /GL /D_WIN32_WINNT=0x0601 $
/O2 /Zc:inline /W3 /permissive- /MD /GL /D_WIN32_WINNT=0x0602 $
/DMAKE_LIB /DLUA_BUILD_AS_DLL /DNDEBUG /utf-8 /wd4267 /wd4334 /std:c11
description = Compile C $out
deps = msvc
Expand All @@ -110,7 +110,7 @@ build $obj/source_lua/onelua.obj: c_source_lua_1 bee.lua/3rd/lua/onelua.c
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=0x0601 /DNDEBUG /utf-8 /std:c++17 /GR-
/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 $
Expand Down

0 comments on commit 1010e66

Please sign in to comment.