Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

implement Mac CUDA detection; fix compiler errors and warnings; change boinc_cmd to boinccmd/ 

svn path=/trunk/boinc/; revision=15111
This commit is contained in:
Charlie Fenton 2008-05-01 09:25:51 +00:00
parent a850123b39
commit 72df062b6c
6 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/graphics2_unix.C
View File

@ -37,6 +37,7 @@
#include "boinc_glut.h"
#include "boinc_api.h"
#include "graphics2.h"
#include "diagnostics.h"
#define TIMER_INTERVAL_MSEC 30

16
checkin_notes
View File

@ -3474,3 +3474,19 @@ David April 30 2008
lib/
boinc_cmd.C
Charlie May 1 2008
- API: fix Mac compile errors.
- client: implement Mac CUDA detection, fix compiler warning.
- boinc_cmd: change name to "boinccmd".
api/
graphics2_unix.C
lib/
coproc.C
mac_build/
boinc.xcodeproj/
project.pbxproj
mac_installer/
release_boinc.sh
release_GridRepublic.sh

9
lib/coproc.C
View File

@ -94,9 +94,10 @@ COPROC* COPROCS::lookup(char* name) {
}
void COPROC_CUDA::get(COPROCS& coprocs) {
int count, retval;
int count;
#ifdef _WIN32
int retval;
int (__stdcall* __cudaGetDeviceCount)( int * );
int (__stdcall* __cudaGetDeviceProperties) ( cudaDeviceProp*, int );
int bufsize=256;
@ -124,6 +125,9 @@ void COPROC_CUDA::get(COPROCS& coprocs) {
void (*__cudaGetDeviceCount)( int * );
void (*__cudaGetDeviceProperties) ( cudaDeviceProp*, int );
#ifdef __APPLE__
void *cudalib = dlopen ("/usr/local/cuda/lib/libcudart.dylib", RTLD_NOW );
#else
// Add CUDA dir to library path while looking for CUDA lib.
// Leave it there, shouldn't hurt.
//
@ -134,9 +138,6 @@ void COPROC_CUDA::get(COPROCS& coprocs) {
setenv("LD_LIBRARY_PATH", libpath, 1);
}
#ifdef __APPLE__
void *cudalib = dlopen ("libcudart.dylib", RTLD_NOW );
#else
void *cudalib = dlopen ("libcudart.so", RTLD_NOW );
#endif
if(!cudalib) return;

20
mac_build/boinc.xcodeproj/project.pbxproj
View File

@ -705,7 +705,7 @@
DD65020809F599B9008E8A3A /* txf_util.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = txf_util.C; path = ../api/txf_util.C; sourceTree = SOURCE_ROOT; };
DD65020909F599B9008E8A3A /* txf_util.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = txf_util.h; path = ../api/txf_util.h; sourceTree = SOURCE_ROOT; };
DD6617870A3FFD8C00FFEBEB /* check_security.C */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = check_security.C; sourceTree = "<group>"; };
DD69FEE808416C1300C01361 /* boinc_cmd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = boinc_cmd; sourceTree = BUILT_PRODUCTS_DIR; };
DD69FEE808416C1300C01361 /* boinccmd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = boinccmd; sourceTree = BUILT_PRODUCTS_DIR; };
DD69FEF608416C9A00C01361 /* boinc_cmd.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = boinc_cmd.C; path = ../lib/boinc_cmd.C; sourceTree = SOURCE_ROOT; };
DD6ABCD00BD4C5CA009AA7A1 /* browser_safari.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = browser_safari.mm; path = ../clientgui/mac/browser_safari.mm; sourceTree = SOURCE_ROOT; };
DD6D0A8507E9A61B007F882B /* network.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = network.C; path = ../lib/network.C; sourceTree = SOURCE_ROOT; };
@ -1054,7 +1054,7 @@
DDAEC9E107FA583B00A7BC36 /* SetVersion */,
DD96AFF90811075000A06F22 /* BOINCSaver.saver */,
DD1277B3081F3D67007B5DE1 /* PostInstall.app */,
DD69FEE808416C1300C01361 /* boinc_cmd */,
DD69FEE808416C1300C01361 /* boinccmd */,
DD6381EA0870DC9D007A2F8E /* MakeAppIcon_h */,
DD7748980A356C880025D05E /* SetUpSecurity */,
DDD0953F0A3EDD2500C95BA4 /* switcher */,
@ -1713,7 +1713,7 @@
);
name = cmd_boinc;
productName = cmd_boinc;
productReference = DD69FEE808416C1300C01361 /* boinc_cmd */;
productReference = DD69FEE808416C1300C01361 /* boinccmd */;
productType = "com.apple.product-type.tool";
};
DD7748970A356C880025D05E /* SetUpSecurity */ = {
@ -3276,7 +3276,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION_ppc = 3.3;
OTHER_LDFLAGS = "-lboinc";
PRODUCT_NAME = boinc_cmd;
PRODUCT_NAME = boinccmd;
};
name = Dev_noSandbox;
};
@ -3288,7 +3288,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION_ppc = 3.3;
OTHER_LDFLAGS = "-lboinc";
PRODUCT_NAME = boinc_cmd;
PRODUCT_NAME = boinccmd;
};
name = Deploy_noSandbox;
};
@ -3755,7 +3755,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION_ppc = 3.3;
OTHER_LDFLAGS = "-lboinc";
PRODUCT_NAME = boinc_cmd;
PRODUCT_NAME = boinccmd;
};
name = "Deployment-no64";
};
@ -4114,7 +4114,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION_ppc = 3.3;
OTHER_LDFLAGS = "-lboinc";
PRODUCT_NAME = boinc_cmd;
PRODUCT_NAME = boinccmd;
};
name = Deployment;
};
@ -4447,7 +4447,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION_ppc = 3.3;
OTHER_LDFLAGS = "-lboinc";
PRODUCT_NAME = boinc_cmd;
PRODUCT_NAME = boinccmd;
};
name = Development;
};
@ -4459,7 +4459,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION_ppc = 3.3;
OTHER_LDFLAGS = "-lboinc";
PRODUCT_NAME = boinc_cmd;
PRODUCT_NAME = boinccmd;
};
name = ppc_Deployment;
};
@ -4722,7 +4722,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION_ppc = 3.3;
OTHER_LDFLAGS = "-lboinc";
PRODUCT_NAME = boinc_cmd;
PRODUCT_NAME = boinccmd;
};
name = i386_Deployment;
};

