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

Fix Mac build. Additional clean-up 

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
This commit is contained in:
Vitalii Koshura 2020-07-14 13:56:26 +02:00
parent ee06705460
commit 65c7ef368e
No known key found for this signature in database
GPG Key ID: CE0DB1726070A5A3
7 changed files with 0 additions and 1211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdParty/buildMacDependencies.sh vendored
View File

@ -156,7 +156,6 @@ download_and_build "${opensslDirName}" "${opensslFileName}" "${opensslURL}" "${R
download_and_build "${caresDirName}" "${caresFileName}" "${caresURL}" "${ROOTDIR}/mac_build/buildc-ares.sh" "libcares.a" "x86_64"
download_and_build "${curlDirName}" "${curlFileName}" "${curlURL}" "${ROOTDIR}/mac_build/buildcurl.sh" "libcurl.a" "x86_64"
download_and_build "${wxWidgetsDirName}" "${wxWidgetsFileName}" "${wxWidgetsURL}" "${ROOTDIR}/mac_build/buildWxMac.sh ${wxoption}" "libwx_osx_cocoa_static.a" "x86_64"
download_and_build "${sqliteDirName}" "${sqliteFileName}" "${sqliteURL}" "${ROOTDIR}/mac_build/buildsqlite3.sh" "libsqlite3.a" "x86_64"
download_and_build "${freetypeDirName}" "${freetypeFileName}" "${freetypeURL}" "${ROOTDIR}/mac_build/buildfreetype.sh" "libfreetype.a" "x86_64"
download_and_build "${ftglDirName}" "${ftglFileName}" "${ftglURL}" "${ROOTDIR}/mac_build/buildFTGL.sh" "libftgl.a" "x86_64"

1035
clientgui/browser.cpp
View File

File diff suppressed because it is too large Load Diff

57
clientgui/browser.h
View File

@ -1,57 +0,0 @@
// This file is part of BOINC.
// http://boinc.berkeley.edu
// Copyright (C) 2008 University of California
//
// BOINC 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 3 of the License, or (at your option) any later version.
//
// BOINC 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.
//
// You should have received a copy of the GNU Lesser General Public License
// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
DEPRECATED
#ifndef BOINC_BROWSER_H
#define BOINC_BROWSER_H
//
// The BOINC client now supports the ability to lookup a users
// authenticator during automatic attachments via a browser
// cookie.
//
bool detect_setup_authenticator(std::string& project_url, std::string& authenticator);
bool detect_simple_account_credentials(
std::string& project_name, std::string& project_url, std::string& authenticator,
std::string& project_institution, std::string& project_description, std::string& known
);
bool detect_account_manager_credentials(
std::string& project_url, std::string& login, std::string& password_hash,
std::string& return_url
);
bool is_authenticator_valid(const std::string authenticator);
// platform specific browsers
//
#ifdef _WIN32
bool detect_cookie_ie(std::string& project_url, std::string& name, std::string& value);
#endif
#ifdef __APPLE__
bool detect_cookie_safari(std::string& project_url, std::string& name, std::string& value);
#endif
// Cross-platform browsers
//
bool detect_cookie_firefox_3(std::string& project_url, std::string& name, std::string& value);
bool detect_cookie_chrome(std::string& project_url, std::string& name, std::string& value);
#endif

75
clientgui/mac/browser_safari.mm
View File

@ -1,75 +0,0 @@
// This file is part of BOINC.
// http://boinc.berkeley.edu
// Copyright (C) 2016 University of California
//
// BOINC 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 3 of the License, or (at your option) any later version.
//
// BOINC 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.
//
// You should have received a copy of the GNU Lesser General Public License
// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
#include <Cocoa/Cocoa.h>
#include "str_util.h"
#include "browser.h"
bool detect_cookie_safari(std::string& project_url, std::string& name, std::string& value)
{
NSHTTPCookieStorage *cookieStorage;
NSArray *theCookies;
NSHTTPCookie *aCookie;
NSURL *theURL;
NSString *theURLString, *theValueString, *theNameString;
NSDate *expirationDate;
unsigned int i, n;
bool retval = false;
NSAutoreleasePool* pool;
pool = [[NSAutoreleasePool alloc] init];
theURLString = [ NSString stringWithCString:project_url.c_str() encoding:NSMacOSRomanStringEncoding ];
theURL = [ NSURL URLWithString:theURLString ];
cookieStorage = [ NSHTTPCookieStorage sharedHTTPCookieStorage ];
if (cookieStorage == NULL)
goto bail;
theCookies = [ cookieStorage cookiesForURL:theURL ];
if (theCookies == NULL)
goto bail;
n = [ theCookies count ];
for (i=0; i<n; i++) {
aCookie = (NSHTTPCookie*)[ theCookies objectAtIndex:i ];
// has the cookie expired?
expirationDate = [ aCookie expiresDate ];
if ([ expirationDate compare:[ NSDate date ]] == NSOrderedAscending)
continue;
theNameString = [ aCookie name ];
// is this the right cookie?
if (!starts_with([ theNameString cStringUsingEncoding:NSMacOSRomanStringEncoding ], name.c_str()))
continue;
theValueString = [ aCookie value ];
value = [ theValueString cStringUsingEncoding:NSMacOSRomanStringEncoding ];
retval = true;
}
bail:
[pool release];
return retval;
}

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

