From dcb3b74a70eb21787a8f215feb8cfce678068174 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 5 Nov 2003 00:13:16 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=2630 --- checkin_notes | 12 ++ client/client_state.C | 2 + client/win/win_net.cpp | 4 +- win_build/boinc_cli.dsp | 360 ---------------------------------------- win_build/boinc_gui.dsp | 6 +- 5 files changed, 21 insertions(+), 363 deletions(-) delete mode 100755 win_build/boinc_cli.dsp diff --git a/checkin_notes b/checkin_notes index f6f9e6f1fc..2fde2ab317 100755 --- a/checkin_notes +++ b/checkin_notes @@ -7452,3 +7452,15 @@ David 4 Nov 2003 sched/ handle_request.C server_types.C,h + +David 4 Nov 2003 + - change project file to get cmdline version to compile + (didn't test it) + + client/ + client_state.C + win/ + win_net.cpp + win_build/ + boinc_cli.dsp + boinc_gui.dsp diff --git a/client/client_state.C b/client/client_state.C index af1d01ecaf..4929bfd0d0 100644 --- a/client/client_state.C +++ b/client/client_state.C @@ -260,6 +260,8 @@ int CLIENT_STATE::init() { // restart_tasks(); + // Just to be on the safe side; something may have been modified + // set_client_state_dirty("init"); return 0; } diff --git a/client/win/win_net.cpp b/client/win/win_net.cpp index 914a95b1e3..d3521900fb 100644 --- a/client/win/win_net.cpp +++ b/client/win/win_net.cpp @@ -70,14 +70,14 @@ int NetOpen( void ) if((double)time(NULL) < net_last_dial_time + CONFIRM_WAIT) { return -1; } - +#ifndef WIN_CLI if(gstate.global_prefs.confirm_before_connecting) { net_last_req_time = (double)time(NULL); if(!RequestNetConnect()) { return -1; } } - +#endif net_last_dial_time = (double)time(NULL); rc = (*AutoDial)(INTERNET_AUTODIAL_FORCE_UNATTENDED, 0); if (rc) { diff --git a/win_build/boinc_cli.dsp b/win_build/boinc_cli.dsp deleted file mode 100755 index 73231d8319..0000000000 --- a/win_build/boinc_cli.dsp +++ /dev/null @@ -1,360 +0,0 @@ -# Microsoft Developer Studio Project File - Name="boinc_cli" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=boinc_cli - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "boinc_cli.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "boinc_cli.mak" CFG="boinc_cli - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "boinc_cli - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "boinc_cli - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "boinc_cli - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Build\Release" -# PROP Intermediate_Dir "Build\Release\obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../lib/" /I "../api/" /I "../RSAEuro/source/" /I "../client/win/" /I "../client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D MAJOR_VERSION=1 /D MINOR_VERSION=04 /D "WIN_CLI" /YX /FD /c /Tp -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 wsock32.lib wininet.lib winmm.lib nafxcwd.lib libcmtd.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"nafxcwd" /nodefaultlib:"libcmtd" /nodefaultlib:"libcmt" /nodefaultlib:"libcd" - -!ELSEIF "$(CFG)" == "boinc_cli - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Build\Debug\" -# PROP Intermediate_Dir "Build\Debug\obj" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MT /W3 /Gm /Gi /GX /ZI /Od /I "../lib/" /I "../api/" /I "../RSAEuro/source/" /I "../client/win/" /I "../client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D MAJOR_VERSION=1 /D MINOR_VERSION=04 /D "WIN_CLI" /FR /YX /FD /GZ /c /Tp -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib wininet.lib winmm.lib nafxcwd.lib libcmtd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"nafxcwd" /nodefaultlib:"libcmtd" /nodefaultlib:"libcmt" /nodefaultlib:"libcd" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "boinc_cli - Win32 Release" -# Name "boinc_cli - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\client\account.C -# End Source File -# Begin Source File - -SOURCE=..\Client\app.C -# End Source File -# Begin Source File - -SOURCE=..\lib\app_ipc.C -# End Source File -# Begin Source File - -SOURCE=..\Client\client_state.C -# End Source File -# Begin Source File - -SOURCE=..\Client\client_types.C -# End Source File -# Begin Source File - -SOURCE=..\Lib\Crypt.c -# End Source File -# Begin Source File - -SOURCE=..\Client\cs_apps.C -# End Source File -# Begin Source File - -SOURCE=..\Client\cs_files.C -# End Source File -# Begin Source File - -SOURCE=..\Client\cs_scheduler.C -# End Source File -# Begin Source File - -SOURCE=..\Client\file_names.C -# End Source File -# Begin Source File - -SOURCE=..\Client\file_xfer.C -# End Source File -# Begin Source File - -SOURCE=..\lib\filesys.C -# End Source File -# Begin Source File - -SOURCE=..\Client\Hostinfo.c -# End Source File -# Begin Source File - -SOURCE=..\Client\win\hostinfo_win.cpp -# End Source File -# Begin Source File - -SOURCE=..\Client\http.C -# End Source File -# Begin Source File - -SOURCE=..\lib\language.C -# End Source File -# Begin Source File - -SOURCE=..\Client\log_flags.C -# End Source File -# Begin Source File - -SOURCE=..\client\main.C -# End Source File -# Begin Source File - -SOURCE=..\Lib\Md5.c -# End Source File -# Begin Source File - -SOURCE=..\Lib\Md5_file.c -# End Source File -# Begin Source File - -SOURCE=..\Client\net_stats.C -# End Source File -# Begin Source File - -SOURCE=..\Client\net_xfer.C -# End Source File -# Begin Source File - -SOURCE=..\Lib\parse.C -# End Source File -# Begin Source File - -SOURCE=..\Client\pers_file_xfer.C -# End Source File -# Begin Source File - -SOURCE=..\Client\Prefs.c -# End Source File -# Begin Source File - -SOURCE=..\Client\scheduler_op.C -# End Source File -# Begin Source File - -SOURCE=..\lib\shmem.C -# End Source File -# Begin Source File - -SOURCE=..\Client\speed_stats.C -# End Source File -# Begin Source File - -SOURCE=..\client\ss_logic.C -# End Source File -# Begin Source File - -SOURCE=..\Client\time_stats.C -# End Source File -# Begin Source File - -SOURCE=..\lib\util.C -# End Source File -# Begin Source File - -SOURCE=..\Client\Version.c -# End Source File -# Begin Source File - -SOURCE=..\Client\win\Win_main.cpp -# End Source File -# Begin Source File - -SOURCE=..\Client\win\Win_net.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\client\app.h -# End Source File -# Begin Source File - -SOURCE=..\lib\app_ipc.h -# End Source File -# Begin Source File - -SOURCE=..\client\client_state.h -# End Source File -# Begin Source File - -SOURCE=..\client\client_types.h -# End Source File -# Begin Source File - -SOURCE=..\lib\error_numbers.h -# End Source File -# Begin Source File - -SOURCE=..\client\file_names.h -# End Source File -# Begin Source File - -SOURCE=..\client\file_xfer.h -# End Source File -# Begin Source File - -SOURCE=..\client\filesys.h -# End Source File -# Begin Source File - -SOURCE=..\client\hostinfo.h -# End Source File -# Begin Source File - -SOURCE=..\client\http.h -# End Source File -# Begin Source File - -SOURCE=..\lib\language.h -# End Source File -# Begin Source File - -SOURCE=..\client\log_flags.h -# End Source File -# Begin Source File - -SOURCE=..\client\maybe_gui.h -# End Source File -# Begin Source File - -SOURCE=..\lib\md5.h -# End Source File -# Begin Source File - -SOURCE=..\lib\md5_file.h -# End Source File -# Begin Source File - -SOURCE=..\client\message.h -# End Source File -# Begin Source File - -SOURCE=..\client\net_stats.h -# End Source File -# Begin Source File - -SOURCE=..\client\net_xfer.h -# End Source File -# Begin Source File - -SOURCE=..\lib\parse.h -# End Source File -# Begin Source File - -SOURCE=..\Client\pers_file_xfer.h -# End Source File -# Begin Source File - -SOURCE=..\client\prefs.h -# End Source File -# Begin Source File - -SOURCE=..\client\scheduler_op.h -# End Source File -# Begin Source File - -SOURCE=..\client\speed_stats.h -# End Source File -# Begin Source File - -SOURCE=..\client\ss_logic.h -# End Source File -# Begin Source File - -SOURCE=..\client\time_stats.h -# End Source File -# Begin Source File - -SOURCE=..\client\util.h -# End Source File -# Begin Source File - -SOURCE=..\client\version.h -# End Source File -# Begin Source File - -SOURCE=..\Client\win\Win_net.h -# End Source File -# Begin Source File - -SOURCE=..\Client\win\windows_cpp.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\RSAEuro_Release\RSAEuro.lib -# End Source File -# End Group -# End Target -# End Project diff --git a/win_build/boinc_gui.dsp b/win_build/boinc_gui.dsp index a7f8f6a712..278ba8a78f 100755 --- a/win_build/boinc_gui.dsp +++ b/win_build/boinc_gui.dsp @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /Gi /GX /ZI /Od /I "../lib/" /I "../api/" /I "../RSAEuro/source/" /I "../client/win/" /I "../client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /GZ /c /Tp +# ADD CPP /nologo /MTd /W3 /Gm /Gi /GX /ZI /Od /I "../lib/" /I "../api/" /I "../RSAEuro/source/" /I "../client/win/" /I "../client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "WIN_CLI" /FR /YX /FD /GZ /c /Tp # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -378,6 +378,10 @@ SOURCE=..\client\net_xfer.h # End Source File # Begin Source File +SOURCE=..\lib\parse.h +# End Source File +# Begin Source File + SOURCE=..\Client\pers_file_xfer.h # End Source File # Begin Source File