Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
coverage
.tool-versions
releases
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "qjsextra/quickjs"]
path = qjsextra/quickjs
[submodule "qjswasm/quickjs"]
path = qjswasm/quickjs
url = https://github.com/quickjs-ng/quickjs.git
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

build:
@echo "Configuring and building qjs..."
cd qjsextra/quickjs && \
cd qjswasm/quickjs && \
rm -rf build && \
cmake -B build \
-DQJS_BUILD_LIBC=ON \
-DQJS_BUILD_CLI_WITH_MIMALLOC=OFF \
-DCMAKE_TOOLCHAIN_FILE=/opt/wasi-sdk/share/cmake/wasi-sdk.cmake \
-DCMAKE_PROJECT_INCLUDE=../qjsextra.cmake
-DCMAKE_PROJECT_INCLUDE=../qjswasm.cmake
@echo "Building qjs target..."
make -C qjsextra/quickjs/build qjsextra -j$(nproc)
@echo "Copying build/qjsextra to top-level as qjsextra.wasm..."
cp qjsextra/quickjs/build/qjsextra qjsextra.wasm
make -C qjswasm/quickjs/build qjswasm -j$(nproc)
@echo "Copying build/qjswasm to top-level as qjs.wasm..."
cp qjswasm/quickjs/build/qjswasm qjs.wasm

wasm-opt -O3 qjsextra.wasm -o qjsextra.wasm
wasm-opt -O3 qjs.wasm -o qjs.wasm

clean:
@echo "Cleaning build directory..."
Expand Down
Binary file renamed qjsextra.wasm → qjs.wasm
Binary file not shown.
1 change: 0 additions & 1 deletion qjsextra/quickjs
Submodule quickjs deleted from 5299e0
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
24 changes: 12 additions & 12 deletions qjsextra/qjsextra.cmake → qjswasm/qjswasm.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "WASI")
list(APPEND qjs_libs ${CMAKE_THREAD_LIBS_INIT})
endif()

add_executable(qjsextra
add_executable(qjswasm
# gen/repl.c
# gen/standalone.c
../eval.c
Expand All @@ -38,14 +38,14 @@ add_executable(qjsextra
../qjs.c
)

add_qjs_libc_if_needed(qjsextra)
add_static_if_needed(qjsextra)
add_qjs_libc_if_needed(qjswasm)
add_static_if_needed(qjswasm)

set_target_properties(qjsextra PROPERTIES
OUTPUT_NAME "qjsextra"
set_target_properties(qjswasm PROPERTIES
OUTPUT_NAME "qjswasm"
)

target_link_options(qjsextra PRIVATE
target_link_options(qjswasm PRIVATE
"LINKER:--export=js_std_await"
"LINKER:--export=New_QJS"
"LINKER:--export=New_QJSContext"
Expand Down Expand Up @@ -150,22 +150,22 @@ target_link_options(qjsextra PRIVATE
"LINKER:--export=initialize"
)

target_compile_options(qjsextra PRIVATE "-fvisibility=default")
target_compile_options(qjswasm PRIVATE "-fvisibility=default")

target_compile_definitions(qjsextra PRIVATE ${qjs_defines})
target_compile_definitions(qjswasm PRIVATE ${qjs_defines})

target_link_libraries(qjsextra qjs)
target_link_libraries(qjswasm qjs)

if(NOT WIN32)
set_target_properties(qjsextra PROPERTIES ENABLE_EXPORTS TRUE)
set_target_properties(qjswasm PROPERTIES ENABLE_EXPORTS TRUE)
endif()

if(QJS_BUILD_CLI_WITH_MIMALLOC OR QJS_BUILD_CLI_WITH_STATIC_MIMALLOC)
find_package(mimalloc REQUIRED)
if(QJS_BUILD_CLI_WITH_STATIC_MIMALLOC)
target_link_libraries(qjsextra mimalloc-static)
target_link_libraries(qjswasm mimalloc-static)
else()
target_link_libraries(qjsextra mimalloc)
target_link_libraries(qjswasm mimalloc)
endif()
endif()

Expand Down
1 change: 1 addition & 0 deletions qjswasm/quickjs
Submodule quickjs added at 6167dc
2 changes: 1 addition & 1 deletion runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
wsp1 "github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1"
)

//go:embed qjsextra.wasm
//go:embed qjs.wasm
var wasmBytes []byte

var (
Expand Down
Loading