@ -176,7 +176,6 @@
DD48091F081A66F100A174AA /* BOINCSaver.nib in Resources */ = {isa = PBXBuildFile; fileRef = DD48091E081A66F100A174AA /* BOINCSaver.nib */; };
DD4AE04D13652BD700285859 /* cc_config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD4AE04B13652BD700285859 /* cc_config.cpp */; };
DD4AE05013652C1300285859 /* cc_config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD4AE04B13652BD700285859 /* cc_config.cpp */; };
DD4E704C0BCDAC360010A522 /* browser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD4E70490BCDAC360010A522 /* browser.cpp */; };
DD4EC65A08A0A7AF009AA08F /* gui_rpc_client_ops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD73E34E08A0694000656EB1 /* gui_rpc_client_ops.cpp */; };
DD4EC65B08A0A83F009AA08F /* gui_rpc_client_print.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD73E34F08A0694100656EB1 /* gui_rpc_client_print.cpp */; };
DD51DC8F0A4943A300BD24E6 /* check_security.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD6617870A3FFD8C00FFEBEB /* check_security.cpp */; };
@ -222,7 +221,6 @@
DD69FEF708416C9A00C01361 /* boinc_cmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD69FEF608416C9A00C01361 /* boinc_cmd.cpp */; };
DD69FF0C084171CF00C01361 /* network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD6D0A8507E9A61B007F882B /* network.cpp */; };
DD6A829C181103990037172D /* thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD6A829A181103990037172D /* thread.cpp */; };
DD6ABCD10BD4C5CA009AA7A1 /* browser_safari.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD6ABCD00BD4C5CA009AA7A1 /* browser_safari.mm */; };
DD6D0A8707E9A61E007F882B /* network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD6D0A8507E9A61B007F882B /* network.cpp */; };
DD728D45175DD3B900A1CE23 /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC06AB210A3E93F00C8D9A5 /* url.cpp */; };
DD728D47175DD41B00A1CE23 /* str_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD7BF7D70B8E7A9800A009F7 /* str_util.cpp */; };
@ -986,8 +984,6 @@
DD4AE04C13652BD700285859 /* cc_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cc_config.h; path = ../lib/cc_config.h; sourceTree = SOURCE_ROOT; };
DD4C560C0AD389A2009E23C6 /* sg_DlgMessages.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = sg_DlgMessages.cpp; path = ../clientgui/sg_DlgMessages.cpp; sourceTree = SOURCE_ROOT; };
DD4C560D0AD389A2009E23C6 /* sg_DlgMessages.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sg_DlgMessages.h; path = ../clientgui/sg_DlgMessages.h; sourceTree = SOURCE_ROOT; };
DD4E70490BCDAC360010A522 /* browser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = browser.cpp; sourceTree = "<group>"; };
DD4E704A0BCDAC360010A522 /* browser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = browser.h; path = ../clientgui/browser.h; sourceTree = SOURCE_ROOT; };
DD531BC50C193D3800742E50 /* MacInstaller.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacInstaller.icns; path = ../clientgui/res/MacInstaller.icns; sourceTree = SOURCE_ROOT; };
DD531BC70C193D5200742E50 /* MacUninstaller.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacUninstaller.icns; path = ../clientgui/res/MacUninstaller.icns; sourceTree = SOURCE_ROOT; };
DD55AF6B1916248200259439 /* coproc_sched.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coproc_sched.cpp; sourceTree = "<group>"; };
@ -1043,7 +1039,6 @@
DD69FEF608416C9A00C01361 /* boinc_cmd.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = boinc_cmd.cpp; sourceTree = "<group>"; };
DD6A829A181103990037172D /* thread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread.cpp; sourceTree = "<group>"; };
DD6A829B181103990037172D /* thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thread.h; sourceTree = "<group>"; };
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.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = network.cpp; sourceTree = "<group>"; };
DD6D0A8607E9A61B007F882B /* network.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = network.h; path = ../lib/network.h; sourceTree = SOURCE_ROOT; };
DD6D82DA08131AB1008F7200 /* macglutfix.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = macglutfix.m; sourceTree = "<group>"; };
@ -1700,8 +1695,6 @@
DD81C43D07C5D2240098A04D /* BOINCTaskBar.h */,
DD81C40607C5D1020098A04D /* BOINCTaskCtrl.cpp */,
DD81C43807C5D2240098A04D /* BOINCTaskCtrl.h */,
DD4E70490BCDAC360010A522 /* browser.cpp */,
DD4E704A0BCDAC360010A522 /* browser.h */,
DDCE78220A70BD29008218B6 /* common */,
DD58C43708F3347D00C1DF66 /* CompletionErrorPage.cpp */,
DD58C43808F3347D00C1DF66 /* CompletionErrorPage.h */,
@ -2169,7 +2162,6 @@
isa = PBXGroup;
children = (
DDCA2EBD18C49139007D5F6C /* BOINCGUIApp.mm */,
DD6ABCD00BD4C5CA009AA7A1 /* browser_safari.mm */,
DD30446A0864332D00D73756 /* config.h */,
DD1F0ACD0822069E00AFC5FA /* MacGUI.pch */,
DD1907FA17D1A2F100596F03 /* MacAccessiblity.mm */,
@ -3110,7 +3102,6 @@
DD7DD79B0B8BFA4000B11279 /* ViewResources.cpp in Sources */,
DD7BF7E60B8E7B6C00A009F7 /* str_util.cpp in Sources */,
DD08648D19E0BE6D00994039 /* ProjectWelcomePage.cpp in Sources */,
DD4E704C0BCDAC360010A522 /* browser.cpp in Sources */,
DDA6BD210BD4551F008F7921 /* mac_backtrace.cpp in Sources */,
DDA6BD230BD4551F008F7921 /* QBacktrace.c in Sources */,
DDA6BD250BD4551F008F7921 /* QCrashReport.c in Sources */,
@ -3118,7 +3109,6 @@
DDA6BD290BD4551F008F7921 /* QMachOImageList.c in Sources */,
DDA6BD2B0BD4551F008F7921 /* QSymbols.c in Sources */,
DDA6BD2D0BD4551F008F7921 /* QTaskMemory.c in Sources */,
DD6ABCD10BD4C5CA009AA7A1 /* browser_safari.mm in Sources */,
DDD52DCA0C03CAE6009B5FC0 /* ViewProjects.cpp in Sources */,
DDD52DCC0C03CAE6009B5FC0 /* ViewTransfers.cpp in Sources */,
DDD52DCE0C03CAE6009B5FC0 /* ViewWork.cpp in Sources */,

4
mac_build/dependencyNames.sh
View File

@ -51,10 +51,6 @@ wxWidgetsDirName="wxWidgets-3.1.0"
wxWidgetsFileName="wxWidgets-3.1.0.tar.bz2"
wxWidgetsURL="https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.0/wxWidgets-3.1.0.tar.bz2"
sqliteDirName="sqlite-autoconf-3220000"
sqliteFileName="sqlite-autoconf-3220000.tar.gz"
sqliteURL="https://www.sqlite.org/2018/sqlite-autoconf-3220000.tar.gz"
freetypeDirName="freetype-2.9"
freetypeFileName="freetype-2.9.tar.bz2"
freetypeURL="https://sourceforge.net/projects/freetype/files/freetype2/2.9/freetype-2.9.tar.bz2"

29
mac_build/setupForBOINC.sh
View File

@ -64,7 +64,6 @@ caresOK="NO"
curlOK="NO"
opensslOK="NO"
wxWidgetsOK="NO"
sqlite3OK="NO"
freetypeOK="NO"
ftglOK="NO"
finalResult=0
@ -138,22 +137,6 @@ fi
cd "${SCRIPT_DIR}"
echo ""
echo "----------------------------------"
echo "---------- BUILD sqlite ----------"
echo "----------------------------------"
echo ""
cd "../../${sqliteDirName}"
if [ $? -eq 0 ]; then
source "${SCRIPT_DIR}/buildsqlite3.sh" ${cleanit}
if [ $? -eq 0 ]; then
sqlite3OK="YES"
fi
fi
cd "${SCRIPT_DIR}"
echo ""
echo "----------------------------------"
echo "--------- BUILD FreeType ---------"
@ -234,18 +217,6 @@ if [ "${wxWidgetsOK}" = "NO" ]; then
finalResult=$[ finalResult | 8 ]
fi
if [ "${sqlite3OK}" = "NO" ]; then
echo ""
echo "----------------------------------"
echo "------------ WARNING -------------"
echo "------------ -------------"
echo "-- COULD NOT BUILD ${sqliteDirName} -"
echo "----------------------------------"
echo ""
finalResult=$[ finalResult | 16 ]
fi
if [ "${freetypeOK}" = "NO" ]; then
echo ""
echo "-----------------------------------"