Merge pull request coapp#89 from jmecosta/vs2014

add vs 2014 support
dakotahawkins · Oct 2, 2014 · 9b95630 · 9b95630
2 parents 741868e + ce6124d
commit 9b95630
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 8 deletions.
diff --git a/CoApp.Powershell/etc/Pivots.properties b/CoApp.Powershell/etc/Pivots.properties
@@ -3,7 +3,7 @@
 configurations {
     Toolsets { 
         key : "PlatformToolset"; 
-        choices: { v120, v110, v100, v90, v80, v71, v70, v60, gcc, v110_xp, v110_wp80, v120_xp, v120_wp80,  v120_wp81 };  
+        choices: { v140, v120, v110, v100, v90, v80, v71, v70, v60, gcc, v110_xp, v110_wp80, v120_xp, v120_wp80,  v120_wp81, v140_xp, v140_wp80,  v140_wp81 };  
 
         v110_wp80 { 
             accept : { x86, arm, WindowsPhone8 };
@@ -46,6 +46,35 @@ configurations {
             };
         };
 
+
+
+        v140_wp80 { 
+            accept : { x86, arm, WindowsPhone8 };
+
+            isInstalled : { 
+                FileExists="c:\invalid_file.xyz";
+            };
+        };
+
+
+        v140_wp81 { 
+            accept : { x86, arm, WindowsPhone8 };
+
+            isInstalled : { 
+                FileExists="c:\invalid_file.xyz";
+            };
+        };
+
+        v140_xp { 
+            accept : { Win32, x64, Desktop };
+
+            isInstalled : { 
+                FileExists="c:\invalid_file.xyz";
+            };
+        };
+
+
+
         gcc { 
             accept : { Win32, x64, Desktop };
 
@@ -143,7 +172,23 @@ configurations {
             };
         };
 
-
+        v140 {
+            // We're normalizing out the concept of the v140 platform -- Overloading the $(PlatformToolset) variable for additional pivots was a dumb idea.
+            condition = "( '$(PlatformToolset.ToLower())' == 'v140' Or '$(PlatformToolset.ToLower())' == 'windowskernelmodedriver8' Or '$(PlatformToolset.ToLower())' == 'windowsapplicationfordrivers8' Or '$(PlatformToolset.ToLower())' == 'windowsusermodedriver8' )";
+            deny : { AnyCPU };
+
+            isInstalled : { 
+                FileExists="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat";
+            };
+
+            activate {  
+                .GetEnvironmentFromBatchFile { 
+                    BatchFile="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat";
+                    Parameters=${Platform}; //.Replace(arm,x86_arm)
+                };
+            };
+        };
+            
     };
  
     Platforms {
@@ -278,31 +323,31 @@ configurations {
         WinRT {
             aliases : { WinRT, Metro, Modern };
             condition = ${WinRT_condition};
-            accept : { v120, v110 };
+            accept : { v140, v120, v110 };
         };
 
         Phone8 {
             aliases : { Phone8, Phone, WindowsPhone };
             condition = ${Phone8_condition};
-            accept : { v120, v110 };
+            accept : { v140, v120, v110 };
         };
 
         KernelModeDriver {
             aliases : { KernelModeDriver, Kernel, KernelDriver ,Driver };
             condition = ${KernelModeDriver_condition};
-            accept : { v120, v110 };
+            accept : { v140, v120, v110 };
         };
 
         ApplicationForDriver { 
             aliases : { ApplicationForDriver };
             condition = ${ApplicationForDriver_condition};
-            accept : { v120, v110 };
+            accept : { v140, v120, v110 };
         };
 
         UserModeDriver {
             aliases  : { UserModeDriver, UserMode, UserDriver };
             condition = ${UserModeDriver_condition};
-            accept : { v120, v110 };
+            accept : { v140, v120, v110 };
         };
 
     }

diff --git a/CoApp.Powershell/etc/common-variables.vcxproj b/CoApp.Powershell/etc/common-variables.vcxproj
@@ -16,6 +16,7 @@
     <IS_RELEASE>false</IS_RELEASE>
     <IS_DEBUG>false</IS_DEBUG>
 
+    <IS_V140>false</IS_V140>
     <IS_V120>false</IS_V120>
     <IS_V110>false</IS_V110>
     <IS_V100>false</IS_V100>
@@ -39,6 +40,7 @@
     <IS_RELEASE Condition="$(Configuration.ToLower().IndexOf('debug')) == -1">true</IS_RELEASE>
     <IS_DEBUG Condition="$(Configuration.ToLower().IndexOf('debug')) != -1">true</IS_DEBUG>
 
+    <IS_V140 Condition="$(PlatformToolset.ToLower().IndexOf('v140')) != -1">true</IS_V140>
     <IS_V120 Condition="$(PlatformToolset.ToLower().IndexOf('v120')) != -1">true</IS_V120>
     <IS_V110 Condition="$(PlatformToolset.ToLower().IndexOf('v110')) != -1">true</IS_V110>
     <IS_V100 Condition="$(PlatformToolset.ToLower().IndexOf('v100')) != -1">true</IS_V100>

diff --git a/CoApp.Powershell/etc/vc14.toolinfo b/CoApp.Powershell/etc/vc14.toolinfo
@@ -0,0 +1,35 @@
+
+VC_V140_X64 {
+    // do what is neccesary to generate the environment.
+    .GetEnvironmentFromBatchFile { 
+      BatchFile="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat";
+      Parameters="amd64";
+    };
+};
+
+VC_V140_WIN32 { 
+    .SetEnvironmentFromTarget.Target = "VC_V140_X86";
+    .Error.Condition = !$(IsEnvironmentValid);
+};
+
+VC_V140_AMD64 {
+    .SetEnvironmentFromTarget.Target = "VC_V140_X64";
+    .Error.Condition = !$(IsEnvironmentValid);
+};
+
+VC_V140_X86 {
+    // do what is neccesary to generate the environment.
+    .GetEnvironmentFromBatchFile { 
+      BatchFile="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat";
+      Parameters="x86";
+    };
+};
+
+
+VC_V140_ARM {
+    // do what is neccesary to generate the environment.
+    .GetEnvironmentFromBatchFile { 
+      BatchFile="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat";
+      Parameters="x86_arm";
+    };
+};
diff --git a/clrplus/Scripting.MsBuild/Building/template.buildinfo b/clrplus/Scripting.MsBuild/Building/template.buildinfo
@@ -7,7 +7,7 @@ commands {
 configurations {
     Toolset { 
         key : "PlatformToolset"; 
-        choices: { v110, v100, v90, v80, v71, v70, v60, gcc, v110_xp, v110_wp80 };  
+        choices: {v140, v120, v110, v100, v90, v80, v71, v70, v60, gcc, v110_xp, v110_wp80 };  
 		// Explicitly Not including pivot variants:  "WindowsKernelModeDriver8.0", "WindowsApplicationForDrivers8.0", "WindowsUserModeDriver8.0" 
 
 		// We're normalizing out the concept of the v110 platform -- Overloading the $(PlatformToolset) variable for additional pivots was a dumb idea.