4
mac_installer/release_GridRepublic.sh
View File

@ -21,7 +21,7 @@
##
# Release Script for Macintosh GridRepublic Desktop by Charlie Fenton
## updated 3/13/08 by Charlie Fenton
## updated 5/1/08 by Charlie Fenton
##
## NOTE: This script is deprecated.
@ -239,7 +239,7 @@ sudo chmod -R 555 "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal/ex
##### We've decided not to create branded command-line executables; they are identical to standard ones
#### mkdir -p "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_universal-apple-darwin"
#### cp -fpR $BUILDPATH/boinc "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_universal-apple-darwin/"
#### cp -fpR $BUILDPATH/boinc_cmd "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_universal-apple-darwin/"
#### cp -fpR $BUILDPATH/boinccmd "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_universal-apple-darwin/"
#### cp -fpR curl/ca-bundle.crt "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_universal-apple-darwin/"
#### sudo chown -R root:admin "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_universal-apple-darwin"/*
#### sudo chmod -R u+rw-s,g+r-ws,o+r-w "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_universal-apple-darwin"/*

4
mac_installer/release_boinc.sh
View File

@ -21,7 +21,7 @@
##
# Release Script for Macintosh BOINC Manager 10/31/07 by Charlie Fenton
## updated 3/13/08 by Charlie Fenton
## updated 5/1/08 by Charlie Fenton
##
## Usage:
@ -200,7 +200,7 @@ sudo chmod -R 644 ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_univers
mkdir -p ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_universal-apple-darwin/move_to_boinc_dir
cp -fpR $BUILDPATH/boinc ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_universal-apple-darwin/move_to_boinc_dir/
cp -fpR $BUILDPATH/boinc_cmd ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_universal-apple-darwin/move_to_boinc_dir/
cp -fpR $BUILDPATH/boinccmd ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_universal-apple-darwin/move_to_boinc_dir/
cp -fpR curl/ca-bundle.crt ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_universal-apple-darwin/move_to_boinc_dir/
mkdir -p ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_universal-apple-darwin/move_to_boinc_dir/switcher