*** empty log message ***

svn path=/trunk/boinc/; revision=6256

checkin_notes

@@ -7102,3 +7102,14 @@ David  26 May 2005
 
     sched/
         file_deleter.C
+
+Rom    26 May 2005
+    - Include version information for boinc_cmd.exe so the Windows installer
+        will know it can upgrade the file with future revisions.
+
+    client/win/
+        boinc_cli.rc
+        boinc_cmd.rc, .h (Added)
+    win_build/
+        boinc.sln
+        boinc_guirpc_test.vcproj

client/win/boinc_cli.rc

@@ -72,12 +72,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "Space Sciences Laboratory"
-            VALUE "FileDescription", "BOINC Core Client Command Line Interface"
+            VALUE "FileDescription", "BOINC Daemon"
             VALUE "FileVersion", BOINC_VERSION_STRING "\0"
             VALUE "InternalName", "boinc_cli"
             VALUE "LegalCopyright", "Copyright © 2003-2005 University of California"
             VALUE "OriginalFilename", "boinc_cli.exe"
-            VALUE "ProductName", "BOINC Core Client"
+            VALUE "ProductName", "BOINC Daemon"
             VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
         END
     END

client/win/boinc_cmd.h

@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by boinc_cmd.rc
+//
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_3D_CONTROLS                     1
+#define _APS_NEXT_RESOURCE_VALUE        109
+#define _APS_NEXT_COMMAND_VALUE         40000
+#define _APS_NEXT_CONTROL_VALUE         1007
+#define _APS_NEXT_SYMED_VALUE           102
+#endif
+#endif

client/win/boinc_cmd.rc

@@ -0,0 +1,104 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "boinc_cmd.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+#include "version.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "boinc_cmd.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "#include ""version.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,0,0
+ PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Space Sciences Laboratory"
+            VALUE "FileDescription", "BOINC Command Line Interface"
+            VALUE "FileVersion", BOINC_VERSION_STRING "\0"
+            VALUE "InternalName", "boinc_cli"
+            VALUE "LegalCopyright", "Copyright © 2003-2005 University of California"
+            VALUE "OriginalFilename", "boinc_cli.exe"
+            VALUE "ProductName", "BOINC Command Line Interface"
+            VALUE "ProductVersion", BOINC_VERSION_STRING "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

win_build/boinc.sln

@@ -22,12 +22,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "upper_case", "upper_case.vc
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_guirpctest", "boinc_guirpc_test.vcproj", "{DA997BD1-B575-465C-9851-EEBB727F506A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_cmd", "boinc_guirpc_test.vcproj", "{DA997BD1-B575-465C-9851-EEBB727F506A}"
 	ProjectSection(ProjectDependencies) = postProject
+		{06113715-AC51-4E91-8B9D-C987CABE0920} = {06113715-AC51-4E91-8B9D-C987CABE0920}
+		{21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174}
+		{0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincmgr", "BOINCGUI.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}"
 	ProjectSection(ProjectDependencies) = postProject
+		{06113715-AC51-4E91-8B9D-C987CABE0920} = {06113715-AC51-4E91-8B9D-C987CABE0920}
+		{21E7357D-41D8-444C-A120-18064B497174} = {21E7357D-41D8-444C-A120-18064B497174}
+		{0B6B4994-5C4B-49F3-B717-17603AFB789E} = {0B6B4994-5C4B-49F3-B717-17603AFB789E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_gui", "boinc_gui.vcproj", "{78BA7B4E-4E37-4CAB-B954-CD906AC0E011}"
@@ -62,7 +68,9 @@ Global
 		{48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}.Debug.ActiveCfg = Debug|Win32
 		{48FB07D8-6E26-4BB1-98AB-22001C0FB0FF}.Release.ActiveCfg = Release|Win32
 		{DA997BD1-B575-465C-9851-EEBB727F506A}.Debug.ActiveCfg = Debug|Win32
+		{DA997BD1-B575-465C-9851-EEBB727F506A}.Debug.Build.0 = 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

win_build/boinc_guirpc_test.vcproj

@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="boinc_guirpctest"
+	Name="boinc_cmd"
 	RootNamespace="boinc_guirpctest"
 	SccProjectName=""
 	SccLocalPath="">
@@ -14,7 +14,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Build\Debug"
-			IntermediateDirectory=".\Build\Debug\boinc_guirpctest\obj"
+			IntermediateDirectory=".\Build\Debug\boinc_cmd\obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -43,13 +43,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib advapi32.lib wsock32.lib wininet.lib winmm.lib oldnames.lib"
-				OutputFile=".\Build\Debug/boinc_guirpctest.exe"
+				OutputFile=".\Build\Debug/boinccmd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				IgnoreAllDefaultLibraries="TRUE"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Build\Debug/boinc_guirpctest.pdb"
+				ProgramDatabaseFile=".\Build\Debug/boinccmd.pdb"
 				SubSystem="1"
 				OptimizeReferences="0"
 				TargetMachine="1"/>
@@ -85,7 +85,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Build\Release"
-			IntermediateDirectory=".\Build\Release\boinc_guirpctest\obj"
+			IntermediateDirectory=".\Build\Release\boinc_cmd\obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -115,13 +115,13 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="kernel32.lib user32.lib advapi32.lib wsock32.lib wininet.lib winmm.lib libcmt.lib libcpmt.lib oldnames.lib"
 				ShowProgress="0"
-				OutputFile=".\Build\Release/boinc_guirpctest.exe"
+				OutputFile=".\Build\Release/boinccmd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				IgnoreAllDefaultLibraries="TRUE"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Build\Release/boinc_guirpctest.pdb"
+				ProgramDatabaseFile=".\Build\Release/boinccmd.pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				TargetMachine="1"/>
@@ -142,7 +142,8 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Culture="1033"
+				AdditionalIncludeDirectories=".."/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -224,6 +225,9 @@
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\client\win\boinc_cmd.h">
+			</File>
 			<File
 				RelativePath="..\lib\boinc_win.h">
 			</File>
@@ -270,6 +274,9 @@
 		<Filter
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			<File
+				RelativePath="..\client\win\boinc_cmd.rc">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>