Merge pull request #36 from midouest/pdc-cwd

pdc executes from workspace root
midouest · Oct 22, 2023 · b75d6e4 · b75d6e4
2 parents ddc2420 + b137578
commit b75d6e4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/core/ConfigurationResolver.ts b/src/core/ConfigurationResolver.ts
@@ -11,6 +11,7 @@ import { readSDKPath } from "./readSDKPath";
 import { readSDKVersion } from "./readSDKVersion";
 
 export interface Configuration {
+  workspaceRoot: string;
   sdkPath: string;
   sdkVersion: string;
   sourcePath: string;
@@ -88,6 +89,7 @@ export class ConfigurationResolver {
     const gamePath = productPath + ".pdx";
 
     return {
+      workspaceRoot,
       sdkPath,
       sdkVersion,
       sourcePath,

diff --git a/src/pdc/PDCExecutionFactory.ts b/src/pdc/PDCExecutionFactory.ts
@@ -31,6 +31,7 @@ export class PDCExecutionFactory implements TaskExecutionFactory {
     }
 
     const {
+      workspaceRoot,
       sdkPath: sdkPathConfig,
       sourcePath: sourcePathConfig,
       gamePath: gamePathConfig,
@@ -55,6 +56,7 @@ export class PDCExecutionFactory implements TaskExecutionFactory {
 
     const execution = new vscode.CustomExecution(async () => {
       const runner = new PDCTaskRunner({
+        workspaceRoot,
         sdkPath,
         sourcePath,
         gamePath,

diff --git a/src/pdc/PDCTaskRunner.ts b/src/pdc/PDCTaskRunner.ts
@@ -14,6 +14,7 @@ import { getPDCCommand, GetPDCCommandOptions } from "./getPDCCommand";
  * `tasks.json`.
  */
 export interface PDCTaskRunnerOptions {
+  workspaceRoot: string;
   sdkPath: string;
   sourcePath: string;
   gamePath: string;
@@ -34,6 +35,7 @@ export class PDCTaskRunner implements TaskRunner {
   constructor(private options: PDCTaskRunnerOptions) {}
 
   async run(onMessage: OnTaskRunnerMessage): Promise<void> {
+    const { workspaceRoot } = this.options;
     const pdcOptions = this.getPDCOptions();
     const pdcCommand = getPDCCommand(pdcOptions);
 
@@ -50,7 +52,7 @@ export class PDCTaskRunner implements TaskRunner {
 
     onMessage("Compiling...");
     onMessage(`> ${pdcCommand}`);
-    await exec(pdcCommand);
+    await exec(pdcCommand, { cwd: workspaceRoot });
   }
 
   private getPDCOptions(): GetPDCCommandOptions {