diff --git a/meson.build b/meson.build index 00a0bd83..1bb10870 100644 --- a/meson.build +++ b/meson.build @@ -234,7 +234,7 @@ foreach inc : includes includers += include_directories(inc) endforeach -zip_folders = ['scripts', 'fonts', 'icons', 'shaders'] +zip_folders = ['scripts', 'fonts', 'icons'] zip_paths = [] foreach folder: zip_folders zip_paths += meson.project_source_root() / folder @@ -246,7 +246,7 @@ core = custom_target('core.zip', command : ['sh', '-c', 'cd ' + meson.project_source_root() + ' && echo "Rebuilding core.zip" && rm -f ' + meson.current_build_dir() + '/core.zip && ' + - 'zip -r ' + meson.current_build_dir() + '/core.zip scripts fonts icons shaders' + 'zip -r ' + meson.current_build_dir() + '/core.zip scripts fonts icons' ], build_always_stale: true, build_by_default: true diff --git a/source/qjs_js.c b/source/qjs_js.c index 7fe5dcc7..7763f585 100644 --- a/source/qjs_js.c +++ b/source/qjs_js.c @@ -99,17 +99,16 @@ JSC_CCALL(js_eval_compile, #include "qjs_blob.h" JSC_CCALL(js_compile_blob, - JSRuntime *rt = JS_GetRuntime(js); - JS_SetStripInfo(rt, JS_STRIP_SOURCE); - JS_SetStripInfo(rt, JS_STRIP_DEBUG); +// JSRuntime *rt = JS_GetRuntime(js); +// JS_SetStripInfo(rt, JS_STRIP_SOURCE); +// JS_SetStripInfo(rt, JS_STRIP_DEBUG); size_t size; uint8_t *data = JS_WriteObject(js, &size, argv[0], JS_WRITE_OBJ_BYTECODE); ret = js_new_blob_stoned_copy(js, data, size); - printf("found size to be %u\n", size); free(data); ) -JSC_CCAL(js_compile_unblob, +JSC_CCALL(js_compile_unblob, size_t size; void *data = js_get_blob_data(js, &size, argv[0]); if (!data) return JS_ThrowReferenceError(js, "Must be a stoned blob."); @@ -195,6 +194,7 @@ static const JSCFunctionListEntry js_js_funcs[] = { MIST_FUNC_DEF(js, compile, 2), MIST_FUNC_DEF(js, eval_compile, 1), MIST_FUNC_DEF(js, compile_blob, 1), + MIST_FUNC_DEF(js, compile_unblob, 1), MIST_FUNC_DEF(os, rt_info, 0), }; diff --git a/source/qjs_sdl_video.c b/source/qjs_sdl_video.c index a59fa9ea..378a620c 100644 --- a/source/qjs_sdl_video.c +++ b/source/qjs_sdl_video.c @@ -1814,7 +1814,7 @@ JSValue js_sdl_video_use(JSContext *js) { "./prosperon", "spawn", "--id", id, - "--program", "scripts/core/_sdl_video.js", + "--program", "_sdl_video.js", "--main", "1" }; int argc = 8; diff --git a/tests/blob.js b/tests/blob.js index 24dbdbc7..90133af2 100644 --- a/tests/blob.js +++ b/tests/blob.js @@ -10,10 +10,6 @@ // Attempt to "use" the blob module as if it was installed or compiled in. var Blob = use('blob') -var pp = new Blob() - -log.console(pp.length) - // If you're testing in an environment without a 'use' loader, you might do // something like importing the compiled C module or linking it differently. diff --git a/tests/parseq.js b/tests/parseq.js index 9aa29a86..3e5be79f 100644 --- a/tests/parseq.js +++ b/tests/parseq.js @@ -17,16 +17,6 @@ var tree = { ] } -stone(tree) - -log.console(tree) - -log.console(stone.p(tree)) -log.console(stone.p("false")) -log.console(stone.p(9)) -log.console(stone.p(undefined)) -log.console(stone.p({})) - var os = use('os') var st = os.now() var actor