Merge branch 'envVariables'

Author: DonJayamanne

package.json

@@ -120,7 +120,12 @@
  "WaitOnNormalExit",
  "RedirectOutput"
  ]
- }
+ },
+ "env": {
+ "type": "object",
+ "description": "Environment variables defined as a key value pair. Property ends up being the Environment Variable and the value of the property ends up being the value of the Env Variable.",
+ "default": null
+ } 
  }
  },
  "attach": {

src/client/common/open.ts

@@ -19,6 +19,9 @@ export function open(opts: any): Promise<childProcess.ChildProcess> {
  if (opts.cwd) {
  cpOpts.cwd = opts.cwd;
  }
+ if (opts.env) {
+ cpOpts.env = opts.env;
+ }
 
  if (Array.isArray(opts.app)) {
  appArgs = opts.app.slice(1);

src/client/debugger/Common/Contracts.ts

@@ -27,6 +27,7 @@ export interface LaunchRequestArguments extends DebugProtocol.LaunchRequestArgum
  externalConsole?: boolean;
  cwd?: string;
  debugOptions?: string[];
+ env?: Object;
 }
 // 
 // export interface LaunchDjangoRequestArguments extends LaunchRequestArguments {

src/client/debugger/DebugClients/LocalDebugClient.ts

@@ -54,7 +54,7 @@ export class LocalDebugClient extends DebugClient {
  if (typeof this.args.pythonPath === "string" && this.args.pythonPath.trim().length > 0) {
  pythonPath = this.args.pythonPath;
  }
-
+ var environmentVariables = this.args.env ? this.args.env : {};
  //GUID is hardcoded for now, will have to be fixed 
  var currentFileName = module.filename;
  var ptVSToolsFilePath = path.join(path.dirname(currentFileName), "..", "..", "..", "..", "pythonFiles", "PythonTools", "visualstudio_py_launcher.py");
@@ -63,7 +63,7 @@ export class LocalDebugClient extends DebugClient {
  var args = [ptVSToolsFilePath, fileDir, dbgServer.port.toString(), "34806ad9-833a-4524-8cd6-18ca4aa74f14"].concat(launcherArgs);
  console.log(pythonPath + " " + args.join(" "));
  if (this.args.externalConsole === true) {
- open({ wait: false, app: [pythonPath].concat(args), cwd:processCwd }).then(proc=> {
+ open({ wait: false, app: [pythonPath].concat(args), cwd: processCwd, env: environmentVariables }).then(proc=> {
  this.pyProc = proc;
  resolve();
  }, error=> {
@@ -80,7 +80,7 @@ export class LocalDebugClient extends DebugClient {
  return;
  }
 
- this.pyProc = child_process.spawn(pythonPath, args, { cwd: processCwd });
+ this.pyProc = child_process.spawn(pythonPath, args, { cwd: processCwd, env: environmentVariables });
  this.pyProc.on("error", error=> {
  if (!this.debugServer && this.debugServer.IsRunning) {
  return;