- Update to 20050601

Submitted by:	J.R. Oldroyd <jr@opal.com> (maintainer)
This commit is contained in:
Pav Lucistnik 2005-06-02 21:08:23 +00:00
parent e8819c2c20
commit e820243a1d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=136691
23 changed files with 284 additions and 835 deletions

View file

@ -6,29 +6,26 @@
#
PORTNAME= boinc-client
PORTVERSION= 4.67.20050320
PORTREVISION= 1
PORTVERSION= 4.68.20050601
CATEGORIES= net
MASTER_SITES= http://boinc.berkeley.edu/source/nightly/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= pav
DISTNAME= boinc-cvs-2005-03-20
DISTNAME= boinc-cvs-2005-06-01
MAINTAINER= fbsd@opal.com
COMMENT= Berkeley Open Infrastructure for Network Computing client
.include <bsd.port.pre.mk>
# Build with "make -DWITHOUT_X11" if you don't want the boincmgr
# GUI management interface or the "screensaver" status displays
# from any of the client applications.
#
# Defining WITHOUT_X11 removes the dependencies on the X11 libs
# and the wxgtk2 toolkit and jpeg graphics lib.
# Disable GUI on FreeBSD 4.x due to problems with wxgtk lib
.if ${OSVERSION} < 500000
WITHOUT_X11= yes
.endif
.if !defined(WITHOUT_X11)
LIB_DEPENDS+= iconv:${PORTSDIR}/converters/libiconv \
wx_gtk2:${PORTSDIR}/x11-toolkits/wxgtk24 \
wx_base:${PORTSDIR}/x11-toolkits/wxgtk26 \
jpeg:${PORTSDIR}/graphics/jpeg \
glut:${PORTSDIR}/graphics/libglut
USE_XLIBS= yes
@ -38,35 +35,50 @@ USE_AUTOMAKE_VER= 19
USE_AUTOCONF_VER= 259
USE_AUTOHEADER_VER= 259
USE_LIBTOOL_VER= 15
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-server
.if defined(WITHOUT_X11)
CONFIGURE_ARGS+= --with-wx-config=false
.else
CONFIGURE_ARGS+= --with-wx-config=wxgtk2-2.4-config
.endif
CONFIGURE_ENV= CPPFLAGS=-I${X11BASE}/include CXXFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include"
WRKSRC= ${WRKDIR}/boinc
PKGINSTALL= ${WRKDIR}/pkg-install
PKGPLIST= ${WRKDIR}/pkg-plist
MAN1= boinc.1
.if !defined(WITHOUT_X11)
MLINKS= boinc.1 boincmgr.1
.endif
FIND_BOINC_BINARY=(cd ${WRKSRC}/client; make -V CLIENT_BIN_FILENAME)
FIND_BOINCMGR_BINARY=(cd ${WRKSRC}/client; make -V CLIENT_GUI_BIN_FILENAME)
BOINC_BINARY= boinc-client
BOINC_USER= boinc
BOINC_GROUP= nobody
BOINC_HOME= /var/db/boinc
BOINC_BINARY= boinc-client
PLIST_SUB= BOINC_BINARY="${BOINC_BINARY}" BOINC_HOME="${BOINC_HOME}" \
BOINC_USER="${BOINC_USER}" BOINC_GROUP="${BOINC_GROUP}"
.if !defined(WITHOUT_X11)
PLIST_SUB+= GUI=""
.else
PLIST_SUB+= GUI="@comment "
.endif
SUB_FILES= bin-boinc.sh boinc.1 boinc.sh pkg-install
SUB_LIST= BOINC_BINARY="${BOINC_BINARY}" BOINC_HOME="${BOINC_HOME}" \
BOINC_USER="${BOINC_USER}" BOINC_GROUP="${BOINC_GROUP}"
USE_RC_SUBR= boinc.sh
CONFIGURE_ARGS= --disable-server
.if !defined(WITHOUT_X11)
CONFIGURE_ARGS+= --with-wx-config=wxgtk2-2.6-config
.else
CONFIGURE_ARGS+= --with-wx-config=false
.endif
CONFIGURE_ENV= CPPFLAGS=-I${X11BASE}/include CXXFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include"
FIND_BOINC_BINARY=(cd ${WRKSRC}/client; make -V CLIENT_BIN_FILENAME)
FIND_BOINCMGR_BINARY=(cd ${WRKSRC}/client; make -V CLIENT_GUI_BIN_FILENAME)
WRKSRC= ${WRKDIR}/boinc
PKGINSTALL= ${WRKDIR}/pkg-install
PKGPLIST= ${WRKDIR}/pkg-plist
.if ${OSVERSION} < 500000
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-client-time_stats.C
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clientgui-MainDocument.cpp
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clientgui-MainFrame.cpp
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clientgui-ViewProjects.cpp
@ -75,40 +87,14 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clientgui-ViewTransfers.cpp
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clientgui-ViewWork.cpp
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clientgui-stdwx.h
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-lib-acct_mgr_client.C
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-lib-network.h
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-lib-diagnostics.h
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-lib-gui_rpc_client.C
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-lib-parse.C
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-zip-boinc_zip.cpp
.endif
pre-configure:
cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/libtool${USE_LIBTOOL_VER}/libltdl -I m4
post-build:
${SED} -e "s:%%BOINC_BINARY%%:${BOINC_BINARY}:g" \
-e "s:%%BOINC_HOME%%:${BOINC_HOME}:g" \
-e "s:%%BOINC_USER%%:${BOINC_USER}:g" \
-e "s:%%BOINC_GROUP%%:${BOINC_GROUP}:g" \
-e "s:%%LOCALBASE%%:${LOCALBASE}:g" \
< ${FILESDIR}/boinc.sh > ${WRKDIR}/boinc.sh
${SED} -e "s:%%BOINC_BINARY%%:${BOINC_BINARY}:g" \
-e "s:%%BOINC_HOME%%:${BOINC_HOME}:g" \
-e "s:%%BOINC_USER%%:${BOINC_USER}:g" \
-e "s:%%BOINC_GROUP%%:${BOINC_GROUP}:g" \
-e "s:%%LOCALBASE%%:${LOCALBASE}:g" \
< ${FILESDIR}/boinc.1 > ${WRKDIR}/boinc.1
${SED} -e "s:%%BOINC_BINARY%%:${BOINC_BINARY}:g" \
-e "s:%%BOINC_HOME%%:${BOINC_HOME}:g" \
-e "s:%%BOINC_USER%%:${BOINC_USER}:g" \
-e "s:%%BOINC_GROUP%%:${BOINC_GROUP}:g" \
-e "s:%%LOCALBASE%%:${LOCALBASE}:g" \
< ${PKGDIR}/pkg-install > ${WRKDIR}/pkg-install
${SED} -e "s:%%BOINC_BINARY%%:${BOINC_BINARY}:g" \
-e "s:%%BOINC_HOME%%:${BOINC_HOME}:g" \
-e "s:%%BOINC_USER%%:${BOINC_USER}:g" \
-e "s:%%BOINC_GROUP%%:${BOINC_GROUP}:g" \
-e "s:%%LOCALBASE%%:${LOCALBASE}:g" \
< ${FILESDIR}/rc-boinc.sh > ${WRKDIR}/rc-boinc.sh
cd ${WRKSRC}; ${ACLOCAL} -I m4
do-install:
${MKDIR} ${PREFIX}/lib/boinc
@ -124,18 +110,11 @@ do-install:
${INSTALL} ${WRKSRC}/lib/*.a ${PREFIX}/lib
${INSTALL} ${WRKSRC}/zip/*.a ${PREFIX}/lib
${INSTALL} ${WRKSRC}/RSAEuro/source/librsaeuro.a ${PREFIX}/lib
${INSTALL_SCRIPT} ${WRKDIR}/bin-boinc.sh ${PREFIX}/bin/boinc
${INSTALL_MAN} ${WRKDIR}/boinc.1 ${PREFIX}/man/man1
${CAT} ${PKGMESSAGE}
post-install:
${INSTALL_SCRIPT} ${WRKDIR}/boinc.sh ${PREFIX}/bin/boinc
${INSTALL_MAN} ${WRKDIR}/boinc.1 ${PREFIX}/man/man1
${MKDIR} ${PREFIX}/etc/rc.d
${INSTALL_SCRIPT} ${WRKDIR}/rc-boinc.sh ${PREFIX}/etc/rc.d/boinc.sh
${REINPLACE_CMD} \
-e "s:%%BOINC_BINARY%%:${BOINC_BINARY}:g" \
-e "s:%%BOINC_HOME%%:${BOINC_HOME}:g" \
-e "s:%%BOINC_USER%%:${BOINC_USER}:g" \
${TMPPLIST}
${CAT} ${PKGMESSAGE}
@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (boinc-cvs-2005-03-20.tar.gz) = 48ff80bf1839af0a744560f1eb4a858e
SIZE (boinc-cvs-2004-03-20.tar.gz) = 4755507
MD5 (boinc-cvs-2005-06-01.tar.gz) = 0be934587d5380e430f048a59d7e58fe
SIZE (boinc-cvs-2004-06-01.tar.gz) = 5685970

View file

@ -1,49 +0,0 @@
--- api/boinc_api.C.orig Sat Mar 19 16:39:16 2005
+++ api/boinc_api.C Mon Mar 21 11:08:09 2005
@@ -59,7 +59,7 @@
static APP_INIT_DATA aid;
static FILE_LOCK file_lock;
APP_CLIENT_SHM* app_client_shm = 0;
-static volatile double time_until_checkpoint;
+static volatile int time_until_checkpoint;
// time until enable checkpoint
static volatile double time_until_fraction_done_update;
// time until report fraction done to core client
@@ -79,7 +79,7 @@
static volatile int nrunning_ticks = 0;
#endif
-#define TIMER_PERIOD 1.0
+#define TIMER_PERIOD 1
// period of API timer
// This determines the resolution of fraction done and CPU time reporting
// to the core client, and of checkpoint enabling.
@@ -164,7 +164,7 @@
// the following may not be needed, but do it anyway
//
fraction_done = -1;
- time_until_checkpoint = aid.checkpoint_period;
+ time_until_checkpoint = (int) aid.checkpoint_period;
last_checkpoint_cpu_time = aid.wu_cpu_time;
time_until_fraction_done_update = aid.fraction_done_update_period;
last_wu_cpu_time = aid.wu_cpu_time;
@@ -548,8 +548,8 @@
perror("boinc set_worker_timer() sigaction");
return retval;
}
- value.it_value.tv_sec = (int)TIMER_PERIOD;
- value.it_value.tv_usec = ((int)(TIMER_PERIOD*1000000))%1000000;
+ value.it_value.tv_sec = TIMER_PERIOD;
+ value.it_value.tv_usec = 0;
value.it_interval = value.it_value;
retval = setitimer(ITIMER_REAL, &value, NULL);
if (retval) {
@@ -616,7 +616,7 @@
last_checkpoint_cpu_time = last_wu_cpu_time;
update_app_progress(last_checkpoint_cpu_time, last_checkpoint_cpu_time, 0);
ready_to_checkpoint = false;
- time_until_checkpoint = aid.checkpoint_period;
+ time_until_checkpoint = (int) aid.checkpoint_period;
return 0;
}

View file

@ -0,0 +1,7 @@
#!/bin/sh
export LD_LIBRARY_PATH=%%PREFIX%%/lib/boinc
args=${@+"$@"}
exec idprio 31 su - %%BOINC_USER%% -c "%%PREFIX%%/lib/boinc/%%BOINC_BINARY%% $args"

View file

@ -6,7 +6,7 @@ boinc [ options ]
.PP
boincmgr
.PP
sh /usr/local/etc/rc.d/boinc.sh start|stop|restart|status
sh %%PREFIX%%/etc/rc.d/boinc.sh start|stop|restart|status
.SH DESCRIPTION
.I boinc
is the client for the Berkeley Open Infrastructure for Network
@ -132,10 +132,10 @@ Full documentation of
is not provided here, but may be added in a future release.
.SH "STARTING BOINC AT BOOT TIME"
The
.I /usr/local/etc/rc.d/boinc.sh
.I %%PREFIX%%/etc/rc.d/boinc.sh
script is run automatically at system boot time.
Several variables can be set in
.I /etc/rc.conf
.I %%RC_SUBR%%
to control the BOINC client's behavior.
.IP boinc_enable
set to

View file

@ -1,7 +0,0 @@
#!/bin/sh
export LD_LIBRARY_PATH=%%LOCALBASE%%/lib/boinc
args=${@+"$@"}
exec idprio 31 su - %%BOINC_USER%% -c "%%LOCALBASE%%/lib/boinc/%%BOINC_BINARY%% $args"

View file

@ -1,18 +1,12 @@
#!/bin/sh
#
# $FreeBSD$
#
# Start or stop BOINC
#
if [ -f /etc/rc.subr ]
then
. /etc/rc.subr
elif [ -f /usr/local/etc/rc.subr ]
then
# FreeBSD 4.x
. /usr/local/etc/rc.subr
fi
# PROVIDE: boinc
# REQUIRE: LOGIN
# KEYWORD: FreeBSD
. %%RC_SUBR%%
name="boinc"
rcvar=`set_rcvar`
@ -20,15 +14,16 @@ rcvar=`set_rcvar`
boinc_user=%%BOINC_USER%%
boinc_home=%%BOINC_HOME%%
program_file=%%BOINC_BINARY%%
program_path=%%LOCALBASE%%/lib/boinc/${program_file}
program_path=%%PREFIX%%/lib/boinc/${program_file}
syslog_facility=daemon.err
[ -z "$boinc_enable" ] && boinc_enable="NO"
load_rc_config $name
: ${boinc_enable="NO"}
case "$1" in
start)
start_cmd=boinc_start
stop_cmd=boinc_stop
boinc_start() {
if checkyesno boinc_enable
then
if [ ! -x ${program_path} ]
@ -46,24 +41,10 @@ start)
export LD_LIBRARY_PATH=%%LOCALBASE%%/lib/boinc
idprio 31 su - ${boinc_user} -c "${program_path} ${boinc_flags} >/dev/null &"
fi
;;
}
stop)
boinc_stop() {
killall ${program_file} 2> /dev/null
;;
restart)
$0 stop
$0 start
;;
status)
ps auxww | egrep ${program_file} | egrep -v "($0|egrep)"
;;
*)
echo "usage: ${name} {start|stop|restart|status}" >&2
exit 64
;;
esac
}
run_rc_command "$1"

View file

@ -0,0 +1,10 @@
--- client/time_stats.C.orig Thu May 5 22:09:35 2005
+++ client/time_stats.C Thu Jun 2 09:43:04 2005
@@ -28,6 +28,7 @@
#endif
#ifdef HAVE_SYS_SOCKET_H
+#include <sys/types.h>
#include <sys/socket.h>
#endif

View file

@ -1,551 +1,101 @@
--- clientgui/MainDocument.cpp.orig Tue Mar 15 16:53:12 2005
+++ clientgui/MainDocument.cpp Sun Mar 20 21:59:15 2005
@@ -178,7 +178,7 @@
if ( IsConnected() )
return BOINC_SUCCESS;
--- clientgui/MainDocument.cpp.orig Sun May 29 03:29:00 2005
+++ clientgui/MainDocument.cpp Wed Jun 1 20:36:08 2005
@@ -553,7 +553,7 @@
- str.clear();
+ str = "";
if ( strMachine.empty() && !m_strConnectedComputerName.empty() )
str = m_strConnectedComputerName.c_str();
@@ -416,7 +416,7 @@
m_fProjectTotalResourceShare = 0.0;
for (i=0; i < (long)project_status.projects.size(); i++) {
- m_fProjectTotalResourceShare += project_status.projects.at( i )->resource_share;
+ m_fProjectTotalResourceShare += project_status.projects[i]->resource_share;
m_fProjectTotalResourceShare = 0.0;
for (i=0; i < (long)project_status.projects.size(); i++) {
- m_fProjectTotalResourceShare += project_status.projects.at(i)->resource_share;
+ m_fProjectTotalResourceShare += project_status.projects[i]->resource_share;
}
}
return iRetVal;
@@ -445,7 +445,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -470,7 +470,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -491,7 +491,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -512,7 +512,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -533,7 +533,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -554,7 +554,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -575,7 +575,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -603,7 +603,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -653,7 +653,7 @@
@@ -685,7 +685,7 @@
pProject = state.lookup_project(str);
if ( NULL != pProject )
{
- Url = pProject->gui_urls.at( iWebsiteIndex );
if (pProject) {
- Url = pProject->gui_urls.at(iWebsiteIndex);
+ Url = pProject->gui_urls[iWebsiteIndex];
strBuffer = Url.name.c_str();
}
@@ -676,7 +676,7 @@
@@ -706,7 +706,7 @@
pProject = state.lookup_project(str);
if ( NULL != pProject )
{
- Url = pProject->gui_urls.at( iWebsiteIndex );
if (pProject) {
- Url = pProject->gui_urls.at(iWebsiteIndex);
+ Url = pProject->gui_urls[iWebsiteIndex];
strBuffer = Url.description.c_str();
}
@@ -699,7 +699,7 @@
@@ -727,7 +727,7 @@
pProject = state.lookup_project(str);
if ( NULL != pProject )
{
- Url = pProject->gui_urls.at( iWebsiteIndex );
if (pProject) {
- Url = pProject->gui_urls.at(iWebsiteIndex);
+ Url = pProject->gui_urls[iWebsiteIndex];
strBuffer = Url.url.c_str();
}
@@ -715,7 +715,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
@@ -843,7 +843,7 @@
// pointer when the exception is thrown.
try {
if (!project_status.projects.empty())
- pProject = project_status.projects.at(i);
+ pProject = project_status.projects[i];
}
catch ( std::out_of_range e )
{
@@ -737,7 +737,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -765,7 +765,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -787,7 +787,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -809,7 +809,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -832,7 +832,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -866,7 +866,7 @@
try
{
if ( !project_status.projects.empty() )
- pProject = project_status.projects.at( iIndex );
+ pProject = project_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -930,7 +930,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -963,7 +963,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -987,7 +987,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1027,7 +1027,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1064,7 +1064,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1085,7 +1085,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1106,7 +1106,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1127,7 +1127,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
catch (std::out_of_range e) {
pProject = NULL;
@@ -1148,7 +1148,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
// pointer when the exception is thrown.
try {
if (!results.results.empty())
- pResult = results.results.at(i);
+ pResult = results.results[i];
}
catch ( std::out_of_range e )
{
catch (std::out_of_range e) {
pResult = NULL;
@@ -1169,7 +1169,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1191,7 +1191,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1213,7 +1213,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1235,7 +1235,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1257,7 +1257,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1279,7 +1279,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1301,7 +1301,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1323,7 +1323,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1345,7 +1345,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1368,7 +1368,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1404,7 +1404,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1440,7 +1440,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1472,7 +1472,7 @@
try
{
if ( !results.results.empty() )
- pResult = results.results.at( iIndex );
+ pResult = results.results[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1512,7 +1512,7 @@
}
}
if ( messages.messages.size() != 0 )
- m_iMessageSequenceNumber = messages.messages.at( messages.messages.size()-1 )->seqno;
+ m_iMessageSequenceNumber = messages.messages[messages.messages.size()-1]->seqno;
if (messages.messages.size() != 0)
- m_iMessageSequenceNumber = messages.messages.at(messages.messages.size()-1)->seqno;
+ m_iMessageSequenceNumber = messages.messages[messages.messages.size()-1]->seqno;
}
return iRetVal;
}
@@ -1539,7 +1539,7 @@
try
{
if ( !messages.messages.empty() )
- pMessage = messages.messages.at( iIndex );
+ pMessage = messages.messages[iIndex];
@@ -1257,7 +1257,7 @@
// pointer when the exception is thrown.
try {
if (!messages.messages.empty())
- pMessage = messages.messages.at(i);
+ pMessage = messages.messages[i];
}
catch ( std::out_of_range e )
{
@@ -1560,7 +1560,7 @@
try
{
if ( !messages.messages.empty() )
- pMessage = messages.messages.at( iIndex );
+ pMessage = messages.messages[iIndex];
catch (std::out_of_range e) {
pMessage = NULL;
@@ -1454,7 +1454,7 @@
// pointer when the exception is thrown.
try {
if (!ft.file_transfers.empty())
- pFT = ft.file_transfers.at(i);
+ pFT = ft.file_transfers[i];
}
catch ( std::out_of_range e )
{
@@ -1584,7 +1584,7 @@
try
{
if ( !messages.messages.empty() )
- pMessage = messages.messages.at( iIndex );
+ pMessage = messages.messages[iIndex];
catch (std::out_of_range e) {
pFT = NULL;
@@ -1534,7 +1534,7 @@
// pointer when the exception is thrown.
try {
if (!resource_status.projects.empty()) {
- pProject = resource_status.projects.at(i);
+ pProject = resource_status.projects[i];
}
}
catch ( std::out_of_range e )
{
catch (std::out_of_range e) {
@@ -1605,7 +1605,7 @@
try
{
if ( !messages.messages.empty() )
- pMessage = messages.messages.at( iIndex );
+ pMessage = messages.messages[iIndex];
// pointer when the exception is thrown.
try {
if (!statistics_status.projects.empty())
- pProject = statistics_status.projects.at(i);
+ pProject = statistics_status.projects[i];
}
catch ( std::out_of_range e )
{
@@ -1663,7 +1663,7 @@
try
{
if ( !ft.file_transfers.empty() )
- pFT = ft.file_transfers.at( iIndex );
+ pFT = ft.file_transfers[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1684,7 +1684,7 @@
try
{
if ( !ft.file_transfers.empty() )
- pFT = ft.file_transfers.at( iIndex );
+ pFT = ft.file_transfers[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1705,7 +1705,7 @@
try
{
if ( !ft.file_transfers.empty() )
- pFT = ft.file_transfers.at( iIndex );
+ pFT = ft.file_transfers[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1726,7 +1726,7 @@
try
{
if ( !ft.file_transfers.empty() )
- pFT = ft.file_transfers.at( iIndex );
+ pFT = ft.file_transfers[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1747,7 +1747,7 @@
try
{
if ( !ft.file_transfers.empty() )
- pFT = ft.file_transfers.at( iIndex );
+ pFT = ft.file_transfers[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1768,7 +1768,7 @@
try
{
if ( !ft.file_transfers.empty() )
- pFT = ft.file_transfers.at( iIndex );
+ pFT = ft.file_transfers[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1789,7 +1789,7 @@
try
{
if ( !ft.file_transfers.empty() )
- pFT = ft.file_transfers.at( iIndex );
+ pFT = ft.file_transfers[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1810,7 +1810,7 @@
try
{
if ( !ft.file_transfers.empty() )
- pFT = ft.file_transfers.at( iIndex );
+ pFT = ft.file_transfers[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1832,7 +1832,7 @@
try
{
if ( !ft.file_transfers.empty() )
- pFT = ft.file_transfers.at( iIndex );
+ pFT = ft.file_transfers[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1853,7 +1853,7 @@
try
{
if ( !ft.file_transfers.empty() )
- pFT = ft.file_transfers.at( iIndex );
+ pFT = ft.file_transfers[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1875,7 +1875,7 @@
try
{
if ( !ft.file_transfers.empty() )
- pFT = ft.file_transfers.at( iIndex );
+ pFT = ft.file_transfers[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1897,7 +1897,7 @@
try
{
if ( !ft.file_transfers.empty() )
- pFT = ft.file_transfers.at( iIndex );
+ pFT = ft.file_transfers[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1949,7 +1949,7 @@
try
{
if ( !resource_status.projects.empty() )
- pProject = resource_status.projects.at( iIndex );
+ pProject = resource_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
@@ -1978,7 +1978,7 @@
try
{
if ( !resource_status.projects.empty() )
- pProject = resource_status.projects.at( iIndex );
+ pProject = resource_status.projects[iIndex];
}
catch ( std::out_of_range e )
{
catch (std::out_of_range e) {
pProject = NULL;

View file

@ -1,20 +1,10 @@
--- clientgui/MainFrame.cpp.orig Sat Mar 12 01:51:31 2005
+++ clientgui/MainFrame.cpp Thu Mar 24 11:12:36 2005
@@ -1106,7 +1106,6 @@
wxString strConnectedMachine = wxEmptyString;
--- clientgui/MainFrame.cpp.orig Sun May 29 03:12:00 2005
+++ clientgui/MainFrame.cpp Wed Jun 1 20:58:56 2005
@@ -1323,7 +1323,6 @@
wxString strComputerName = wxEmptyString;
wxString strStatusText = wxEmptyString;
wxString strTitle = m_strBaseTitle;
- wxString strLocale = setlocale(LC_NUMERIC, NULL);
pDoc->GetConnectedComputerName( strConnectedMachine );
if ( strConnectedMachine.empty() )
@@ -1119,9 +1118,7 @@
strStatusText += strConnectedMachine;
}
- setlocale(LC_NUMERIC, "C");
strBuffer.Printf(wxT("%.2f"), pDoc->GetCoreClientVersion()/100.0);
- setlocale(LC_NUMERIC, strLocale.c_str());
strTitle.Printf(_("%s - (%s)"), m_strBaseTitle.c_str(), strConnectedMachine.c_str());
strStatusText.Printf(_("Connected to %s (%s)"), strConnectedMachine.c_str(), strBuffer.c_str());
if (pDoc->IsReconnecting())
pDoc->GetConnectingComputerName(strComputerName);

View file

@ -1,20 +1,20 @@
--- clientgui/ViewProjects.cpp.orig Tue Mar 15 18:44:48 2005
+++ clientgui/ViewProjects.cpp Sun Mar 20 21:29:09 2005
@@ -230,7 +230,7 @@
--- clientgui/ViewProjects.cpp.orig Sun May 29 03:12:00 2005
+++ clientgui/ViewProjects.cpp Wed Jun 1 20:44:38 2005
@@ -446,7 +446,7 @@
wxString CViewProjects::OnListGetItemText(long item, long column) const
{
- CProject* project = m_ProjectCache.at( item );
wxString CViewProjects::OnListGetItemText(long item, long column) const {
- CProject* project = m_ProjectCache.at(item);
+ CProject* project = m_ProjectCache[item];
wxString strBuffer = wxEmptyString;
switch(column)
@@ -536,7 +536,7 @@
switch(column) {
@@ -546,7 +546,7 @@
wxInt32 CViewProjects::UpdateCache( long item, long column, wxString& strNewData )
{
- CProject* project = m_ProjectCache.at( item );
wxInt32 CViewProjects::UpdateCache(long item, long column, wxString& strNewData) {
- CProject* project = m_ProjectCache.at(item);
+ CProject* project = m_ProjectCache[item];
switch(column)
{
switch(column) {
case COLUMN_PROJECT:

View file

@ -1,20 +1,20 @@
--- clientgui/ViewResources.cpp.orig Tue Mar 15 18:44:48 2005
+++ clientgui/ViewResources.cpp Sun Mar 20 21:31:22 2005
@@ -145,7 +145,7 @@
--- clientgui/ViewResources.cpp.orig Wed Apr 27 02:55:26 2005
+++ clientgui/ViewResources.cpp Wed Jun 1 20:47:46 2005
@@ -111,7 +111,7 @@
wxString CViewResources::OnListGetItemText( long item, long column ) const
{
- CResource* resource = m_ResourceCache.at( item );
wxString CViewResources::OnListGetItemText(long item, long column) const {
- CResource* resource = m_ResourceCache.at(item);
+ CResource* resource = m_ResourceCache[item];
wxString strBuffer = wxEmptyString;
switch(column)
@@ -270,7 +270,7 @@
@@ -178,7 +178,7 @@
wxInt32 CViewResources::UpdateCache( long item, long column, wxString& strNewData )
{
- CResource* resource = m_ResourceCache.at( item );
wxInt32 CViewResources::UpdateCache(long item, long column, wxString& strNewData) {
- CResource* resource = m_ResourceCache.at(item);
+ CResource* resource = m_ResourceCache[item];
switch(column)
{
switch(column) {
case COLUMN_PROJECT:

View file

@ -1,20 +1,20 @@
--- clientgui/ViewTransfers.cpp.orig Tue Mar 15 18:44:48 2005
+++ clientgui/ViewTransfers.cpp Sun Mar 20 21:32:00 2005
@@ -177,7 +177,7 @@
--- clientgui/ViewTransfers.cpp.orig Sun May 29 03:12:00 2005
+++ clientgui/ViewTransfers.cpp Wed Jun 1 20:49:11 2005
@@ -226,7 +226,7 @@
wxString CViewTransfers::OnListGetItemText(long item, long column) const
{
- CTransfer* transfer = m_TransferCache.at( item );
wxString CViewTransfers::OnListGetItemText(long item, long column) const {
- CTransfer* transfer = m_TransferCache.at(item);
+ CTransfer* transfer = m_TransferCache[item];
wxString strBuffer = wxEmptyString;
switch(column)
@@ -372,7 +372,7 @@
switch(column) {
@@ -322,7 +322,7 @@
wxInt32 CViewTransfers::UpdateCache( long item, long column, wxString& strNewData )
{
- CTransfer* transfer = m_TransferCache.at( item );
wxInt32 CViewTransfers::UpdateCache(long item, long column, wxString& strNewData) {
- CTransfer* transfer = m_TransferCache.at(item);
+ CTransfer* transfer = m_TransferCache[item];
switch(column)
{
switch(column) {
case COLUMN_PROJECT:

View file

@ -1,24 +1,24 @@
--- clientgui/ViewWork.cpp.orig Tue Mar 15 18:44:48 2005
+++ clientgui/ViewWork.cpp Sun Mar 20 21:35:22 2005
@@ -190,7 +190,7 @@
--- clientgui/ViewWork.cpp.orig Sun May 29 03:12:00 2005
+++ clientgui/ViewWork.cpp Wed Jun 1 20:50:34 2005
@@ -302,7 +302,7 @@
wxString CViewWork::OnListGetItemText( long item, long column ) const
{
- CWork* work = m_WorkCache.at( item );
wxString CViewWork::OnListGetItemText(long item, long column) const {
- CWork* work = m_WorkCache.at(item);
+ CWork* work = m_WorkCache[item];
wxString strBuffer = wxEmptyString;
switch(column)
@@ -436,7 +436,7 @@
switch(column) {
@@ -404,7 +404,7 @@
wxInt32 CViewWork::UpdateCache( long item, long column, wxString& strNewData )
{
- CWork* work = m_WorkCache.at( item );
wxInt32 CViewWork::UpdateCache(long item, long column, wxString& strNewData) {
- CWork* work = m_WorkCache.at(item);
+ CWork* work = m_WorkCache[item];
switch(column)
{
@@ -589,10 +589,7 @@
switch(column) {
case COLUMN_PROJECT:
@@ -497,10 +497,7 @@
pDoc->GetWorkApplicationName(item, strTempName);
pDoc->GetWorkApplicationVersion(item, iBuffer);

View file

@ -0,0 +1,11 @@
--- lib/diagnostics.h.orig Fri Mar 25 07:51:07 2005
+++ lib/diagnostics.h Thu Jun 2 08:43:04 2005
@@ -149,7 +149,7 @@
#else // _DEBUG
#define BOINCASSERT(expr)
-#define BOINCTRACE(...)
+#define BOINCTRACE
#define BOINCINFO boinc_info_release
#endif // _DEBUG

View file

@ -1,11 +0,0 @@
--- lib/network.h.orig Mon Mar 7 16:19:09 2005
+++ lib/network.h Sun Mar 20 22:35:20 2005
@@ -25,7 +25,7 @@
#define SHUT_WR SD_SEND
#elif defined( __APPLE__)
typedef int32_t socklen_t;
-#elif !defined(GETSOCKOPT_SOCKLEN_T) && !defined(_SOCKLEN_T_DECLARED) && !defined(socklen_t)
+#elif !defined(__FreeBSD__)
typedef size_t socklen_t;
#endif

View file

@ -1,14 +1,14 @@
--- lib/parse.C.orig Tue Mar 15 15:23:24 2005
+++ lib/parse.C Sun Mar 20 21:45:20 2005
@@ -31,7 +31,6 @@
--- lib/parse.C.orig Tue May 31 17:59:28 2005
+++ lib/parse.C Wed Jun 1 20:56:12 2005
@@ -32,7 +32,6 @@
#ifndef _WIN32
#include <cstring>
#include <cstdlib>
-#include <locale>
#include <string>
#endif
@@ -63,10 +62,7 @@
#if HAVE_IEEEFP_H
#include <ieeefp.h>
@@ -67,10 +66,7 @@
bool parse_int(const char* buf, const char* tag, int& x) {
char* p = strstr(buf, tag);
if (!p) return false;
@ -19,14 +19,14 @@
return true;
}
@@ -75,10 +71,7 @@
bool parse_double(const char* buf, const char* tag, double& x) {
@@ -80,10 +76,7 @@
double y;
char* p = strstr(buf, tag);
if (!p) return false;
- std::string strLocale = setlocale(LC_NUMERIC, NULL);
- setlocale(LC_NUMERIC, "C");
x = atof(p+strlen(tag));
y = atof(p+strlen(tag));
- setlocale(LC_NUMERIC, strLocale.c_str());
return true;
}
if (finite(y)) {
x = y;
return true;

View file

@ -1,55 +0,0 @@
--- api/boinc_api.C.orig Sat Mar 19 16:39:16 2005
+++ api/boinc_api.C Wed Mar 23 15:49:01 2005
@@ -56,6 +56,8 @@
// Unless otherwise noted, "CPU time" refers to the sum over all episodes
// (not counting the part after the last checkpoint in an episode).
+pthread_t timer_thread_handle;
+
static APP_INIT_DATA aid;
static FILE_LOCK file_lock;
APP_CLIENT_SHM* app_client_shm = 0;
@@ -506,6 +508,19 @@
#endif
}
+#ifndef _USECONDS_T_DECLARED
+typedef unsigned int useconds_t;
+#endif
+
+void *
+timer_thread(void *)
+{
+ while(1) {
+ usleep((useconds_t)(TIMER_PERIOD*1000000));
+ worker_timer(0);
+ }
+ /*NOTREACHED*/
+}
// set up a periodic timer interrupt for the worker thread.
// This is called only and always by the worker thread
@@ -539,21 +554,9 @@
//
SetThreadPriority(worker_thread_handle, THREAD_PRIORITY_LOWEST);
#else
- struct sigaction sa;
- itimerval value;
- sa.sa_handler = worker_timer;
- sa.sa_flags = SA_RESTART;
- retval = sigaction(SIGALRM, &sa, NULL);
- if (retval) {
- perror("boinc set_worker_timer() sigaction");
- return retval;
- }
- value.it_value.tv_sec = (int)TIMER_PERIOD;
- value.it_value.tv_usec = ((int)(TIMER_PERIOD*1000000))%1000000;
- value.it_interval = value.it_value;
- retval = setitimer(ITIMER_REAL, &value, NULL);
+ retval = pthread_create(&timer_thread_handle, NULL, timer_thread, NULL);
if (retval) {
- perror("boinc set_worker_timer() setitimer");
+ perror("boinc set_worker_timer() pthread_create(timer_thread)");
}
#endif
return retval;

