From 45bfa0dfbb133423a9166f6ec5d3849213932052 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Mon, 8 Nov 2004 01:28:08 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=4502
---
 checkin_notes                            |   8 ++
 clientgui/BOINCGUI.sln                   |  21 ----
 clientgui/win_config.h                   |   3 -
 {clientgui => win_build}/BOINCGUI.vcproj | 138 +++++++++++------------
 win_build/boinc.sln                      |   8 ++
 5 files changed, 85 insertions(+), 93 deletions(-)
 delete mode 100644 clientgui/BOINCGUI.sln
 delete mode 100644 clientgui/win_config.h
 rename {clientgui => win_build}/BOINCGUI.vcproj (75%)

diff --git a/checkin_notes b/checkin_notes
index 1d323e802f..8f21831f56 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -19132,3 +19132,11 @@ David  6 Nov 2004
     html/inc
         team.inc
         host.inc
+
+Rom    7 Nov 2004
+    - Modify the main build environment for Windows to include the new GUI, and remove
+      the old build environment.
+
+    win_build/
+        boinc.sln
+        boincgui.vcproj
diff --git a/clientgui/BOINCGUI.sln b/clientgui/BOINCGUI.sln
deleted file mode 100644
index e0740eb83e..0000000000
--- a/clientgui/BOINCGUI.sln
+++ /dev/null
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BOINCGUI", "BOINCGUI.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.ActiveCfg = Debug|Win32
-		{06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.Build.0 = Debug|Win32
-		{06113715-AC51-4E91-8B9D-C987CABE0920}.Release.ActiveCfg = Release|Win32
-		{06113715-AC51-4E91-8B9D-C987CABE0920}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/clientgui/win_config.h b/clientgui/win_config.h
deleted file mode 100644
index 6dc0fc1b86..0000000000
--- a/clientgui/win_config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define BOINC_MAJOR_VERSION 4
-#define BOINC_MINOR_VERSION 55
-#define BOINC_VERSION_STRING "4.55"
diff --git a/clientgui/BOINCGUI.vcproj b/win_build/BOINCGUI.vcproj
similarity index 75%
rename from clientgui/BOINCGUI.vcproj
rename to win_build/BOINCGUI.vcproj
index e386ce8b55..11e3a699b4 100644
--- a/clientgui/BOINCGUI.vcproj
+++ b/win_build/BOINCGUI.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="boincgui"
+	Name="boincmgr"
 	ProjectGUID="{06113715-AC51-4E91-8B9D-C987CABE0920}"
 	SccProjectName=""
 	SccLocalPath=""
@@ -14,8 +14,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory=".\Build\Release"
+			IntermediateDirectory=".\Build\Release\boincmgr\obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			CharacterSet="2">
@@ -23,7 +23,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				GlobalOptimizations="TRUE"
-				AdditionalIncludeDirectories="$(WXWIN)\include;$(WXWIN)\contrib\include;$(WXWIN)\lib\msw;..\lib;..\api;..\clientgui"
+				AdditionalIncludeDirectories="$(WXWIN)\include;$(WXWIN)\contrib\include;$(WXWIN)\lib\msw;..\lib;..\api;..\clientgui;..\client\win"
 				PreprocessorDefinitions="WIN32;_NDEBUG;_WINDOWS;_MT;__WXNDEBUG__;WXNDEBUG;wxUSE_GUI=1"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -61,7 +61,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
-				AdditionalIncludeDirectories="$(WXWIN)\include;$(WXWIN)\contrib\include;"/>
+				AdditionalIncludeDirectories="$(WXWIN)\include;$(WXWIN)\contrib\include;..\client\win"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -75,8 +75,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory=".\Build\Debug"
+			IntermediateDirectory=".\Build\Debug\boincmgr\obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			CharacterSet="2"
@@ -84,7 +84,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(WXWIN)\include;$(WXWIN)\contrib\include;$(WXWIN)\lib\msw;..\lib;..\api;..\clientgui"
+				AdditionalIncludeDirectories="$(WXWIN)\include;$(WXWIN)\contrib\include;$(WXWIN)\lib\msw;..\lib;..\api;..\clientgui;..\client\win"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MT;__WXDEBUG__;WXDEBUG;wxUSE_GUI=1"
 				StringPooling="TRUE"
 				MinimalRebuild="FALSE"
@@ -145,31 +145,31 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\BOINCBaseView.cpp">
+				RelativePath="..\clientgui\BOINCBaseView.cpp">
 			</File>
 			<File
-				RelativePath=".\BOINCGUIApp.cpp">
+				RelativePath="..\clientgui\BOINCGUIApp.cpp">
 			</File>
 			<File
-				RelativePath=".\BOINCListCtrl.cpp">
+				RelativePath="..\clientgui\BOINCListCtrl.cpp">
 			</File>
 			<File
-				RelativePath=".\BOINCTaskBar.cpp">
+				RelativePath="..\clientgui\BOINCTaskBar.cpp">
 			</File>
 			<File
-				RelativePath=".\BOINCTaskCtrl.cpp">
+				RelativePath="..\clientgui\BOINCTaskCtrl.cpp">
 			</File>
 			<File
-				RelativePath=".\DlgAbout.cpp">
+				RelativePath="..\clientgui\DlgAbout.cpp">
 			</File>
 			<File
-				RelativePath=".\DlgAttachProject.cpp">
+				RelativePath="..\clientgui\DlgAttachProject.cpp">
 			</File>
 			<File
-				RelativePath=".\DlgConnection.cpp">
+				RelativePath="..\clientgui\DlgConnection.cpp">
 			</File>
 			<File
-				RelativePath=".\DlgOptions.cpp">
+				RelativePath="..\clientgui\DlgOptions.cpp">
 			</File>
 			<File
 				RelativePath="..\lib\filesys.C">
@@ -218,10 +218,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\MainDocument.cpp">
+				RelativePath="..\clientgui\MainDocument.cpp">
 			</File>
 			<File
-				RelativePath=".\MainFrame.cpp">
+				RelativePath="..\clientgui\MainFrame.cpp">
 			</File>
 			<File
 				RelativePath="..\lib\mfile.C">
@@ -293,7 +293,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\stdwx.cpp">
+				RelativePath="..\clientgui\stdwx.cpp">
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
@@ -308,7 +308,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\msw\taskbarex.cpp">
+				RelativePath="..\clientgui\msw\taskbarex.cpp">
 			</File>
 			<File
 				RelativePath="..\lib\util.C">
@@ -334,25 +334,25 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ValidateAccountKey.cpp">
+				RelativePath="..\clientgui\ValidateAccountKey.cpp">
 			</File>
 			<File
-				RelativePath=".\ValidateURL.cpp">
+				RelativePath="..\clientgui\ValidateURL.cpp">
 			</File>
 			<File
-				RelativePath=".\ViewMessages.cpp">
+				RelativePath="..\clientgui\ViewMessages.cpp">
 			</File>
 			<File
-				RelativePath=".\ViewProjects.cpp">
+				RelativePath="..\clientgui\ViewProjects.cpp">
 			</File>
 			<File
-				RelativePath=".\ViewResources.cpp">
+				RelativePath="..\clientgui\ViewResources.cpp">
 			</File>
 			<File
-				RelativePath=".\ViewTransfers.cpp">
+				RelativePath="..\clientgui\ViewTransfers.cpp">
 			</File>
 			<File
-				RelativePath=".\ViewWork.cpp">
+				RelativePath="..\clientgui\ViewWork.cpp">
 			</File>
 		</Filter>
 		<Filter
@@ -360,55 +360,55 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
 			<File
-				RelativePath=".\_wx_intellisense.h">
+				RelativePath="..\clientgui\_wx_intellisense.h">
 			</File>
 			<File
 				RelativePath="..\lib\boinc_win.h">
 			</File>
 			<File
-				RelativePath=".\BOINCBaseView.h">
+				RelativePath="..\clientgui\BOINCBaseView.h">
 			</File>
 			<File
-				RelativePath=".\BOINCGUIApp.h">
+				RelativePath="..\clientgui\BOINCGUIApp.h">
 			</File>
 			<File
-				RelativePath=".\BOINCListCtrl.h">
+				RelativePath="..\clientgui\BOINCListCtrl.h">
 			</File>
 			<File
-				RelativePath=".\BOINCTaskBar.h">
+				RelativePath="..\clientgui\BOINCTaskBar.h">
 			</File>
 			<File
-				RelativePath=".\BOINCTaskCtrl.h">
+				RelativePath="..\clientgui\BOINCTaskCtrl.h">
 			</File>
 			<File
-				RelativePath=".\DlgAbout.h">
+				RelativePath="..\clientgui\DlgAbout.h">
 			</File>
 			<File
-				RelativePath=".\DlgAttachProject.h">
+				RelativePath="..\clientgui\DlgAttachProject.h">
 			</File>
 			<File
-				RelativePath=".\DlgConnection.h">
+				RelativePath="..\clientgui\DlgConnection.h">
 			</File>
 			<File
-				RelativePath=".\DlgOptions.h">
+				RelativePath="..\clientgui\DlgOptions.h">
 			</File>
 			<File
 				RelativePath="..\lib\error_numbers.h">
 			</File>
 			<File
-				RelativePath=".\Events.h">
+				RelativePath="..\clientgui\Events.h">
 			</File>
 			<File
 				RelativePath="..\lib\filesys.h">
 			</File>
 			<File
-				RelativePath="..\lib\gui_rpc_client.h">
+				RelativePath="..\lib\gui_rpc_clientgui.h">
 			</File>
 			<File
-				RelativePath=".\MainDocument.h">
+				RelativePath="..\clientgui\MainDocument.h">
 			</File>
 			<File
-				RelativePath=".\MainFrame.h">
+				RelativePath="..\clientgui\MainFrame.h">
 			</File>
 			<File
 				RelativePath="..\lib\mfile.h">
@@ -420,40 +420,40 @@
 				RelativePath="..\lib\parse.h">
 			</File>
 			<File
-				RelativePath=".\resource.h">
+				RelativePath="..\clientgui\resource.h">
 			</File>
 			<File
-				RelativePath=".\stdwx.h">
+				RelativePath="..\clientgui\stdwx.h">
 			</File>
 			<File
-				RelativePath=".\msw\taskbarex.h">
+				RelativePath="..\clientgui\msw\taskbarex.h">
 			</File>
 			<File
 				RelativePath="..\lib\util.h">
 			</File>
 			<File
-				RelativePath=".\ValidateAccountKey.h">
+				RelativePath="..\clientgui\ValidateAccountKey.h">
 			</File>
 			<File
-				RelativePath=".\ValidateURL.h">
+				RelativePath="..\clientgui\ValidateURL.h">
 			</File>
 			<File
-				RelativePath=".\ViewMessages.h">
+				RelativePath="..\clientgui\ViewMessages.h">
 			</File>
 			<File
-				RelativePath=".\ViewProjects.h">
+				RelativePath="..\clientgui\ViewProjects.h">
 			</File>
 			<File
-				RelativePath=".\ViewResources.h">
+				RelativePath="..\clientgui\ViewResources.h">
 			</File>
 			<File
-				RelativePath=".\ViewTransfers.h">
+				RelativePath="..\clientgui\ViewTransfers.h">
 			</File>
 			<File
-				RelativePath=".\ViewWork.h">
+				RelativePath="..\clientgui\ViewWork.h">
 			</File>
 			<File
-				RelativePath=".\win_config.h">
+				RelativePath="..\client\win\win_config.h">
 			</File>
 		</Filter>
 		<Filter
@@ -461,55 +461,55 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;xrc"
 			UniqueIdentifier="{08DB1F42-8D4B-491a-870C-2A991D5ED0DB}">
 			<File
-				RelativePath=".\res\boinc.xpm">
+				RelativePath="..\clientgui\res\boinc.xpm">
 			</File>
 			<File
-				RelativePath=".\res\BOINCGUIApp.ico">
+				RelativePath="..\clientgui\res\BOINCGUIApp.ico">
 			</File>
 			<File
-				RelativePath=".\BOINCGUIApp.rc">
+				RelativePath="..\clientgui\BOINCGUIApp.rc">
 			</File>
 			<File
-				RelativePath=".\res\BOINCGUIApp.xpm">
+				RelativePath="..\clientgui\res\BOINCGUIApp.xpm">
 			</File>
 			<File
-				RelativePath=".\res\boincsm.xpm">
+				RelativePath="..\clientgui\res\boincsm.xpm">
 			</File>
 			<File
-				RelativePath=".\res\hiddenheader.xpm">
+				RelativePath="..\clientgui\res\hiddenheader.xpm">
 			</File>
 			<File
-				RelativePath=".\res\mess.xpm">
+				RelativePath="..\clientgui\res\mess.xpm">
 			</File>
 			<File
-				RelativePath=".\res\proj.xpm">
+				RelativePath="..\clientgui\res\proj.xpm">
 			</File>
 			<File
-				RelativePath=".\res\result.xpm">
+				RelativePath="..\clientgui\res\result.xpm">
 			</File>
 			<File
-				RelativePath=".\res\task.xpm">
+				RelativePath="..\clientgui\res\task.xpm">
 			</File>
 			<File
-				RelativePath=".\res\tips.xpm">
+				RelativePath="..\clientgui\res\tips.xpm">
 			</File>
 			<File
-				RelativePath=".\res\usage.xpm">
+				RelativePath="..\clientgui\res\usage.xpm">
 			</File>
 			<File
-				RelativePath=".\res\visibleheader.xpm">
+				RelativePath="..\clientgui\res\visibleheader.xpm">
 			</File>
 			<File
-				RelativePath=".\res\web.xpm">
+				RelativePath="..\clientgui\res\web.xpm">
 			</File>
 			<File
-				RelativePath=".\res\xfer.xpm">
+				RelativePath="..\clientgui\res\xfer.xpm">
 			</File>
 		</Filter>
 	</Files>
 	<Globals>
 		<Global
 			Name="RESOURCE_FILE"
-			Value=".\BOINCGUIApp.rc"/>
+			Value="..\clientgui\BOINCGUIApp.rc"/>
 	</Globals>
 </VisualStudioProject>
diff --git a/win_build/boinc.sln b/win_build/boinc.sln
index c4bdbebdd0..88b1b5d565 100644
--- a/win_build/boinc.sln
+++ b/win_build/boinc.sln
@@ -33,6 +33,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_guirpctest", "boinc_g
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincgui", "BOINCGUI.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -66,6 +70,10 @@ Global
 		{DA997BD1-B575-465C-9851-EEBB727F506A}.Debug.ActiveCfg = Debug|Win32
 		{DA997BD1-B575-465C-9851-EEBB727F506A}.Release.ActiveCfg = Release|Win32
 		{DA997BD1-B575-465C-9851-EEBB727F506A}.Release.Build.0 = Release|Win32
+		{06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.ActiveCfg = Debug|Win32
+		{06113715-AC51-4E91-8B9D-C987CABE0920}.Debug.Build.0 = Debug|Win32
+		{06113715-AC51-4E91-8B9D-C987CABE0920}.Release.ActiveCfg = Release|Win32
+		{06113715-AC51-4E91-8B9D-C987CABE0920}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection