diff --git a/arkoala-arkts/libarkts/arktsconfig.json b/arkoala-arkts/libarkts/arktsconfig.json index 73b2499d4770bcbd75d3ff78cc81c6c63ae9089f..4c428b783b152ca9ae3e7a1994a03b60c3ceca65 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 d736cb5d3caf21be4e7c2e6a83b855a45dbd757f..0da91e9163fd0b447ab735a0352ee23bbf6f757e 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 9359998661bd48ccd09ddfe67b44b33c1e81ce03..cd93cfc62785d19eb0fba680fe36d537622becd5 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 749e73f9b1017ccd27fdd03b038c842c4fa8db2f..f72484a52e74db64d00c9114b5586a26d6ec419e 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", @@ -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 7087fc465404a2e3bbe2e326f465a862f82940b7..438cc37a430cad357339a85c8f6d1d9fc64eaf34 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 0ed406401d665ca16be725d0e82e1905ac7c7cb7..ae8f4f7ab4144a59e563a289703ae4aad6444e76 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; diff --git a/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts b/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts index 3f80d9f856dbc2baef60ea8b11ba60b68053e9d8..2201c3d4cf99645e75e36eb8636be8c4031dc90b 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 {