- WINSETUP: Add support for the <team_name> tag in the Windows

installer for the auto created project_init.xml file.
        
    win_build/installerv2/redist/Windows/src/boinccas/
        boinccas.rc
        CACreateProjectInitFile.cpp
    win_build/installerv2/redist/Windows/Win32/
        boinccas.dll
        boinccas95.dll
    win_build/installerv2/redist/Windows/x64/
        boinccas.dll
        boinccas95.dll

svn path=/trunk/boinc/; revision=21147
This commit is contained in:
Rom Walton 2010-04-08 18:16:09 +00:00
parent 58c197509a
commit 1cfd7e85a8
7 changed files with 26 additions and 6 deletions

View File

@ -2636,3 +2636,17 @@ David 7 Apr 2010
client/
gui_rpc_server_ops.cpp
Rom 8 Apr 2010
- WINSETUP: Add support for the <team_name> tag in the Windows
installer for the auto created project_init.xml file.
win_build/installerv2/redist/Windows/src/boinccas/
boinccas.rc
CACreateProjectInitFile.cpp
win_build/installerv2/redist/Windows/Win32/
boinccas.dll
boinccas95.dll
win_build/installerv2/redist/Windows/x64/
boinccas.dll
boinccas95.dll

View File

@ -64,6 +64,7 @@ UINT CACreateProjectInitFile::OnExecution()
tstring strDataDirectory;
tstring strProjectInitUrl;
tstring strProjectInitAuthenticator;
tstring strProjectInitTeamName;
tstring strProjectInitFile;
UINT uiReturnValue = -1;
@ -77,6 +78,9 @@ UINT CACreateProjectInitFile::OnExecution()
uiReturnValue = GetProperty( _T("PROJINIT_AUTH"), strProjectInitAuthenticator );
if ( uiReturnValue ) return uiReturnValue;
uiReturnValue = GetProperty( _T("PROJINIT_TEAMNAME"), strProjectInitTeamName );
if ( uiReturnValue ) return uiReturnValue;
if (!strProjectInitUrl.empty()) {
@ -93,10 +97,12 @@ UINT CACreateProjectInitFile::OnExecution()
_T(" <name>%s</name>\n")
_T(" <url>%s</url>\n")
_T(" <account_key>%s</account_key>\n")
_T(" <team_name>%s</team_name>\n")
_T("</project_init>\n"),
strProjectInitUrl.c_str(),
strProjectInitUrl.c_str(),
!strProjectInitAuthenticator.empty() ? strProjectInitAuthenticator.c_str() : _T("")
!strProjectInitAuthenticator.empty() ? strProjectInitAuthenticator.c_str() : _T(""),
!strProjectInitTeamName.empty() ? strProjectInitTeamName.c_str() : _T("")
);
fclose(fProjectInitFile);

View File

@ -53,8 +53,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,150
PRODUCTVERSION 1,0,0,150
FILEVERSION 1,0,0,155
PRODUCTVERSION 1,0,0,155
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -70,12 +70,12 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "BOINC Dynamic Link Library"
VALUE "FileVersion", "1.0.0.150"
VALUE "FileVersion", "1.0.0.155"
VALUE "InternalName", "BOINC"
VALUE "LegalCopyright", "Copyright (C) 2005-2009"
VALUE "LegalCopyright", "Copyright (C) 2005-2010"
VALUE "OriginalFilename", "BOINC.dll"
VALUE "ProductName", " BOINC Dynamic Link Library"
VALUE "ProductVersion", "1.0.0.150"
VALUE "ProductVersion", "1.0.0.155"
END
END
BLOCK "VarFileInfo"