From 8a5358820f003b41ae3c65f5d5c3e18eb0b46e80 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Wed, 4 Apr 2007 18:00:19 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=12308 --- checkin_notes | 33 ++++++++++++++ client/win/boinc.exe.manifest | 12 +++++ client/win/boinc.scr.manifest | 12 +++++ client/win/boinc_cli.rc | 51 +++++++++++++++------ client/win/boinc_cmd.rc | 64 +++++++++++++++++--------- client/win/boinc_ss.rc | 67 +++++++++++++++++++--------- client/win/boinccmd.exe.manifest | 12 +++++ clientgui/BOINCGUIApp.rc | 16 ++++++- clientgui/boincmgr.exe.manifest | 12 +++++ configure.ac | 2 +- version.h | 8 ++-- win_build/boinc_cli_curl_2003.vcproj | 8 +++- win_build/boinc_dll_2003.vcproj | 6 ++- win_build/boinc_ss_2003.vcproj | 7 ++- win_build/boinccmd_2003.vcproj | 6 ++- win_build/boincmgr_curl_2003.vcproj | 12 ++++- 16 files changed, 261 insertions(+), 67 deletions(-) create mode 100644 client/win/boinc.exe.manifest create mode 100644 client/win/boinc.scr.manifest create mode 100644 client/win/boinccmd.exe.manifest create mode 100644 clientgui/boincmgr.exe.manifest diff --git a/checkin_notes b/checkin_notes index 308f4dc39c..06da5059d6 100755 --- a/checkin_notes +++ b/checkin_notes @@ -3090,3 +3090,36 @@ David 3 Apr 2007 makefile_sim scheduler_op.C sim.C + +Rom 4 Apr 2007 + - WIN: Introduce assembly manifests for all binaries produced for + Windows. + - WIN: Code sign each of the binaries produced for Windows. + + NOTE: Windows Vista has so many levels of protection that it makes + it hard to debug specific issues without triping up on one of them. + + Until we can perform our Vista work items we'll work around the + issue by informing Vista that we need admin rights via the + assembly manifest before Vista launches us. + + / + configure.ac + version.h + client/win/ + boinc.exe.manifest (Added) + boinc.scr.manifest (Added) + boinc_cli.rc + boinc_cmd.rc + boinc_ss.rc + boinccmd.exe.manifest (Added) + clientgui/ + BOINCGUIApp.rc + boincmgr.exe.manifest (Added) + win_build/ + boinc_cli_curl_2003.vcproj + boinc_dll_2003.vcproj + boinc_ss_2003.vcproj + boinccmd_2003.vcproj + boincmgr_curl_2003.vcproj + diff --git a/client/win/boinc.exe.manifest b/client/win/boinc.exe.manifest new file mode 100644 index 0000000000..130614afc5 --- /dev/null +++ b/client/win/boinc.exe.manifest @@ -0,0 +1,12 @@ + + + + BOINC + + + + + + + + diff --git a/client/win/boinc.scr.manifest b/client/win/boinc.scr.manifest new file mode 100644 index 0000000000..19870b3594 --- /dev/null +++ b/client/win/boinc.scr.manifest @@ -0,0 +1,12 @@ + + + + BOINC Screensaver + + + + + + + + diff --git a/client/win/boinc_cli.rc b/client/win/boinc_cli.rc index dcb9551eff..263edfd052 100644 --- a/client/win/boinc_cli.rc +++ b/client/win/boinc_cli.rc @@ -13,6 +13,44 @@ ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// Neutral resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) +#ifdef _WIN32 +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +#ifdef _GRIDREPUBLIC +#else +IDI_MAIN_ICON ICON "res\\icon.ico" +#endif + +///////////////////////////////////////////////////////////////////////////// +// +// Assembly Manifest +// + +#ifndef MANIFEST_RESOURCE_ID +#define MANIFEST_RESOURCE_ID 1 +#endif + +MANIFEST_RESOURCE_ID RT_MANIFEST "boinc.exe.manifest" + +///////////////////////////////////////////////////////////////////////////// + +#endif // Neutral resources + + + ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -207,19 +245,6 @@ END #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -#ifdef _GRIDREPUBLIC -#else -IDI_MAIN_ICON ICON "res\\icon.ico" -#endif - - #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // diff --git a/client/win/boinc_cmd.rc b/client/win/boinc_cmd.rc index e9a217da85..9e3bdf322e 100644 --- a/client/win/boinc_cmd.rc +++ b/client/win/boinc_cmd.rc @@ -13,6 +13,50 @@ ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// Neutral resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) +#ifdef _WIN32 +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +#if defined(_GRIDREPUBLIC) + +#elif defined(_wCG) + +IDI_MAIN_ICON ICON "res\\wcg.ico" + +#else + +IDI_MAIN_ICON ICON "res\\icon.ico" + +#endif + +///////////////////////////////////////////////////////////////////////////// +// +// Assembly Manifest +// + +#ifndef MANIFEST_RESOURCE_ID +#define MANIFEST_RESOURCE_ID 1 +#endif + +MANIFEST_RESOURCE_ID RT_MANIFEST "boinccmd.exe.manifest" + +///////////////////////////////////////////////////////////////////////////// + +#endif // Neutral resources + + ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -207,26 +251,6 @@ END #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -#if defined(_GRIDREPUBLIC) - -#elif defined(_wCG) - -IDI_MAIN_ICON ICON "res\\wcg.ico" - -#else - -IDI_MAIN_ICON ICON "res\\icon.ico" - -#endif - - #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // diff --git a/client/win/boinc_ss.rc b/client/win/boinc_ss.rc index 55ae70678c..39141611cf 100755 --- a/client/win/boinc_ss.rc +++ b/client/win/boinc_ss.rc @@ -13,6 +13,52 @@ ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// Neutral resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) +#ifdef _WIN32 +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +#if defined(_GRIDREPUBLIC) + +IDI_MAIN_ICON ICON "res\\gridrepublic.ico" + +#elif defined(_WCG) + +IDI_MAIN_ICON ICON "res\\wcg.ico" + +#else + +IDI_MAIN_ICON ICON "res\\icon.ico" + +#endif + +///////////////////////////////////////////////////////////////////////////// +// +// Assembly Manifest +// + +#ifndef MANIFEST_RESOURCE_ID +#define MANIFEST_RESOURCE_ID 1 +#endif + +MANIFEST_RESOURCE_ID RT_MANIFEST "boinc.scr.manifest" + +///////////////////////////////////////////////////////////////////////////// + +#endif // Neutral resources + + ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -223,27 +269,6 @@ BEGIN END -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -#if defined(_GRIDREPUBLIC) - -IDI_MAIN_ICON ICON "res\\gridrepublic.ico" - -#elif defined(_WCG) - -IDI_MAIN_ICON ICON "res\\wcg.ico" - -#else - -IDI_MAIN_ICON ICON "res\\icon.ico" - -#endif - ///////////////////////////////////////////////////////////////////////////// // // Bitmap diff --git a/client/win/boinccmd.exe.manifest b/client/win/boinccmd.exe.manifest new file mode 100644 index 0000000000..e2a85395be --- /dev/null +++ b/client/win/boinccmd.exe.manifest @@ -0,0 +1,12 @@ + + + + BOINC Manager (commandline) + + + + + + + + diff --git a/clientgui/BOINCGUIApp.rc b/clientgui/BOINCGUIApp.rc index ba08a16797..1e023d4819 100644 --- a/clientgui/BOINCGUIApp.rc +++ b/clientgui/BOINCGUIApp.rc @@ -43,9 +43,23 @@ APP_ICON ICON "res\\boincguiApp.ico" #endif -#endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// +// +// Assembly Manifest +// + +#ifndef MANIFEST_RESOURCE_ID +#define MANIFEST_RESOURCE_ID 1 +#endif + +MANIFEST_RESOURCE_ID RT_MANIFEST "boincmgr.exe.manifest" + +///////////////////////////////////////////////////////////////////////////// + +#endif // Neutral resources + ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources diff --git a/clientgui/boincmgr.exe.manifest b/clientgui/boincmgr.exe.manifest new file mode 100644 index 0000000000..b67ddd00ea --- /dev/null +++ b/clientgui/boincmgr.exe.manifest @@ -0,0 +1,12 @@ + + + + BOINC Manager + + + + + + + + diff --git a/configure.ac b/configure.ac index c69d32064d..2096d0da83 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work) AC_PREREQ(2.57) dnl Set the BOINC version here. You can also use the set-version script. -AC_INIT(BOINC, 5.9.2) +AC_INIT(BOINC, 5.9.3) AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], diff --git a/version.h b/version.h index 970cd5a591..be224a905d 100644 --- a/version.h +++ b/version.h @@ -10,10 +10,10 @@ #define BOINC_MINOR_VERSION 9 /* Release part of BOINC version number */ -#define BOINC_RELEASE 2 +#define BOINC_RELEASE 3 /* String representation of BOINC version number */ -#define BOINC_VERSION_STRING "5.9.2" +#define BOINC_VERSION_STRING "5.9.3" #if (defined(_WIN32) || defined(__APPLE__)) /* Name of package */ @@ -26,13 +26,13 @@ #define PACKAGE_NAME "BOINC" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "BOINC 5.9.2" +#define PACKAGE_STRING "BOINC 5.9.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "boinc" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.9.2" +#define PACKAGE_VERSION "5.9.3" #endif /* #if (defined(_WIN32) || defined(__APPLE__)) */ diff --git a/win_build/boinc_cli_curl_2003.vcproj b/win_build/boinc_cli_curl_2003.vcproj index 20f183919f..ebd64ac31b 100644 --- a/win_build/boinc_cli_curl_2003.vcproj +++ b/win_build/boinc_cli_curl_2003.vcproj @@ -146,8 +146,9 @@ HeaderFileName=""/> + Description="Signing and Checking Dependancies" + CommandLine="signcode -v "$(InputDir)\installerv2\boinc.pvk" -spc "$(InputDir)\installerv2\boinc.spc" -t "http://timestamp.verisign.com/scripts/timstamp.dll" "$(OutDir)\boinc.exe" +boinc_post_bld_rules.cmd "$(SolutionDir)" "$(OutDir)""/> + + diff --git a/win_build/boinc_dll_2003.vcproj b/win_build/boinc_dll_2003.vcproj index 050ce6786e..ba6b50084a 100644 --- a/win_build/boinc_dll_2003.vcproj +++ b/win_build/boinc_dll_2003.vcproj @@ -127,8 +127,10 @@ ProxyFileName="boinc_dll_p.c"/> + Description="Signing and Registration" + CommandLine="signcode -v "$(InputDir)\installerv2\boinc.pvk" -spc "$(InputDir)\installerv2\boinc.spc" -t "http://timestamp.verisign.com/scripts/timstamp.dll" "$(OutDir)\boinc.dll" +regsvr32 /s /c "$(TargetPath)" +"/> + Name="VCPostBuildEventTool" + Description="Signing" + CommandLine="signcode -v "$(InputDir)\installerv2\boinc.pvk" -spc "$(InputDir)\installerv2\boinc.spc" -t "http://timestamp.verisign.com/scripts/timstamp.dll" "$(OutDir)\boinc.scr""/> + + diff --git a/win_build/boinccmd_2003.vcproj b/win_build/boinccmd_2003.vcproj index f8459d9693..22b7701601 100644 --- a/win_build/boinccmd_2003.vcproj +++ b/win_build/boinccmd_2003.vcproj @@ -144,7 +144,8 @@ TypeLibraryName=".\Build\Release/boinc_guirpctest.tlb" HeaderFileName=""/> + Name="VCPostBuildEventTool" + CommandLine="signcode -v "$(InputDir)\installerv2\boinc.pvk" -spc "$(InputDir)\installerv2\boinc.spc" -t "http://timestamp.verisign.com/scripts/timstamp.dll" "$(OutDir)\boinccmd.exe""/> + + diff --git a/win_build/boincmgr_curl_2003.vcproj b/win_build/boincmgr_curl_2003.vcproj index 1e9455fa98..43eb152070 100644 --- a/win_build/boincmgr_curl_2003.vcproj +++ b/win_build/boincmgr_curl_2003.vcproj @@ -56,7 +56,8 @@ + Name="VCPostBuildEventTool" + CommandLine="signcode -v "$(InputDir)\installerv2\boinc.pvk" -spc "$(InputDir)\installerv2\boinc.spc" -t "http://timestamp.verisign.com/scripts/timstamp.dll" "$(OutDir)\boincmgr.exe""/> + + + @@ -1153,6 +1160,9 @@ + +