From b946b00d9b7f283a3980f21a2b5cc0cbca698329 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Fri, 17 Jan 2025 14:45:04 +0300 Subject: [PATCH 1/2] Moved to common @panda/sdk Signed-off-by: Alexander Gorshenev --- arkoala-arkts/libarkts/arktsconfig.json | 2 +- arkoala-arkts/libarkts/native/meson_options.txt | 2 +- arkoala-arkts/libarkts/native/src/common.cc | 2 +- arkoala-arkts/libarkts/package.json | 2 +- arkoala-arkts/libarkts/playground/meson_options.txt | 2 +- arkoala-arkts/libarkts/playground/src/playground.cc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arkoala-arkts/libarkts/arktsconfig.json b/arkoala-arkts/libarkts/arktsconfig.json index 73b2499d4..4c428b783 100644 --- a/arkoala-arkts/libarkts/arktsconfig.json +++ b/arkoala-arkts/libarkts/arktsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "outDir": "./abc", - "baseUrl": "../node_modules/@panda/sdk/ets/stdlib", + "baseUrl": "../../incremental/tools/panda/node_modules/@panda/sdk/ets/stdlib", "paths": { "std": [ "./std" diff --git a/arkoala-arkts/libarkts/native/meson_options.txt b/arkoala-arkts/libarkts/native/meson_options.txt index d736cb5d3..0da91e916 100644 --- a/arkoala-arkts/libarkts/native/meson_options.txt +++ b/arkoala-arkts/libarkts/native/meson_options.txt @@ -1,6 +1,6 @@ option('node_modules_dir', type : 'string', value : '../../node_modules/', description : 'path to node_modules') -option('panda_sdk_dir', type : 'string', value : '../../node_modules/@panda/sdk/', +option('panda_sdk_dir', type : 'string', value : '../../../incremental/tools/panda/node_modules/@panda/sdk/', description : 'path to panda sdk') option('interop_src_dir', type : 'string', value : '../../../interop/src/cpp/', description : 'path to interop') diff --git a/arkoala-arkts/libarkts/native/src/common.cc b/arkoala-arkts/libarkts/native/src/common.cc index 935999866..cd93cfc62 100644 --- a/arkoala-arkts/libarkts/native/src/common.cc +++ b/arkoala-arkts/libarkts/native/src/common.cc @@ -39,7 +39,7 @@ static es2panda_Impl *impl = nullptr; #define LIB_SUFFIX ".so" #endif -const char* libpath = "../node_modules/@panda/sdk/" PLUGIN_DIR "/lib/" LIB_PREFIX "es2panda-public" LIB_SUFFIX; +const char* libpath = "../../incremental/tools/panda/node_modules/@panda/sdk/" PLUGIN_DIR "/lib/" LIB_PREFIX "es2panda-public" LIB_SUFFIX; es2panda_Impl *GetImpl() { if (impl) { diff --git a/arkoala-arkts/libarkts/package.json b/arkoala-arkts/libarkts/package.json index 749e73f9b..2f31d920c 100644 --- a/arkoala-arkts/libarkts/package.json +++ b/arkoala-arkts/libarkts/package.json @@ -25,7 +25,7 @@ "mocha": "TS_NODE_PROJECT=./test/tsconfig.json mocha -r tsconfig-paths/register --reporter-option maxDiffSize=0", "test": "npm run compile:native && npm run mocha", - "run:abc": "node_modules/@panda/sdk/linux_host_tools/bin/ark --load-runtimes=ets --boot-panda-files=node_modules/@panda/sdk/ets/etsstdlib.abc ./generated/main.abc ETSGLOBAL::main", + "run:abc": "../../incremental/tools/panda/node_modules/@panda/sdk/linux_host_tools/bin/ark --load-runtimes=ets --boot-panda-files=../../incremental/tools/panda/node_modules/@panda/sdk/ets/etsstdlib.abc ./generated/main.abc ETSGLOBAL::main", "compile:playground": "cd playground && meson setup build && meson compile -C build", "run:playground": "npm run compile:playground && ./playground/build/playground.out" diff --git a/arkoala-arkts/libarkts/playground/meson_options.txt b/arkoala-arkts/libarkts/playground/meson_options.txt index 7087fc465..438cc37a4 100644 --- a/arkoala-arkts/libarkts/playground/meson_options.txt +++ b/arkoala-arkts/libarkts/playground/meson_options.txt @@ -1,4 +1,4 @@ -option('panda_sdk_dir', type : 'string', value : '../../node_modules/@panda/sdk/', +option('panda_sdk_dir', type : 'string', value : '../../../incremental/tools/panda/node_modules/@panda/sdk/', description : 'path to panda sdk') option('interop_src_dir', type : 'string', value : '../../../interop/src/cpp/', description : 'path to interop_src') diff --git a/arkoala-arkts/libarkts/playground/src/playground.cc b/arkoala-arkts/libarkts/playground/src/playground.cc index 0ed406401..ae8f4f7ab 100644 --- a/arkoala-arkts/libarkts/playground/src/playground.cc +++ b/arkoala-arkts/libarkts/playground/src/playground.cc @@ -9,7 +9,7 @@ #define PLUGIN_DIR "linux_arm64_host_tools" #endif -const char* libpath = "../node_modules/@panda/sdk/" PLUGIN_DIR "/lib/libes2panda-public.so"; +const char* libpath = "../../incremental/tools/panda/node_modules/@panda/sdk/" PLUGIN_DIR "/lib/libes2panda-public.so"; static es2panda_Impl *impl = nullptr; -- Gitee From 95017044844dc20113beb36126b752d694000297 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Fri, 17 Jan 2025 14:48:38 +0300 Subject: [PATCH 2/2] more Signed-off-by: Alexander Gorshenev --- arkoala-arkts/libarkts/package.json | 2 +- arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arkoala-arkts/libarkts/package.json b/arkoala-arkts/libarkts/package.json index 2f31d920c..f72484a52 100644 --- a/arkoala-arkts/libarkts/package.json +++ b/arkoala-arkts/libarkts/package.json @@ -12,7 +12,7 @@ "dependencies": { }, "scripts": { - "panda:sdk:install": "npm install --prefix .. --no-save @panda/sdk@next", + "panda:sdk:install": "cd ../../incremental/tools/panda && npm run panda:sdk:install", "compile:koala:interop": "npm run --prefix ../../interop compile", "compile:meson": "cd native && meson setup build && meson compile -C build", "copy:.node": "mkdir -p ./build/native/build && cp ./native/build/es2panda.node ./build/native/build", diff --git a/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts b/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts index 3f80d9f85..2201c3d4c 100644 --- a/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts +++ b/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts @@ -134,7 +134,7 @@ export class Es2pandaNativeModule { _ScriptFunctionSetIdent(context: KPtr, ast: KPtr, id: KPtr): KPtr { throw new Error("Not implemented") } - _ScriptFunctionIrSignature(context: KPtr, ast: KPtr): KPtr { + _ScriptFunctionSignature(context: KPtr, ast: KPtr): KPtr { throw new Error("Not implemented") } _ScriptFunctionSetSignature(context: KPtr, ast: KPtr, signature: KPtr): KPtr { -- Gitee