*** empty log message ***

svn path=/trunk/boinc/; revision=12308
This commit is contained in:
Rom Walton 2007-04-04 18:00:19 +00:00
parent 0d54805329
commit 8a5358820f
16 changed files with 261 additions and 67 deletions

View File

@ -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

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="boinc" type="win32"/>
<description>BOINC</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
</assembly>

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="5.9.3.0" processorArchitecture="X86" name="boinc" type="win32"/>
<description>BOINC Screensaver</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
</assembly>

View File

@ -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
/////////////////////////////////////////////////////////////////////////////
//

View File

@ -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
/////////////////////////////////////////////////////////////////////////////
//

View File

@ -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

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="5.9.3.0" processorArchitecture="X86" name="boinccmd" type="win32"/>
<description>BOINC Manager (commandline)</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
</assembly>

View File

@ -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

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="5.9.3.0" processorArchitecture="X86" name="boincmgr" type="win32"/>
<description>BOINC Manager</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
</assembly>

View File

@ -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],

View File

@ -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__)) */

View File

@ -146,8 +146,9 @@
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"
Description="Checking boinc.exe dependencies"
CommandLine="boinc_post_bld_rules.cmd &quot;$(SolutionDir)&quot; &quot;$(OutDir)&quot;"/>
Description="Signing and Checking Dependancies"
CommandLine="signcode -v &quot;$(InputDir)\installerv2\boinc.pvk&quot; -spc &quot;$(InputDir)\installerv2\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\boinc.exe&quot;
boinc_post_bld_rules.cmd &quot;$(SolutionDir)&quot; &quot;$(OutDir)&quot;"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
@ -800,6 +801,9 @@
RelativePath="..\client\win\boinc_cli.rc">
</File>
</Filter>
<File
RelativePath="..\client\boinc.exe.manifest">
</File>
</Files>
<Globals>
</Globals>

View File

@ -127,8 +127,10 @@
ProxyFileName="boinc_dll_p.c"/>
<Tool
Name="VCPostBuildEventTool"
Description="Performing registration"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"/>
Description="Signing and Registration"
CommandLine="signcode -v &quot;$(InputDir)\installerv2\boinc.pvk&quot; -spc &quot;$(InputDir)\installerv2\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\boinc.dll&quot;
regsvr32 /s /c &quot;$(TargetPath)&quot;
"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool

View File

@ -148,7 +148,9 @@
TypeLibraryName=".\Build\Release/boinc_ss.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
Name="VCPostBuildEventTool"
Description="Signing"
CommandLine="signcode -v &quot;$(InputDir)\installerv2\boinc.pvk&quot; -spc &quot;$(InputDir)\installerv2\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\boinc.scr&quot;"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
@ -352,6 +354,9 @@
RelativePath="..\client\win\res\seed.bmp">
</File>
</Filter>
<File
RelativePath="..\client\win\boinc.scr.manifest">
</File>
</Files>
<Globals>
</Globals>

View File

@ -144,7 +144,8 @@
TypeLibraryName=".\Build\Release/boinc_guirpctest.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
Name="VCPostBuildEventTool"
CommandLine="signcode -v &quot;$(InputDir)\installerv2\boinc.pvk&quot; -spc &quot;$(InputDir)\installerv2\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\boinccmd.exe&quot;"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
@ -202,6 +203,9 @@
RelativePath="..\client\win\boinc_cmd.rc">
</File>
</Filter>
<File
RelativePath="..\client\win\boinccmd.exe.manifest">
</File>
</Files>
<Globals>
</Globals>

View File

@ -56,7 +56,8 @@
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
Name="VCPostBuildEventTool"
CommandLine="signcode -v &quot;$(InputDir)\installerv2\boinc.pvk&quot; -spc &quot;$(InputDir)\installerv2\boinc.spc&quot; -t &quot;http://timestamp.verisign.com/scripts/timstamp.dll&quot; &quot;$(OutDir)\boincmgr.exe&quot;"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
@ -507,6 +508,12 @@
</File>
<File
RelativePath="..\lib\browser.C">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
</File>
<File
RelativePath="..\lib\browser.h">
@ -1153,6 +1160,9 @@
<File
RelativePath="..\clientgui\BOINCGUIApp.h">
</File>
<File
RelativePath="..\clientgui\boincmgr.exe.manifest">
</File>
<File
RelativePath="..\clientgui\Events.h">
</File>