[Mobies-commit] [commit] r3792 - in UDM/trunk: . Projects/Win32/VC10/src

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu Jul 14 11:07:17 2011
New Revision: 3792

Log:
Take UdmCli out of Udm.sln

Modified:
   UDM/trunk/Projects/Win32/VC10/src/Udm.sln
   UDM/trunk/make.msbuild

Modified: UDM/trunk/Projects/Win32/VC10/src/Udm.sln
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Udm.sln	Thu Jul 14 11:07:16 2011	(r3791)
+++ UDM/trunk/Projects/Win32/VC10/src/Udm.sln	Thu Jul 14 11:07:17 2011	(r3792)
@@ -50,12 +50,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MPCGen", "MPCGen\MPCGen.vcxproj", "{7E5263AA-49FA-4EA3-89D8-427F40C5B0BC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UdmCliBridge", "UdmCliBridge\UdmCliBridge.vcxproj", "{23D887FD-5A09-4F84-A8B1-DC67A4A632F0}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UdmPython", "UdmPython\UdmPython.vcxproj", "{55409968-F077-4A87-87D5-F28DB28181C2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UdmCliSwig", "UdmCliSwig\UdmCliSwig.vcxproj", "{E96F4873-D47D-4513-97B6-D0A2869434BC}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		BootUdmCompile Debug|Win32 = BootUdmCompile Debug|Win32
@@ -214,26 +210,12 @@
 		{7E5263AA-49FA-4EA3-89D8-427F40C5B0BC}.Debug|Win32.Build.0 = Debug|Win32
 		{7E5263AA-49FA-4EA3-89D8-427F40C5B0BC}.Release|Win32.ActiveCfg = Release|Win32
 		{7E5263AA-49FA-4EA3-89D8-427F40C5B0BC}.Release|Win32.Build.0 = Release|Win32
-		{23D887FD-5A09-4F84-A8B1-DC67A4A632F0}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
-		{23D887FD-5A09-4F84-A8B1-DC67A4A632F0}.BootUdmCompile Release|Win32.ActiveCfg = Release|Win32
-		{23D887FD-5A09-4F84-A8B1-DC67A4A632F0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23D887FD-5A09-4F84-A8B1-DC67A4A632F0}.Debug|Win32.Build.0 = Debug|Win32
-		{23D887FD-5A09-4F84-A8B1-DC67A4A632F0}.Release|Win32.ActiveCfg = Release|Win32
-		{23D887FD-5A09-4F84-A8B1-DC67A4A632F0}.Release|Win32.Build.0 = Release|Win32
 		{55409968-F077-4A87-87D5-F28DB28181C2}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
 		{55409968-F077-4A87-87D5-F28DB28181C2}.BootUdmCompile Release|Win32.ActiveCfg = Release|Win32
 		{55409968-F077-4A87-87D5-F28DB28181C2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{55409968-F077-4A87-87D5-F28DB28181C2}.Debug|Win32.Build.0 = Debug|Win32
 		{55409968-F077-4A87-87D5-F28DB28181C2}.Release|Win32.ActiveCfg = Release|Win32
 		{55409968-F077-4A87-87D5-F28DB28181C2}.Release|Win32.Build.0 = Release|Win32
-		{E96F4873-D47D-4513-97B6-D0A2869434BC}.BootUdmCompile Debug|Win32.ActiveCfg = Release|Win32
-		{E96F4873-D47D-4513-97B6-D0A2869434BC}.BootUdmCompile Debug|Win32.Build.0 = Release|Win32
-		{E96F4873-D47D-4513-97B6-D0A2869434BC}.BootUdmCompile Release|Win32.ActiveCfg = Release|Win32
-		{E96F4873-D47D-4513-97B6-D0A2869434BC}.BootUdmCompile Release|Win32.Build.0 = Release|Win32
-		{E96F4873-D47D-4513-97B6-D0A2869434BC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E96F4873-D47D-4513-97B6-D0A2869434BC}.Debug|Win32.Build.0 = Debug|Win32
-		{E96F4873-D47D-4513-97B6-D0A2869434BC}.Release|Win32.ActiveCfg = Release|Win32
-		{E96F4873-D47D-4513-97B6-D0A2869434BC}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: UDM/trunk/make.msbuild
==============================================================================
--- UDM/trunk/make.msbuild	Thu Jul 14 11:07:16 2011	(r3791)
+++ UDM/trunk/make.msbuild	Thu Jul 14 11:07:17 2011	(r3792)
@@ -24,9 +24,7 @@
   <Target Name="BuildVS10" DependsOnTargets="CheckEnv">
     <MSBuild Projects="Projects\Win32\VC10\src\UdmDll\UdmDll.vcxproj" Targets="Build" Properties="Configuration=Debug" />
     <MSBuild Projects="Projects\Win32\VC10\src\UdmDll\UdmDll.vcxproj" Targets="Build" Properties="Configuration=Release" />
-    <!-- Need to compile UdmCliBridge before UdmCli, since the generated .cs files aren't picked up if we build UdmCli only -->
-    <MSBuild Projects="Projects\Win32\VC10\src\UdmCliBridge\UdmCliBridge.vcxproj" Targets="Build" Properties="Configuration=Release" />
-    <MSBuild Projects="Projects\Win32\VC10\src\UdmCli\UdmCli.csproj" Targets="Build" Properties="Configuration=Release" />
+    <MSBuild Projects="Projects\Win32\VC10\src\UdmCli.sln" Targets="Build" Properties="Configuration=Release" />
     <MSBuild Projects="Projects\Win32\VC10\src\UdmPython\UdmPython.vcxproj" Targets="Build" Properties="Configuration=Debug" />
     <MSBuild Projects="Projects\Win32\VC10\src\UdmPython\UdmPython.vcxproj" Targets="Build" Properties="Configuration=Release" />
     <MSBuild Projects="Projects\Win32\VC10\src\UdmPython\UdmPython.vcxproj" Targets="Build" Properties="Configuration=Release27" />