View file

@ -1,11 +1,13 @@
--- clientgui/BOINCGUIApp.cpp.orig Fri Mar 11 08:08:50 2005
+++ clientgui/BOINCGUIApp.cpp Tue Mar 22 14:05:34 2005
@@ -81,8 +81,6 @@
--- clientgui/BOINCGUIApp.cpp.orig Wed May 25 15:48:01 2005
+++ clientgui/BOINCGUIApp.cpp Wed Jun 1 14:55:36 2005
@@ -110,10 +110,6 @@
BOINC_DIAG_DUMPCALLSTACKENABLED |
BOINC_DIAG_HEAPCHECKENABLED |
BOINC_DIAG_MEMORYLEAKCHECKENABLED |
-#if defined(__WXMSW__) || defined(__WXMAC__)
- BOINC_DIAG_REDIRECTSTDERR |
- BOINC_DIAG_REDIRECTSTDOUT |
-#endif
BOINC_DIAG_TRACETOSTDOUT;
diagnostics_init(

View file

@ -0,0 +1,29 @@
--- configure.ac.orig Mon May 23 18:01:12 2005
+++ configure.ac Wed Jun 1 17:43:25 2005
@@ -361,6 +361,8 @@
dnl check for wxWidgets
+enable_client_release=no
+disable_static_client=yes
if test "${enable_client_release}" = yes ; then
if test "${enable_debug}" = yes ; then
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=no --debug=yes)
@@ -426,6 +428,8 @@
disable_static_client=yes])
dnl Some platform specific settings
+enable_client_release=no
+disable_static_client=yes
case $target in
*linux* | *sun* )
if ( test "${enable_client_release}" = yes ) && ( test "${enable_client}" != yes ); then
@@ -491,6 +495,8 @@
CLIENTGUILIBS=${WX_LIBS}
+enable_client_release=no
+disable_static_client=yes
if test "${enable_client_release}" = "yes" ; then
SAH_STATICIZE_LDFLAGS([${WX_LIBS_STATIC}],[CLIENTGUILIBS])
SAH_STATICIZE_LDFLAGS([${GLUT_LIBS}],[GLUT_LIBS])

View file

@ -0,0 +1,13 @@
--- ltmain.sh.orig Thu Apr 28 17:56:47 2005
+++ ltmain.sh Wed Jun 1 17:01:36 2005
@@ -1348,10 +1348,6 @@
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
- *-*-openbsd* | *-*-freebsd*)
- # Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
- ;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
deplibs="$deplibs -framework System"

View file

@ -1,6 +1,5 @@
bin/boinc
bin/boincmgr
etc/rc.d/boinc.sh
%%GUI%%bin/boincmgr
include/BOINC/acct_mgr_client.h
include/BOINC/app_ipc.h
include/BOINC/base64.h
@ -45,9 +44,9 @@ include/BOINC/x_opengl.h
lib/boinc/%%BOINC_BINARY%%
lib/libboinc.a
lib/libboinc_api.a
lib/libboinc_graphics_api.a
lib/libboinc_graphics_impl.a
lib/libboinc_graphics_lib.a
%%GUI%%lib/libboinc_graphics_api.a
%%GUI%%lib/libboinc_graphics_impl.a
%%GUI%%lib/libboinc_graphics_lib.a
lib/librsaeuro.a
lib/libboinc_zip.a
@dirrm include/BOINC