${workspaceFolder} is not working for "environmentSetupScript" option…

… in project cmake-kits.json file microsoft#1309 Signed-off-by: alan-wr <aijun.shi@windriver.com>
alan-wr · Aug 22, 2020 · a27f649 · a27f649
1 parent 2f28ef7
commit a27f649
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/kit.ts b/src/kit.ts
@@ -589,12 +589,11 @@ export async function getShellScriptEnvironment(kit: Kit, opts?: expand.Expansio
  let script = '';
  let run_command = '';
 
- let environmentSetupScript = kit.environmentSetupScript + '';
+ let environmentSetupScript = kit.environmentSetupScript;
  if (opts) {
  environmentSetupScript = await expand.expandString(environmentSetupScript, opts);
  }
 
- // environmentSetupScript = await expand.expandString(${kit.environmentSetupScript}, CMakeDriver.expansionOptions);
  if (process.platform == 'win32') { // windows
  script += `call "${environmentSetupScript}"\r\n`; // call the user batch script
  script += `set >> ${environment_path}`; // write env vars to temp file