From a97caf3bf9a8974d516893f10380af001de1dcff Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Thu, 26 May 2005 21:42:20 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=6256 --- checkin_notes | 11 +++ client/win/boinc_cli.rc | 4 +- client/win/boinc_cmd.h | 16 +++++ client/win/boinc_cmd.rc | 104 +++++++++++++++++++++++++++++ win_build/boinc.sln | 10 ++- win_build/boinc_guirpc_test.vcproj | 23 ++++--- win_build/installerv2/BOINC.ism | Bin 205312 -> 205312 bytes 7 files changed, 157 insertions(+), 11 deletions(-) create mode 100644 client/win/boinc_cmd.h create mode 100644 client/win/boinc_cmd.rc diff --git a/checkin_notes b/checkin_notes index f76c3ffb0d..3b11b0f4b9 100755 --- a/checkin_notes +++ b/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 diff --git a/client/win/boinc_cli.rc b/client/win/boinc_cli.rc index bf227222ad..d7756e59db 100644 --- a/client/win/boinc_cli.rc +++ b/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 diff --git a/client/win/boinc_cmd.h b/client/win/boinc_cmd.h new file mode 100644 index 0000000000..71f85b38a4 --- /dev/null +++ b/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 diff --git a/client/win/boinc_cmd.rc b/client/win/boinc_cmd.rc new file mode 100644 index 0000000000..21939df34e --- /dev/null +++ b/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 + diff --git a/win_build/boinc.sln b/win_build/boinc.sln index 9b3a77d34d..4900e3484b 100644 --- a/win_build/boinc.sln +++ b/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 diff --git a/win_build/boinc_guirpc_test.vcproj b/win_build/boinc_guirpc_test.vcproj index f9099438de..88a135d48f 100644 --- a/win_build/boinc_guirpc_test.vcproj +++ b/win_build/boinc_guirpc_test.vcproj @@ -2,7 +2,7 @@ @@ -14,7 +14,7 @@ @@ -85,7 +85,7 @@ @@ -142,7 +142,8 @@ + Culture="1033" + AdditionalIncludeDirectories=".."/> + + @@ -270,6 +274,9 @@ + + diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism index 46b5a2cca72497741564a0024c9b57f3293426bf..66cfc0d6e7c4c622045caf00cacf6c52592f8158 100644 GIT binary patch delta 222 zcmZoT!qaesXG0DPn?uE|gVsr#i&)tB8S|Peg|}AY@+Vk$hzXtDk0 zZ>CrlRZ~7i4n>aXyx(~hIRu$Oa3>Q8DsrfDXmLdF&f;Cbt2MQn`6$N%UXX|>-*kaX zjKlnq;0PnfbPir- z@yP}(oXZ_}nHf2f@-y?2lXFw1&%MQ@&JJYgrBRgpuHV><75UPTT;W)R%T1cIs@S{xC)vv?QqYH=*!Rh?SRe3VIxW4ggPM*ZpX zY)m}cYZ;k~S*IW1VHTKv;5MVfb_aImHde72yz_Y@d1H7F0qH}$Gr)L0@AMBm%sSH* sc$vkg`!+BtE_dK%W}IHe$NXcunj~}1_9gtx2JGw%5U~BW7_%xj07)%2z5oCK