mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=9300
This commit is contained in:
Rom Walton
parent
f3c0bf479e
commit
fd0fd3d3c6
|
|
@ -871,3 +871,17 @@ Charlie 23 Jan 2006
|
|||
mac_build/
|
||||
boinc.xcodeproj/
|
||||
project.pbxproj
|
||||
|
||||
Rom 24 Jan 2006
|
||||
- String and graphics changes for CPDNBBC.
|
||||
- Add email address validation to the wizards.
|
||||
|
||||
clientgui/
|
||||
AccountInfoPage.cpp
|
||||
BOINCGUIApp.cpp
|
||||
BOINCGUIApp.rc
|
||||
ValidateEmailAddress.cpp, .h (Added)
|
||||
|
||||
Rom 24 Jan 2006 (HEAD)
|
||||
- Tag for 5.3.14 release, all platforms
|
||||
boinc_core_release_5_3_14
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#include "BOINCGUIApp.h"
|
||||
#include "wx/valgen.h"
|
||||
#include "wx/valtext.h"
|
||||
#include "ValidateEmailAddress.h"
|
||||
#include "BOINCWizards.h"
|
||||
#include "BOINCBaseWizard.h"
|
||||
#include "AccountInfoPage.h"
|
||||
|
|
@ -191,7 +192,7 @@ void CAccountInfoPage::CreateControls()
|
|||
}
|
||||
|
||||
// Set validators
|
||||
m_AccountEmailAddressCtrl->SetValidator( wxGenericValidator(& m_strAccountEmailAddress) );
|
||||
m_AccountEmailAddressCtrl->SetValidator( CValidateEmailAddress(& m_strAccountEmailAddress) );
|
||||
m_AccountPasswordCtrl->SetValidator( wxTextValidator(wxFILTER_ASCII, &m_strAccountPassword) );
|
||||
if (!IS_ACCOUNTMANAGERWIZARD()) {
|
||||
m_AccountConfirmPasswordCtrl->SetValidator( wxTextValidator(wxFILTER_ASCII, &m_strAccountConfirmPassword) );
|
||||
|
|
|
|||
|
|
@ -41,11 +41,14 @@
|
|||
#else
|
||||
#include "res/boinc.xpm"
|
||||
#include "res/gridrepublic.xpm"
|
||||
#include "res/cpdnbbc16.xpm"
|
||||
#include "res/cpdnbbc32.xpm"
|
||||
#endif
|
||||
|
||||
#include "res/boincsm.xpm"
|
||||
#include "res/attachprojectwizard.xpm"
|
||||
#include "res/gridrepublicamwizard.xpm"
|
||||
#include "res/cpdnbbcapwizard.xpm"
|
||||
////@end XPM images
|
||||
|
||||
|
||||
|
|
@ -132,33 +135,33 @@ bool CBrandingScheme::OnInit( wxConfigBase *pConfig ) {
|
|||
case 2:
|
||||
// Running as a CPDNBBC client.
|
||||
m_strApplicationName = wxT("The BOINC Manager for the BBC Climate Change Experiment");
|
||||
m_iconApplicationIcon = wxIcon(boinc_xpm);
|
||||
m_bitmapApplicationLogo = wxBitmap(boincsm_xpm);
|
||||
m_iconApplicationIcon = wxIcon(cpdnbbc16_xpm);
|
||||
m_bitmapApplicationLogo = wxBitmap(cpdnbbc32_xpm);
|
||||
m_strCompanyName = wxT("ClimatePrediction.net");
|
||||
m_strCompanyWebsite = wxT("http://bbc.cpdn.org/beta/");
|
||||
m_strProjectName = wxT("BBC Climate Change Experiment");
|
||||
m_bDefaultTabSpecified = true;
|
||||
m_iDefaultTab = ID_LIST_WORKVIEW - ID_LIST_BASE;
|
||||
m_strAPWizardTitle = _("Start Project");
|
||||
m_bitmapAPWizardLogo = wxBitmap(attachprojectwizard_xpm);
|
||||
m_bitmapAPWizardLogo = wxBitmap(cpdnbbcapwizard_xpm);
|
||||
m_strAPWizardAccountInfoText =
|
||||
_("Please enter an e-mail address and password to participate in our\n"
|
||||
"interactive user forum and receive occasional project announcements.\n"
|
||||
"You can block all e-mails from the project on your \"preferences\"\n"
|
||||
"page whenever you like, and we will not pass on your e-mail address\n"
|
||||
"to any third party. You can still run the experiment if you enter a\n"
|
||||
"dummy address, but you will not be able to join in the user forum.");
|
||||
_("Please enter an email address and password.\n"
|
||||
"\n"
|
||||
"You will need your email address if you want to change your account\n"
|
||||
"options or use our message boards.\n"
|
||||
"\n"
|
||||
"We will send you occasional emails. You can stop these at aynt time.\n"
|
||||
"We will not pass your email address on to others.\n");
|
||||
m_strAPWizardCompletionTitle =
|
||||
_("Project Started");
|
||||
m_strAPWizardCompletionBrandedMessage =
|
||||
_("Congratulations, you have now successfully started your Climate\n"
|
||||
"Change Experiment.\n");
|
||||
m_strAPWizardCompletionMessage =
|
||||
_("Click Finish to close. This will automatically launch a web browser\n"
|
||||
"that will tell more about your experiment and how to customize your\n"
|
||||
"settings.");
|
||||
_("Click finish to exit. You will be taken to a web page which tells\n"
|
||||
"you more about your model.\n");
|
||||
m_strAMWizardTitle = wxEmptyString;
|
||||
m_bitmapAMWizardLogo = wxBitmap(attachprojectwizard_xpm);
|
||||
m_bitmapAMWizardLogo = wxBitmap(cpdnbbcapwizard_xpm);
|
||||
m_strAMWizardAttachMessage = wxEmptyString;
|
||||
m_strExitMessage =
|
||||
_("This will shut down your experiment until it restarts automatically\n"
|
||||
|
|
|
|||
|
|
@ -34,6 +34,10 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
|||
APP_ICON ICON "res\\gridrepublic.ico"
|
||||
APP_ICON2 ICON "res\\gridrepublic2.ico"
|
||||
|
||||
#elif defined(_CPDNBBC)
|
||||
|
||||
APP_ICON ICON "res\\cpdnbbc.ico"
|
||||
|
||||
#else
|
||||
|
||||
APP_ICON ICON "res\\boincguiApp.ico"
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ boinc_gui_SOURCES = \
|
|||
MainFrame.cpp \
|
||||
stdwx.cpp \
|
||||
ValidateAccountKey.cpp \
|
||||
ValidateEmailAddress.cpp \
|
||||
ValidateURL.cpp \
|
||||
ViewMessages.cpp \
|
||||
ViewProjects.cpp \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,148 @@
|
|||
// Berkeley Open Infrastructure for Network Computing
|
||||
// http://boinc.berkeley.edu
|
||||
// Copyright (C) 2005 University of California
|
||||
//
|
||||
// This is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
// License as published by the Free Software Foundation;
|
||||
// either version 2.1 of the License, or (at your option) any later version.
|
||||
//
|
||||
// This software is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
// See the GNU Lesser General Public License for more details.
|
||||
//
|
||||
// To view the GNU Lesser General Public License visit
|
||||
// http://www.gnu.org/copyleft/lesser.html
|
||||
// or write to the Free Software Foundation, Inc.,
|
||||
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||
#pragma implementation "ValidateEmailAddress.h"
|
||||
#endif
|
||||
|
||||
#include "stdwx.h"
|
||||
#include "ValidateEmailAddress.h"
|
||||
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(CValidateEmailAddress, wxValidator)
|
||||
|
||||
|
||||
CValidateEmailAddress::CValidateEmailAddress(wxString *val) {
|
||||
m_stringValue = val ;
|
||||
}
|
||||
|
||||
|
||||
CValidateEmailAddress::CValidateEmailAddress(const CValidateEmailAddress& val)
|
||||
: wxValidator()
|
||||
{
|
||||
Copy(val);
|
||||
}
|
||||
|
||||
|
||||
CValidateEmailAddress::~CValidateEmailAddress() {}
|
||||
|
||||
|
||||
bool CValidateEmailAddress::Copy(const CValidateEmailAddress& val) {
|
||||
wxValidator::Copy(val);
|
||||
|
||||
m_stringValue = val.m_stringValue ;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
bool CValidateEmailAddress::Validate(wxWindow *parent) {
|
||||
if(!CheckValidator())
|
||||
return FALSE;
|
||||
|
||||
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
|
||||
|
||||
if (!control->IsEnabled())
|
||||
return TRUE;
|
||||
|
||||
bool ok = TRUE;
|
||||
wxString val(control->GetValue().Trim().Trim(false)); // trim spaces before and after
|
||||
|
||||
// Regular Expression found here:
|
||||
// http://www.regexlib.com/REDetails.aspx?regexp_id=284
|
||||
wxRegEx reEmail =
|
||||
wxT("^([a-zA-Z0-9_\\-])+(\\.([a-zA-Z0-9_\\-])+)*@((\\[(((([0-1])?([0-9])?[0-9])|"
|
||||
"(2[0-4][0-9])|(2[0-5][0-5])))\\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2["
|
||||
"0-5][0-5])))\\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\\.(("
|
||||
"(([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5]))\\]))|((([a-zA-Z0-9])+("
|
||||
"([\\-])+([a-zA-Z0-9])+)*\\.)+([a-zA-Z])+(([\\-])+([a-zA-Z0-9])+)*))$");
|
||||
|
||||
if (val.Length() == 0) {
|
||||
ok = FALSE;
|
||||
m_errormsg = _("Please specify an account key to continue.");
|
||||
} else if (!reEmail.Matches(val)) {
|
||||
ok = FALSE;
|
||||
m_errormsg = _("Invalid email address; please enter a valid email address");
|
||||
}
|
||||
|
||||
if (!ok) {
|
||||
wxASSERT_MSG(!m_errormsg.empty(), _T("you forgot to set errormsg"));
|
||||
|
||||
m_validatorWindow->SetFocus();
|
||||
|
||||
wxString buf;
|
||||
buf.Printf(m_errormsg, control->GetValue().c_str());
|
||||
|
||||
wxMessageBox(buf, _("Validation conflict"),
|
||||
wxOK | wxICON_EXCLAMATION, parent
|
||||
);
|
||||
}
|
||||
|
||||
return ok;
|
||||
}
|
||||
|
||||
|
||||
bool CValidateEmailAddress::TransferToWindow(void) {
|
||||
if(!CheckValidator())
|
||||
return FALSE;
|
||||
|
||||
if (!m_stringValue)
|
||||
return TRUE;
|
||||
|
||||
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
|
||||
control->SetValue(* m_stringValue) ;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
bool CValidateEmailAddress::TransferFromWindow(void) {
|
||||
if(!CheckValidator())
|
||||
return FALSE;
|
||||
|
||||
if (!m_stringValue)
|
||||
return TRUE;
|
||||
|
||||
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
|
||||
* m_stringValue = control->GetValue() ;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
bool CValidateEmailAddress::wxIsAlphaNumeric(const wxString& val) {
|
||||
int i;
|
||||
for (i = 0; i < (int)val.Length(); i++) {
|
||||
if (!wxIsalnum(val[i]))
|
||||
return FALSE;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
bool CValidateEmailAddress::CheckValidator() const {
|
||||
wxCHECK_MSG(m_validatorWindow, FALSE,
|
||||
_T("No window associated with validator"));
|
||||
wxCHECK_MSG(m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)), FALSE,
|
||||
_T("wxTextValidator is only for wxTextCtrl's"));
|
||||
wxCHECK_MSG(m_stringValue, FALSE,
|
||||
_T("No variable storage for validator"));
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
// Berkeley Open Infrastructure for Network Computing
|
||||
// http://boinc.berkeley.edu
|
||||
// Copyright (C) 2005 University of California
|
||||
//
|
||||
// This is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
// License as published by the Free Software Foundation;
|
||||
// either version 2.1 of the License, or (at your option) any later version.
|
||||
//
|
||||
// This software is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
// See the GNU Lesser General Public License for more details.
|
||||
//
|
||||
// To view the GNU Lesser General Public License visit
|
||||
// http://www.gnu.org/copyleft/lesser.html
|
||||
// or write to the Free Software Foundation, Inc.,
|
||||
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#ifndef _VALIDATEEMAILADDRESS_H_
|
||||
#define _VALIDATEEMAILADDRESS_H_
|
||||
|
||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||
#pragma interface "ValidateEmailAddress.cpp"
|
||||
#endif
|
||||
|
||||
|
||||
class CValidateEmailAddress : public wxValidator
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( CValidateEmailAddress )
|
||||
|
||||
public:
|
||||
|
||||
CValidateEmailAddress( wxString *val = 0 );
|
||||
CValidateEmailAddress( const CValidateEmailAddress& val );
|
||||
|
||||
~CValidateEmailAddress();
|
||||
|
||||
virtual wxObject* Clone() const { return new CValidateEmailAddress(*this); }
|
||||
virtual bool Copy( const CValidateEmailAddress& val );
|
||||
|
||||
virtual bool Validate(wxWindow *parent);
|
||||
virtual bool TransferToWindow();
|
||||
virtual bool TransferFromWindow();
|
||||
|
||||
protected:
|
||||
wxString* m_stringValue;
|
||||
wxString m_errormsg;
|
||||
|
||||
bool wxIsAlphaNumeric(const wxString& val);
|
||||
virtual bool CheckValidator() const;
|
||||
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -291,6 +291,27 @@
|
|||
<File
|
||||
RelativePath="..\clientgui\res\boincsm.xpm">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\cpdnbbc16.xpm">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\cpdnbbc32.xpm">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\cpdnbbcapwizard.xpm">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\gridrepublic.ico">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\gridrepublic.xpm">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\gridrepublic2.ico">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\gridrepublicamwizard.xpm">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\mess.xpm">
|
||||
</File>
|
||||
|
|
@ -503,6 +524,12 @@
|
|||
<File
|
||||
RelativePath="..\clientgui\ValidateAccountKey.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\ValidateEmailAddress.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\ValidateEmailAddress.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\ValidateURL.cpp">
|
||||
</File>
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="boinc_dll"
|
||||
ProjectGUID="{B06280CB-82A4-46DE-8956-602643078BDF}"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
ProjectGUID="{ADA6451B-CFEA-402A-9681-227CD1FDE08C}"
|
||||
RootNamespace="boinc"
|
||||
Keyword="AtlProj">
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
|
|
@ -16,63 +16,57 @@
|
|||
OutputDirectory=".\Build\Debug"
|
||||
IntermediateDirectory=".\Build\Debug\boinc_dll\obj"
|
||||
ConfigurationType="2"
|
||||
UseOfMFC="0"
|
||||
UseOfATL="1"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../;../lib"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BOINC_DLL_EXPORTS"
|
||||
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
|
||||
MinimalRebuild="TRUE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
BufferSecurityCheck="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
|
||||
AssemblerListingLocation=".\Build\Debug\boinc_dll\obj/"
|
||||
ObjectFile=".\Build\Debug\boinc_dll\obj/"
|
||||
ProgramDataBaseFileName=".\Build\Debug\boinc_dll\obj/vc70.pdb"
|
||||
BrowseInformation="1"
|
||||
UsePrecompiledHeader="3"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="4"
|
||||
ForcedIncludeFiles="boinc_win.h"/>
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="4"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="kernel32.lib user32.lib MSVCRTD.LIB MSVCPRTD.LIB "
|
||||
OutputFile="Build\Debug/boinc.dll"
|
||||
LinkIncremental="0"
|
||||
SuppressStartupBanner="TRUE"
|
||||
IgnoreAllDefaultLibraries="TRUE"
|
||||
ModuleDefinitionFile="..\client\win\win_idle_tracker.def"
|
||||
IgnoreImportLibrary="TRUE"
|
||||
AdditionalDependencies="sensapi.lib wininet.lib"
|
||||
OutputFile="$(OutDir)/boinc.dll"
|
||||
LinkIncremental="2"
|
||||
MergedIDLBaseFileName="_boinc_dll.idl"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile=".\Build\Debug/boinc_dll.pdb"
|
||||
SubSystem="2"
|
||||
OptimizeReferences="0"
|
||||
ImportLibrary=".\Build\Debug/boinc.lib"
|
||||
ImportLibrary="$(OutDir)/boinc_dll.lib"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
MkTypLibCompatible="TRUE"
|
||||
SuppressStartupBanner="TRUE"
|
||||
MkTypLibCompatible="FALSE"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=".\Build\Debug/boinc_dll.tlb"
|
||||
HeaderFileName=""/>
|
||||
GenerateStublessProxies="TRUE"
|
||||
TypeLibraryName="$(IntDir)/boinc_dll.tlb"
|
||||
HeaderFileName="boinc_dll.h"
|
||||
DLLDataFileName=""
|
||||
InterfaceIdentifierFileName="boinc_dll_i.c"
|
||||
ProxyFileName="boinc_dll_p.c"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Performing registration"
|
||||
CommandLine="regsvr32 /s /c "$(TargetPath)""/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
PreprocessorDefinitions="_DEBUG;_CPDNBBC"
|
||||
Culture="1033"
|
||||
AdditionalIncludeDirectories="../"/>
|
||||
AdditionalIncludeDirectories=""$(IntDir)";../"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
|
|
@ -89,67 +83,56 @@
|
|||
OutputDirectory=".\Build\Release"
|
||||
IntermediateDirectory=".\Build\Release\boinc_dll\obj"
|
||||
ConfigurationType="2"
|
||||
UseOfMFC="0"
|
||||
UseOfATL="1"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
GlobalOptimizations="TRUE"
|
||||
InlineFunctionExpansion="1"
|
||||
EnableIntrinsicFunctions="TRUE"
|
||||
ImproveFloatingPointConsistency="FALSE"
|
||||
FavorSizeOrSpeed="1"
|
||||
OptimizeForWindowsApplication="TRUE"
|
||||
AdditionalIncludeDirectories="..;..\lib"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BOINC_DLL_EXPORTS"
|
||||
StringPooling="TRUE"
|
||||
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderThrough="boinc_win.h"
|
||||
PrecompiledHeaderFile="$(IntDir)/boinc_win.pch"
|
||||
AssemblerListingLocation=".\Build\Release\boinc_dll\obj/"
|
||||
ObjectFile=".\Build\Release\boinc_dll\obj/"
|
||||
ProgramDataBaseFileName=".\Build\Release\boinc_dll\obj/"
|
||||
UsePrecompiledHeader="3"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="3"
|
||||
ForcedIncludeFiles="boinc_win.h"/>
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="3"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="kernel32.lib user32.lib MSVCRT.LIB MSVCPRT.LIB "
|
||||
OutputFile="Build\Release/boinc.dll"
|
||||
IgnoreImportLibrary="TRUE"
|
||||
AdditionalDependencies="sensapi.lib wininet.lib"
|
||||
OutputFile="$(OutDir)/boinc.dll"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
IgnoreAllDefaultLibraries="TRUE"
|
||||
ModuleDefinitionFile="..\client\win\win_idle_tracker.def"
|
||||
MergedIDLBaseFileName="_boinc_dll.idl"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile=".\Build\Release/boinc_dll.pdb"
|
||||
SubSystem="2"
|
||||
OptimizeReferences="2"
|
||||
ImportLibrary=".\Build\Release/boinc.lib"
|
||||
EnableCOMDATFolding="2"
|
||||
ImportLibrary="$(OutDir)/boinc_dll.lib"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
MkTypLibCompatible="TRUE"
|
||||
SuppressStartupBanner="TRUE"
|
||||
MkTypLibCompatible="FALSE"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=".\Build\Release/boinc_dll.tlb"
|
||||
HeaderFileName=""/>
|
||||
GenerateStublessProxies="TRUE"
|
||||
TypeLibraryName="$(IntDir)/boinc_dll.tlb"
|
||||
HeaderFileName="boinc_dll.h"
|
||||
DLLDataFileName=""
|
||||
InterfaceIdentifierFileName="boinc_dll_i.c"
|
||||
ProxyFileName="boinc_dll_p.c"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Performing registration"
|
||||
CommandLine="regsvr32 /s /c "$(TargetPath)""/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
PreprocessorDefinitions="NDEBUG;_CPDNBBC"
|
||||
Culture="1033"
|
||||
AdditionalIncludeDirectories=".."/>
|
||||
AdditionalIncludeDirectories=""$(IntDir)";../"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
|
|
@ -167,57 +150,86 @@
|
|||
<Files>
|
||||
<Filter
|
||||
Name="Source Files"
|
||||
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
|
||||
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
|
||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
|
||||
<File
|
||||
RelativePath="..\client\win\win_idle_tracker.cpp">
|
||||
RelativePath="..\clientlib\win\boinc_dll.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\BOINCSENSSink.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\Identification.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\IdleTracker.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\NetworkTracker.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\stdafx.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;BOINC_DLL_EXPORTS;$(NoInherit)"
|
||||
BasicRuntimeChecks="3"
|
||||
BrowseInformation="1"/>
|
||||
UsePrecompiledHeader="1"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;BOINC_DLL_EXPORTS;$(NoInherit)"/>
|
||||
UsePrecompiledHeader="1"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\client\win\win_idle_tracker.def">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Header Files"
|
||||
Filter="h;hpp;hxx;hm;inl">
|
||||
Filter="h;hpp;hxx;hm;inl;inc;xsd"
|
||||
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
|
||||
<File
|
||||
RelativePath="..\client\win\boinc_dll.h">
|
||||
RelativePath="..\clientlib\win\boinc_dll.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\client\win\win_idle_tracker.h">
|
||||
RelativePath="..\clientlib\win\BOINCSENSSink.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\Identification.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\IdleTracker.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\NetworkTracker.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\Resource.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\SENSLogonSubscriptions.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\SENSNetworkSubscriptions.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\SENSOnNowSubscriptions.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\SENSSubscriptions.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\stdafx.h">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Resource Files"
|
||||
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
|
||||
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
|
||||
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
|
||||
<File
|
||||
RelativePath="..\client\win\boinc_dll.rc">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG;_CPDNBBC"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG;_CPDNBBC"/>
|
||||
</FileConfiguration>
|
||||
RelativePath="..\clientlib\win\boinc_dll.rc">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientlib\win\boincsens.rgs">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
|
|
|
|||
|
|
@ -310,6 +310,30 @@
|
|||
<File
|
||||
RelativePath="..\clientgui\res\boincsm.xpm">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\cpdnbbc.ico">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\cpdnbbc16.xpm">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\cpdnbbc32.xpm">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\cpdnbbcapwizard.xpm">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\gridrepublic.ico">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\gridrepublic.xpm">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\gridrepublic2.ico">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\gridrepublicamwizard.xpm">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\res\mess.xpm">
|
||||
</File>
|
||||
|
|
@ -522,6 +546,12 @@
|
|||
<File
|
||||
RelativePath="..\clientgui\ValidateAccountKey.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\ValidateEmailAddress.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\ValidateEmailAddress.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\ValidateURL.cpp">
|
||||
</File>
|
||||
|
|
@ -590,6 +620,12 @@
|
|||
<File
|
||||
RelativePath="..\clientgui\DlgDialupCredentials.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\DlgGenericMessage.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\DlgGenericMessage.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\clientgui\DlgOptions.cpp">
|
||||
</File>
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue