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 11, 2024
1 parent e45e939 commit 811cc55
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 33 deletions.
2 changes: 1 addition & 1 deletion bee.lua
Submodule bee.lua updated 22 files
+94 −55 3rd/lua/utf8_crt.c
+23 −12 3rd/lua/utf8_crt.h
+29 −41 3rd/lua/utf8_lua.c
+21 −38 3rd/lua/utf8_luac.c
+42 −49 3rd/lua/utf8_prefix.h
+2 −2 bee/error.cpp
+3 −3 bee/filewatch/filewatch_win.cpp
+3 −3 bee/net/socket.cpp
+159 −0 bee/platform/win/cwtf8.h
+10 −0 bee/platform/win/wtf8.h
+30 −0 bee/platform/win/wtf8_win.cpp
+2 −2 bee/subprocess/subprocess_win.cpp
+1 −1 bee/thread/atomic_semaphore.h
+2 −2 bee/thread/setname.cpp
+18 −34 binding/lua_filesystem.cpp
+2 −2 binding/lua_subprocess.cpp
+19 −2 binding/lua_time.cpp
+2 −1 binding/port/lua_windows.cpp
+17 −39 bootstrap/main.cpp
+1 −0 compile/common.lua
+5 −2 compile/lua.lua
+4 −5 test/test_filesystem.lua
2 changes: 1 addition & 1 deletion compile/ninja/android.ninja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
bee.lua/binding/lua_time.cpp
rule c_source_lua
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-fvisibility=hidden -DNDEBUG -o $out -c $in
-fvisibility=hidden -Ibee.lua -DNDEBUG -o $out -c $in
description = Compile C $out
deps = gcc
depfile = $out.d
Expand Down
2 changes: 1 addition & 1 deletion compile/ninja/freebsd.ninja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
bee.lua/binding/lua_time.cpp
rule c_source_lua
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-fvisibility=hidden -DNDEBUG -o $out -c $in
-fvisibility=hidden -Ibee.lua -DNDEBUG -o $out -c $in
description = Compile C $out
deps = gcc
depfile = $out.d
Expand Down
2 changes: 1 addition & 1 deletion compile/ninja/linux.ninja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
bee.lua/binding/lua_time.cpp
rule c_source_lua
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
-fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in
description = Compile C $out
deps = gcc
depfile = $out.d
Expand Down
2 changes: 1 addition & 1 deletion compile/ninja/macos.ninja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
bee.lua/binding/lua_time.cpp
rule c_source_lua
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-fvisibility=hidden -mmacosx-version-min=10.15 -DNDEBUG $
-fvisibility=hidden -mmacosx-version-min=10.15 -Ibee.lua -DNDEBUG $
-Wunguarded-availability -o $out -c $in
description = Compile C $out
deps = gcc
Expand Down
27 changes: 15 additions & 12 deletions compile/ninja/mingw.ninja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ build $obj/source_bee/unicode_win.obj: cxx_source_bee_1 $
bee.lua/bee/platform/win/unicode_win.cpp
build $obj/source_bee/unlink_win.obj: cxx_source_bee_1 $
bee.lua/bee/platform/win/unlink_win.cpp
build $obj/source_bee/wtf8_win.obj: cxx_source_bee_1 $
bee.lua/bee/platform/win/wtf8_win.cpp
build $obj/source_bee/process_select.obj: cxx_source_bee_1 $
bee.lua/bee/subprocess/process_select.cpp
build $obj/source_bee/subprocess_win.obj: cxx_source_bee_1 $
Expand Down Expand Up @@ -86,7 +88,7 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
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 $
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Ibee.lua $
-D_WIN32_WINNT=0x0602 -DNDEBUG -o $out -c $in
description = Compile C $out
deps = gcc
Expand Down Expand Up @@ -144,17 +146,18 @@ build $bin/bootstrap.exe: link_bootstrap $obj/source_bootstrap/main.obj $
$obj/source_bee/endpoint.obj $obj/source_bee/socket.obj $
$obj/source_bee/version.obj $obj/source_bee/module_version_win.obj $
$obj/source_bee/unicode_win.obj $obj/source_bee/unlink_win.obj $
$obj/source_bee/process_select.obj $obj/source_bee/subprocess_win.obj $
$obj/source_bee/setname.obj $obj/source_bee/simplethread_win.obj $
$obj/source_bee/spinlock.obj $obj/source_bee/file_handle.obj $
$obj/source_bee/file_handle_win.obj $obj/source_bee/path_helper.obj $
$obj/source_bee/lua_debugging.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/utf8_crt.obj $
$obj/source_lua/linit.obj $obj/source_lua/onelua.obj
$obj/source_bee/wtf8_win.obj $obj/source_bee/process_select.obj $
$obj/source_bee/subprocess_win.obj $obj/source_bee/setname.obj $
$obj/source_bee/simplethread_win.obj $obj/source_bee/spinlock.obj $
$obj/source_bee/file_handle.obj $obj/source_bee/file_handle_win.obj $
$obj/source_bee/path_helper.obj $obj/source_bee/lua_debugging.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/utf8_crt.obj $obj/source_lua/linit.obj $
$obj/source_lua/onelua.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 $
Expand Down
30 changes: 16 additions & 14 deletions compile/ninja/msvc.ninja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ build $obj/source_bee/unicode_win.obj: cxx_source_bee_1 $
bee.lua/bee/platform/win/unicode_win.cpp
build $obj/source_bee/unlink_win.obj: cxx_source_bee_1 $
bee.lua/bee/platform/win/unlink_win.cpp
build $obj/source_bee/wtf8_win.obj: cxx_source_bee_1 $
bee.lua/bee/platform/win/wtf8_win.cpp
build $obj/source_bee/process_select.obj: cxx_source_bee_1 $
bee.lua/bee/subprocess/process_select.cpp
build $obj/source_bee/subprocess_win.obj: cxx_source_bee_1 $
Expand Down Expand Up @@ -87,8 +89,8 @@ 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=0x0602 /DNDEBUG $
/utf-8 /std:c11
/O2 /Zc:inline /W3 /permissive- /MD /GL /Ibee.lua /D_WIN32_WINNT=0x0602 $
/DNDEBUG /utf-8 /std:c11
description = Compile C $out
deps = msvc
build $obj/source_lua/utf8_crt.obj: c_source_lua bee.lua/3rd/lua/utf8_crt.c
Expand Down Expand Up @@ -152,18 +154,18 @@ build $bin/bootstrap.exe: link_bootstrap $obj/source_bootstrap/main.obj $
$obj/source_bee/endpoint.obj $obj/source_bee/socket.obj $
$obj/source_bee/version.obj $obj/source_bee/module_version_win.obj $
$obj/source_bee/unicode_win.obj $obj/source_bee/unlink_win.obj $
$obj/source_bee/process_select.obj $obj/source_bee/subprocess_win.obj $
$obj/source_bee/setname.obj $obj/source_bee/simplethread_win.obj $
$obj/source_bee/spinlock.obj $obj/source_bee/file_handle.obj $
$obj/source_bee/file_handle_win.obj $obj/source_bee/path_helper.obj $
$obj/source_bee/lua_debugging.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/utf8_crt.obj $
$obj/source_lua/fast_setjmp_x86_64.obj $obj/source_lua/linit.obj $
$obj/source_lua/onelua.obj
$obj/source_bee/wtf8_win.obj $obj/source_bee/process_select.obj $
$obj/source_bee/subprocess_win.obj $obj/source_bee/setname.obj $
$obj/source_bee/simplethread_win.obj $obj/source_bee/spinlock.obj $
$obj/source_bee/file_handle.obj $obj/source_bee/file_handle_win.obj $
$obj/source_bee/path_helper.obj $obj/source_bee/lua_debugging.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/utf8_crt.obj $obj/source_lua/fast_setjmp_x86_64.obj $
$obj/source_lua/linit.obj $obj/source_lua/onelua.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 $
Expand Down
2 changes: 1 addition & 1 deletion compile/ninja/netbsd.ninja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
bee.lua/binding/lua_time.cpp
rule c_source_lua
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-fvisibility=hidden -DNDEBUG -o $out -c $in
-fvisibility=hidden -Ibee.lua -DNDEBUG -o $out -c $in
description = Compile C $out
deps = gcc
depfile = $out.d
Expand Down
2 changes: 1 addition & 1 deletion compile/ninja/openbsd.ninja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
bee.lua/binding/lua_time.cpp
rule c_source_lua
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-fvisibility=hidden -DNDEBUG -o $out -c $in
-fvisibility=hidden -Ibee.lua -DNDEBUG -o $out -c $in
description = Compile C $out
deps = gcc
depfile = $out.d
Expand Down

0 comments on commit 811cc55

Please sign in to comment.