Fix setenv scripts

Author: arturl

setup_ps_env.ps1

@@ -8,12 +8,19 @@ function Get-Batchfile ($file) {
 
 function VsVars32()
 {
-    $vs100comntools = (Get-ChildItem env:VS110COMNTOOLS).Value
-    $batchFile = [System.IO.Path]::Combine($vs100comntools, "vsvars32.bat")
+    $vs110comntools = (Get-ChildItem env:VS110COMNTOOLS).Value
+    $batchFile = [System.IO.Path]::Combine($vs110comntools, "vsvars32.bat")
     Get-Batchfile $BatchFile
 }
 
 "Initializing Casablanca Powershell VS2012 Environment"
 
 # get VS tools
 VsVars32
+
+# set VisualStudioVersion - this is set by vcvarsall.bat under VS 11 and is needed to correctly build
+# on a machine with both Dev10 and Dev11 installed.
+$Env:VisualStudioVersion = "11.0"
+
+# set environment variable to select between Dev10 and Dev11 projects in the various dirs.proj
+$Env:DevToolsVersion = "110"

setup_ps_env100.ps1

@@ -0,0 +1,25 @@
+Param([string]$TfsWorkspace='')
+
+function Get-Batchfile ($file) {
+    $cmd = "`"$file`" & set"
+    cmd /c $cmd | Foreach-Object {
+        $p, $v = $_.split('=')
+        Set-Item -path env:$p -value $v
+    }
+}
+
+function VsVars32()
+{
+    $vs100comntools = (Get-ChildItem env:VS100COMNTOOLS).Value
+    $batchFile = [System.IO.Path]::Combine($vs100comntools, "vsvars32.bat")
+    Get-Batchfile $BatchFile
+}
+
+"Initializing Casablanca Powershell VS2010 Environment"
+
+# get VS tools
+"Calling vsvars32"
+VsVars32
+
+# set environment variable to select between Dev10 and Dev11 projects in the various dirs.proj
+$Env:DevToolsVersion = "100"