[commit] r2041 - in trunk: GME Install/Build

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Sep  5 16:31:00 2012
New Revision: 2041

Log:
Move DotNetPIAs to build.py; it breaks parallel build

Modified:
   trunk/GME/GME.sln
   trunk/Install/Build/build.py

Modified: trunk/GME/GME.sln
==============================================================================
--- trunk/GME/GME.sln	Wed Sep  5 16:30:44 2012	(r2040)
+++ trunk/GME/GME.sln	Wed Sep  5 16:31:00 2012	(r2041)
@@ -34,8 +34,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MgaDotNetServices", "MgaDotNetServices\MgaDotNetServices.csproj", "{955209A1-8107-43C2-B0A7-729B03908C64}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DotNetPIAs", "DotNetPIAs\DotNetPIAs.vcxproj", "{57E1446E-6F58-44CD-B381-5D6A7F0509EB}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -311,22 +309,6 @@
 		{955209A1-8107-43C2-B0A7-729B03908C64}.Release|Win32.Build.0 = Release|Any CPU
 		{955209A1-8107-43C2-B0A7-729B03908C64}.Release|x64.ActiveCfg = Release|Any CPU
 		{955209A1-8107-43C2-B0A7-729B03908C64}.Release|x64.Build.0 = Release|Any CPU
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Debug|Win32.Build.0 = Debug|Win32
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Debug|x64.ActiveCfg = Debug|x64
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Debug|x64.Build.0 = Debug|x64
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Release_PGO_Instrument|Win32.ActiveCfg = Release|Win32
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Release_PGO_Instrument|Win32.Build.0 = Release|Win32
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Release_PGO_Instrument|x64.ActiveCfg = Release|x64
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Release_PGO_Instrument|x64.Build.0 = Release|x64
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Release_PGO_Optimize|Win32.ActiveCfg = Release|Win32
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Release_PGO_Optimize|Win32.Build.0 = Release|Win32
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Release_PGO_Optimize|x64.ActiveCfg = Release|x64
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Release_PGO_Optimize|x64.Build.0 = Release|x64
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Release|Win32.ActiveCfg = Release|Win32
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Release|Win32.Build.0 = Release|Win32
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Release|x64.ActiveCfg = Release|x64
-		{57E1446E-6F58-44CD-B381-5D6A7F0509EB}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py	Wed Sep  5 16:30:44 2012	(r2040)
+++ trunk/Install/Build/build.py	Wed Sep  5 16:31:00 2012	(r2041)
@@ -101,6 +101,8 @@
     tools.build_VS( sln_file, "Release" )
     sln_file = os.path.join(GME_ROOT, "GME", "GMEDecorators.sln")
     tools.build_VS( sln_file, "Release" )
+    sln_file = os.path.join(GME_ROOT, "GME", "DotNetPIAs", "DotNetPIAs.vcxproj")
+    tools.build_VS( sln_file, "Release" )
     cmd_dir = os.path.join(GME_ROOT, "GME")
     tools.system( ['call', 'regrelease.bat'] + (['x64'] if prefs['arch'] == 'x64' else []) + ['<NUL'], cmd_dir)