Skip to content

Commit 5be64ad

Browse files
committed
updated serve_folder example to match C's, finished documenting wrapper functions, still trying to figure out how to handle the set_file_handler func; seems to be bugged out currently
1 parent 54cb624 commit 5be64ad

File tree

13 files changed

+1240
-246
lines changed

13 files changed

+1240
-246
lines changed

PyPI/Package/src/webui/bootstrap.sh

100644100755
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@ if [[ "$1" == "" ]]; then
1515
# Nightly Build
1616
LINUX_ARM="https://github.com/webui-dev/webui/releases/download/nightly/webui-linux-gcc-arm.zip"
1717
LINUX_ARM64="https://github.com/webui-dev/webui/releases/download/nightly/webui-linux-gcc-arm64.zip"
18-
LINUX_X64="https://github.com/webui-dev/webui/releases/download/nightly/webui-linux-gcc-x64.zip"
18+
LINUX_GCC_X64="https://github.com/webui-dev/webui/releases/download/nightly/webui-linux-gcc-x64.zip"
19+
LINUX_CLANG_X64="https://github.com/webui-dev/webui/releases/download/nightly/webui-linux-clang-x64.zip"
1920
MACOS_ARM64="https://github.com/webui-dev/webui/releases/download/nightly/webui-macos-clang-arm64.zip"
2021
MACOS_X64="https://github.com/webui-dev/webui/releases/download/nightly/webui-macos-clang-x64.zip"
2122
WINDOWS_MSVC_X64="https://github.com/webui-dev/webui/releases/download/nightly/webui-windows-msvc-x64.zip"
2223

2324
# Release
2425
# LINUX_ARM="https://github.com/webui-dev/webui/releases/download/2.5.0-beta.2/webui-linux-gcc-arm.zip"
2526
# LINUX_ARM64="https://github.com/webui-dev/webui/releases/download/2.5.0-beta.2/webui-linux-gcc-arm64.zip"
26-
# LINUX_X64="https://github.com/webui-dev/webui/releases/download/2.5.0-beta.2/webui-linux-gcc-x64.zip"
27+
# LINUX_GCC_X64="https://github.com/webui-dev/webui/releases/download/2.5.0-beta.2/webui-linux-gcc-x64.zip"
28+
# LINUX_CLANG_X64="https://github.com/webui-dev/webui/releases/download/2.5.0-beta.2/webui-linux-clang-x64.zip"
2729
# MACOS_ARM64="https://github.com/webui-dev/webui/releases/download/2.5.0-beta.2/webui-macos-clang-arm64.zip"
2830
# MACOS_X64="https://github.com/webui-dev/webui/releases/download/2.5.0-beta.2/webui-macos-clang-x64.zip"
2931
# WINDOWS_MSVC_X64="https://github.com/webui-dev/webui/releases/download/2.5.0-beta.2/webui-windows-msvc-x64.zip"
@@ -49,7 +51,8 @@ if [[ "$1" == "" ]]; then
4951

5052
download_and_extract $LINUX_ARM "webui-linux-gcc-arm" "webui-2.so"
5153
download_and_extract $LINUX_ARM64 "webui-linux-gcc-arm64" "webui-2.so"
52-
download_and_extract $LINUX_X64 "webui-linux-gcc-x64" "webui-2.so"
54+
download_and_extract $LINUX_GCC_X64 "webui-linux-gcc-x64" "webui-2.so"
55+
download_and_extract $LINUX_CLANG_X64 "webui-linux-clang-x64" "webui-2.so"
5356
download_and_extract $MACOS_ARM64 "webui-macos-clang-arm64" "webui-2.dylib"
5457
download_and_extract $MACOS_X64 "webui-macos-clang-x64" "webui-2.dylib"
5558
download_and_extract $WINDOWS_MSVC_X64 "webui-windows-msvc-x64" "webui-2.dll"
@@ -73,7 +76,7 @@ if [[ "$1" == "minimal" ]]; then
7376

7477
# Detect OS (macOS / Linux)
7578
OS="linux"
76-
CC="gcc"
79+
CC="clang" # "gcc"
7780
EXT="so"
7881
if [[ "$OSTYPE" == "darwin"* ]]; then
7982
OS="macos"

PyPI/Package/src/webui/load_library.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def _get_library_folder_name() -> str:
3030
elif platform.system() == 'Windows':
3131
return f'\\webui-windows-msvc-{arch}\\webui-2.dll'
3232
elif platform.system() == 'Linux':
33-
return f'/webui-linux-gcc-{arch}/webui-2.so'
33+
return f'/webui-linux-clang-{arch}/webui-2.so' # return f'/webui-linux-gcc-{arch}/webui-2.so'
3434
else:
3535
return ""
3636

@@ -45,7 +45,7 @@ def run_cmd(command):
4545

4646

4747
def _download_library():
48-
script = 'sh bootstrap.sh'
48+
script = 'bash bootstrap.sh'
4949
cd = 'cd '
5050
if platform.system() == 'Windows':
5151
script = 'bootstrap.bat'

0 commit comments

Comments
 (0)