From 526b1af33c57047338b4f9839e20c7c6ca3b9c35 Mon Sep 17 00:00:00 2001 From: Marius456 Date: Tue, 12 Mar 2024 09:48:07 +0200 Subject: [PATCH 1/2] small fix --- packages/core/src/schema/configFiles/workspace.ts | 2 +- .../coreTemplateFiles/global-config-template.json | 2 +- packages/sdk-kaios/src/deviceManager.ts | 15 ++++----------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/packages/core/src/schema/configFiles/workspace.ts b/packages/core/src/schema/configFiles/workspace.ts index d946b1b43..ee2aceb35 100644 --- a/packages/core/src/schema/configFiles/workspace.ts +++ b/packages/core/src/schema/configFiles/workspace.ts @@ -14,7 +14,7 @@ const SDKsSchema = z // ANDROID_NDK: '~/Library/Android/sdk/ndk-bundle', // TIZEN_SDK: '~/tizen-studio', // WEBOS_SDK: '/opt/webOS_TV_SDK', -// KAIOS_SDK: '~/Library/KaiosSimulators', +// KAIOS_SDK: '~/Applications/KaiosSimulators', //LEVEl 0 (ROOT) diff --git a/packages/rnv/coreTemplateFiles/global-config-template.json b/packages/rnv/coreTemplateFiles/global-config-template.json index f448a5518..85b56a76c 100644 --- a/packages/rnv/coreTemplateFiles/global-config-template.json +++ b/packages/rnv/coreTemplateFiles/global-config-template.json @@ -4,7 +4,7 @@ "ANDROID_NDK": "/Users//Library/Android/sdk/ndk-bundle", "TIZEN_SDK": "/Users//tizen-studio", "WEBOS_SDK": "/Users//Library/webOS_TV_SDK", - "KAIOS_SDK": "/Users//Library/KaiosSimulators" + "KAIOS_SDK": "/Applications/KaiosSimulators" }, "defaultTargets": { "android": "Nexus_5X_API_26", diff --git a/packages/sdk-kaios/src/deviceManager.ts b/packages/sdk-kaios/src/deviceManager.ts index 9fdcad6b1..5f04a421e 100644 --- a/packages/sdk-kaios/src/deviceManager.ts +++ b/packages/sdk-kaios/src/deviceManager.ts @@ -40,15 +40,8 @@ export const launchKaiOSSimulator = async (target: string | boolean) => { return Promise.reject(`Can't find simulator at path: ${simulatorPath}`); } - await executeAsync(`${simulatorPath}`, ExecOptionsPresets.NO_SPINNER_FULL_ERROR_SUMMARY); - - // new Promise((resolve, reject) => { - // childProcess.exec(`(cd ${kaiosSdkPath}/${target}/kaiosrt && ${simulatorPath} )`, (err: RnvError) => { - // if (err) { - // reject(err); - // return; - // } - // resolve(); - // }); - // }); + await executeAsync( + `(cd ${kaiosSdkPath}/${target}/kaiosrt && ${simulatorPath} )`, + ExecOptionsPresets.NO_SPINNER_FULL_ERROR_SUMMARY + ); }; From f02b9bd20509962f15ec663528f2f6e18ff4d4fe Mon Sep 17 00:00:00 2001 From: Marius456 Date: Tue, 12 Mar 2024 13:09:53 +0200 Subject: [PATCH 2/2] fix kaios sim run command --- packages/sdk-kaios/src/deviceManager.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sdk-kaios/src/deviceManager.ts b/packages/sdk-kaios/src/deviceManager.ts index 5f04a421e..db0cc44b3 100644 --- a/packages/sdk-kaios/src/deviceManager.ts +++ b/packages/sdk-kaios/src/deviceManager.ts @@ -40,8 +40,8 @@ export const launchKaiOSSimulator = async (target: string | boolean) => { return Promise.reject(`Can't find simulator at path: ${simulatorPath}`); } - await executeAsync( - `(cd ${kaiosSdkPath}/${target}/kaiosrt && ${simulatorPath} )`, - ExecOptionsPresets.NO_SPINNER_FULL_ERROR_SUMMARY - ); + await executeAsync(simulatorPath, { + cwd: `${kaiosSdkPath}/${target}/kaiosrt`, + ...ExecOptionsPresets.NO_SPINNER_FULL_ERROR_SUMMARY, + }); };