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

Merge branch 'master' of ssh://boinc.berkeley.edu/boinc-v2

This commit is contained in:
Joachim Fritzsch 2014-02-13 14:35:44 +01:00
parent c0f8b38a3d 5fd0d78fd3
commit ea512862fb
17 changed files with 140 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -11,8 +11,11 @@
# Installshield build directories
/win_build/installerv2/BOINC
/win_build/installerv2/BOINC_vbox
/win_build/installerv2/BOINCx64
/win_build/installerv2/BOINCx64_vbox
/win_build/installerv2/WCG
/win_build/installerv2/Progress
#
*.pfx
@ -24,7 +27,6 @@
*.la
*.in
/client/Makefile
/win_build/installerv2/Progress
/win_build/*.filters
/win_build/boinc.sdf
/win_build/boinc.opensdf

4
android/BOINC/AndroidManifest.xml
View File

@ -20,8 +20,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="edu.berkeley.boinc"
android:installLocation="internalOnly"
android:versionCode="54"
android:versionName="7.3.1" > <!-- installation on SD card would break boot receiver -->
android:versionCode="55"
android:versionName="7.3.2" > <!-- installation on SD card would break boot receiver -->
<!-- Add Google Play store metadata informing the store we can run on tablets and other large screen devices -->

2
configure.ac
View File

@ -6,7 +6,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work)
AC_PREREQ(2.58)
dnl Set the BOINC version here. You can also use the set-version script.
AC_INIT(BOINC, 7.3.1)
AC_INIT(BOINC, 7.3.2)
AC_CONFIG_MACRO_DIR([m4])
LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
AC_SUBST([LIBBOINC_VERSION])

82
doc/versions.inc
View File

@ -43,9 +43,9 @@ function linux_info() {
instead. ";
}
$w72dev = array(
$w72 = array(
"num"=>"7.2.39",
"status"=>"Development version",
"status"=>"Recommended version",
"file"=>"boinc_7.2.39_windows_intelx86.exe",
"vbox_file"=>"boinc_7.2.39_windows_intelx86_vbox.exe",
"vbox_version"=>"4.2.16",
@ -53,16 +53,6 @@ $w72dev = array(
"type"=>"win_new",
);
$w72 = array(
"num"=>"7.2.33",
"status"=>"Recommended version",
"file"=>"boinc_7.2.33_windows_intelx86.exe",
"vbox_file"=>"boinc_7.2.33_windows_intelx86_vbox.exe",
"vbox_version"=>"4.2.16",
"date"=>"26 Nov 2013",
"type"=>"win_new",
);
$w70 = array(
"num"=>"7.0.64",
"status"=>"Older version",
@ -87,9 +77,9 @@ $w5816 = array(
"type"=>"win_new",
);
$w72x64dev = array(
$w72x64 = array(
"num"=>"7.2.39",
"status"=>"Development version",
"status"=>"Recommended version",
"file"=>"boinc_7.2.39_windows_x86_64.exe",
"vbox_file"=>"boinc_7.2.39_windows_x86_64_vbox.exe",
"vbox_version"=>"4.2.16",
@ -97,16 +87,6 @@ $w72x64dev = array(
"type"=>"win_new",
);
$w72x64 = array(
"num"=>"7.2.33",
"status"=>"Recommended version",
"file"=>"boinc_7.2.33_windows_x86_64.exe",
"vbox_file"=>"boinc_7.2.33_windows_x86_64_vbox.exe",
"vbox_version"=>"4.2.16",
"date"=>"26 Nov 2013",
"type"=>"win_new",
);
$w70x64 = array(
"num"=>"7.0.64",
"status"=>"Older version",
@ -115,22 +95,14 @@ $w70x64 = array(
"type"=>"win_new",
);
$m72dev = array(
$m72 = array(
"num"=>"7.2.39",
"status"=>"Development version (standard GUI)",
"status"=>"Recommended version (standard GUI)",
"file"=>"boinc_7.2.39_macOSX_i686.zip",
"date"=>"28 Jan 2014",
"type"=>"mac_advanced",
);
$m72 = array(
"num"=>"7.2.33",
"status"=>"Recommended version (standard GUI)",
"file"=>"boinc_7.2.33_macOSX_i686.zip",
"date"=>"26 Nov 2013",
"type"=>"mac_advanced",
);
$m70 = array(
"num"=>"7.0.65",
"status"=>"Older version (standard GUI)",
@ -155,22 +127,14 @@ $m66 = array(
"type"=>"mac_advanced",
);
$m72cdev = array(
$m72c = array(
"num"=>"7.2.39",
"status"=>"Development version (Unix command-line version)",
"status"=>"Recommended version (Unix command-line version)",
"file"=>"boinc_7.2.39_i686-apple-darwin.zip",
"date"=>"28 Jan 2014",
"type"=>"bare_core",
);
$m72c = array(
"num"=>"7.2.33",
"status"=>"Recommended version (Unix command-line version)",
"file"=>"boinc_7.2.33_i686-apple-darwin.zip",
"date"=>"26 Nov 2013",
"type"=>"bare_core",
);
$m70c = array(
"num"=>"7.0.65",
"status"=>"Older version (Unix command-line version)",
@ -211,22 +175,14 @@ $l66 = array(
"type"=>"sea",
);
$l72ubuntudev = array(
$l72ubuntu = array(
"num"=>"7.2.39",
"status"=>"Development version",
"status"=>"Recommended version",
"file"=>"boinc_7.2.39_i686-pc-linux-gnu.sh",
"date"=>"28 Jan 2014",
"type"=>"sea",
);
$l72ubuntu = array(
"num"=>"7.2.33",
"status"=>"Recommended version",
"file"=>"boinc_7.2.33_i686-pc-linux-gnu.sh",
"date"=>"26 Nov 2013",
"type"=>"sea",
);
$l70ubuntu = array(
"num"=>"7.0.65",
"status"=>"Older version",
@ -235,22 +191,14 @@ $l70ubuntu = array(
"type"=>"sea",
);
$l72ubuntux64dev = array(
$l72ubuntux64 = array(
"num"=>"7.2.39",
"status"=>"Development version",
"status"=>"Recommended version",
"file"=>"boinc_7.2.39_x86_64-pc-linux-gnu.sh",
"date"=>"28 Jan 2014",
"type"=>"sea",
);
$l72ubuntux64 = array(
"num"=>"7.2.33",
"status"=>"Recommended version",
"file"=>"boinc_7.2.33_x86_64-pc-linux-gnu.sh",
"date"=>"26 Nov 2013",
"type"=>"sea",
);
$l70ubuntux64 = array(
"num"=>"7.0.65",
"status"=>"Older version",
@ -276,7 +224,6 @@ $windows = array(
"description"=>"XP/Vista/7/8/8.1",
"dbname" => "windows_intelx86",
"versions"=>array(
$w72dev,
$w72,
$w70,
$w66,
@ -289,7 +236,6 @@ $windowsx64 = array(
"description"=>"XP/Vista/7/8/8.1",
"dbname" => "windows_x86_64",
"versions"=>array(
$w72x64dev,
$w72x64,
$w70x64,
)
@ -300,10 +246,8 @@ $mac = array(
"description"=>"Version 10.4.0+",
"dbname" => "x86_64-apple-darwin",
"versions"=>array(
$m72dev,
$m72,
$m70,
$m72cdev,
$m72c,
$m70c,
)
@ -326,7 +270,6 @@ $linux = array(
"description"=> linux_info(),
"dbname" => "i686-pc-linux-gnu",
"versions"=>array(
$l72ubuntudev,
$l72ubuntu,
$l70ubuntu,
)
@ -337,7 +280,6 @@ $linuxx64 = array(
"description"=> linux_info(),
"dbname" => "x86_64-pc-linux-gnu",
"versions"=>array(
$l72ubuntux64dev,
$l72ubuntux64,
$l70ubuntux64,
)

4
mac_build/BuildMacBOINC.sh
View File

@ -2,7 +2,7 @@
# This file is part of BOINC.
# http://boinc.berkeley.edu
# Copyright (C) 2010 University of California
# Copyright (C) 2014 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
@ -27,7 +27,7 @@
# Updated 7/9/12 for Xcode 4.3 and later which are not at a fixed address
# Updated 2/7/14 to also build libboinc_zip.a
#
## This script requires OS 10.6 or later
## This script requires OS 10.8 or later
#
## If you drag-install Xcode 4.3 or later, you must have opened Xcode
## and clicked the Install button on the dialog which appears to

42
mac_build/HowToBuildBOINC_XCode.rtf
View File

@ -14,7 +14,7 @@
\b0\fs24 \cf0 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc
\cf0 Written by Charlie Fenton\
Last updated 11/20/13\
Last updated 2/12/14\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640
\cf0 \
This document applies to BOINC version 7.3.0 and later. It has instructions for building the BOINC Client and Manager for Macintosh OSX. Information for building science project applications to run under BOINC on Macintosh OSX can be found {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/BuildMacApp"}}{\fldrslt here}}. \
@ -57,7 +57,7 @@ Contents of this document:\
\pard\pardeftab720\sa260
\cf0 As of version 6.13.0, BOINC does not support Macintosh PowerPC processors.\
Although BOINC supports 64-bit Intel project applications on Mac OS 10.5.0 and above, the only part of the BOINC client package built as a 64-bit executable is the screensaver coordinator for OS 10.6.x and later. The BOINC libraries also include a 64-bit build so that they can be linked with 64-bit project applications.\
You need to take certain steps to ensure that you use only APIs that are available in all the OS versions BOINC supports for each architecture. The best way to accomplish this is to use a single development system running OS 10.7.x or OS 10.8.x and cross-compile for the various platforms. The remainder of this document describes that process.\
You need to take certain steps to ensure that you use only APIs that are available in all the OS versions BOINC supports for each architecture. The best way to accomplish this is to use a single development system running OS 10.8.x or OS 10.9.x and cross-compile for the various platforms. The remainder of this document describes that process.\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
\cf0 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
@ -76,7 +76,7 @@ You need to take certain steps to ensure that you use only APIs that are availab
\f2\fs32 \
\pard\pardeftab720\sa260
\f0\b0\fs24 \cf0 Apple provides the tools necessary to cross-compile for both BOINC Mac platforms on any Mac running OS 10.7.x or OS 10.8.x.\
\f0\b0\fs24 \cf0 Apple provides the tools necessary to cross-compile for both BOINC Mac platforms on any Mac running OS 10.8.x or OS 10.9.x.\
You get these tools, including the GCC compilers and system library header files, by installing the Xcode Tools package. \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
@ -98,8 +98,10 @@ You get these tools, including the GCC compilers and system library header files
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640
\b0\fs24 \cf0 \
Note: building BOINC Manager 7.3.0 and later requires the OS 10.8 SDK or later.\
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
\cf0 BOINC depends on six third-party libraries: wxWidgets-3.0, c-ares-1.9.1, curl-7.26.0, openssl-1.0.1e, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite3.7.14.1. You can obtain the source files from the following URLs:\
\cf0 BOINC depends on six third-party libraries: wxWidgets-3.0, c-ares-1.10.0, curl-7.35.0, openssl-1.0.1f, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite-3.8.3. You can obtain the source files from the following URLs:\
\
wxWidgets-3.0 (needed only if you are building the BOINC Manager):\
{\field{\*\fldinst{HYPERLINK "http://www.wxwidgets.org"}}{\fldrslt
@ -111,40 +113,40 @@ wxWidgets-3.0 (needed only if you are building the BOINC Manager):\
\f1\fs26 \
\f0\fs24 \
sqlite3.7.14.1 (needed only if you are building the BOINC Manager):\
sqlite-3.8.3 (needed only if you are building the BOINC Manager):\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
\f1 \cf0 {\field{\*\fldinst{HYPERLINK "http://www.sqlite.org/"}}{\fldrslt
\fs26 http://www.sqlite.org/}}
\fs26 \
\fs24 {\field{\*\fldinst{HYPERLINK "http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz"}}{\fldrslt
\fs26 http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz}}
\fs24 {\field{\*\fldinst{HYPERLINK "http://www.sqlite.org/2014/sqlite-autoconf-3080300.tar.gz"}}{\fldrslt
\fs26 http://www.sqlite.org/2014/sqlite-autoconf-3080300.tar.gz}}
\fs26 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
\f0\fs24 \cf0 \
curl-7.26.0:\
curl-7.35.0:\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
\f1\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://curl.haxx.se"}}{\fldrslt http://curl.haxx.se}}\
{\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.26.0.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.26.0.tar.gz}}\
{\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.35.0.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.35.0.tar.gz}}\
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
\f0\fs24 \cf0 c-ares-1.9.1 (used by curl):\
\f0\fs24 \cf0 c-ares-1.10.0 (used by curl):\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
\f1\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://daniel.haxx.se/projects/c-ares/"}}{\fldrslt http://daniel.haxx.se/projects/c-ares/}}\
{\field{\*\fldinst{HYPERLINK "http://c-ares.haxx.se/download/c-ares-1.9.1.tar.gz"}}{\fldrslt http://c-ares.haxx.se/download/c-ares-1.9.1.tar.gz}}\
{\field{\*\fldinst{HYPERLINK "http://c-ares.haxx.se/download/c-ares-1.10.0.tar.gz"}}{\fldrslt http://c-ares.haxx.se/download/c-ares-1.10.0.tar.gz}}\
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
\f0\fs24 \cf0 openssl-1.0.1e:\
\f0\fs24 \cf0 openssl-1.0.1f:\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
\f1\fs26 \cf0 {\field{\*\fldinst{HYPERLINK "http://www.openssl.org/"}}{\fldrslt http://www.openssl.org/}}\
{\field{\*\fldinst{HYPERLINK "http://www.openssl.org/source/openssl-1.0.1e.tar.gz"}}{\fldrslt http://www.openssl.org/source/openssl-1.0.1e.tar.gz}}\
{\field{\*\fldinst{HYPERLINK "http://www.openssl.org/source/openssl-1.0.1f.tar.gz"}}{\fldrslt http://www.openssl.org/source/openssl-1.0.1f.tar.gz}}\
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
@ -180,7 +182,7 @@ MAC_OS_X_VERSION_MIN_REQUIRED=1050\
\f0\fs24 \cf0 \
\pard\pardeftab720\sa260
\cf0 These are not done automatically by either the Xcode projects which come with wxWidgets-3.0, nor the AutoMake scripts supplied with wxWidgets-3.0, c-ares-1.9.1, curl-7.26.0, openssl-1.0.1e, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite3.7.14.1. So be sure to use our special scripts to build these packages.\
\cf0 These are not done automatically by either the Xcode projects which come with wxWidgets-3.0, nor the AutoMake scripts supplied with wxWidgets-3.0, c-ares-1.10.0, curl-7.35.0, openssl-1.0.1f, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite-3.8.3. So be sure to use our special scripts to build these packages.\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640
\cf0 [1] Create a parent directory within which to work. In this description , we will call it BOINC_dev, but you can name it anything you wish.\
\
@ -188,17 +190,17 @@ MAC_OS_X_VERSION_MIN_REQUIRED=1050\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640
\f1\fs26 \cf0 c-ares-
\f0\fs24 1.9.1
\f1\fs26 \
curl-7.26.0\
\fs24 1.10.0
\fs26 \
curl-7.35.0\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
\cf0 openssl-1.0.1e\
\cf0 openssl-1.0.1f\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640
\cf0 wxWidgets-3.0\
freetype-2.4.10\
ftgl-2.1.3~rc5\
\fs24 sqlite3.7.14.1
\fs24 sqlite-3.8.3
\fs26 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640
@ -246,7 +248,7 @@ If you don't wish to force a full rebuild of everything, omit the -clean argumen
\f0\fs24 command to run them.\
\b Note 2:
\b0 this script tries to build all six third-party libraries: wxWidgets-3.0, c-ares-1.9.1, curl-7.26.0, openssl-1.0.1e, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite3.7.14.1. when the script finishes, it will display a warning about any libraries was unable to build (for example, if you have not downloaded them.)\
\b0 this script tries to build all six third-party libraries: wxWidgets-3.0, c-ares-1.10.0, curl-7.35.0, openssl-1.0.1f, freetype-2.4.10, ftgl-2.1.3~rc5 and sqlite-3.8.3. when the script finishes, it will display a warning about any libraries was unable to build (for example, if you have not downloaded them.)\
\
[5] Build BOINC as follows:\
\

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

@ -195,7 +195,6 @@
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 */; };
DD6FCB68167745E700C740DB /* libsqlite3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD6FCB67167745E700C740DB /* libsqlite3.a */; };
DD728D45175DD3B900A1CE23 /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC06AB210A3E93F00C8D9A5 /* url.cpp */; };
DD728D47175DD41B00A1CE23 /* str_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD7BF7D70B8E7A9800A009F7 /* str_util.cpp */; };
DD73E36E08A0720500656EB1 /* gui_rpc_server_ops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD73E36208A06ED400656EB1 /* gui_rpc_server_ops.cpp */; };
@ -329,6 +328,7 @@
DDA12AAE0A369C5800FBDD12 /* SecurityUtility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDA12AAD0A369C5800FBDD12 /* SecurityUtility.cpp */; };
DDA165E513B49B0D00CB4DD5 /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC06AB210A3E93F00C8D9A5 /* url.cpp */; };
DDA1F1EE126D105B005EFFEB /* current_version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDA1F1EC126D105B005EFFEB /* current_version.cpp */; };
DDA2EC1618AA592D002664B6 /* libsqlite3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA2EC1518AA592D002664B6 /* libsqlite3.a */; };
DDA45500140F7DE200D97676 /* synch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD407AED07D2FE7200163EF5 /* synch.cpp */; };
DDA45501140F7E7900D97676 /* reduce_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD40825807D3076400163EF5 /* reduce_main.cpp */; };
DDA6BD120BD4551F008F7921 /* mac_backtrace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDA6BD040BD4551F008F7921 /* mac_backtrace.cpp */; };
@ -906,7 +906,6 @@
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>"; };
DD6FCB67167745E700C740DB /* libsqlite3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsqlite3.a; path = "../../sqlite-autoconf-3071401/.libs/libsqlite3.a"; sourceTree = "<group>"; };
DD7168360AAD72040051642B /* common_defs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = common_defs.h; path = ../lib/common_defs.h; sourceTree = SOURCE_ROOT; };
DD73E34E08A0694000656EB1 /* gui_rpc_client_ops.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = gui_rpc_client_ops.cpp; sourceTree = "<group>"; };
DD73E34F08A0694100656EB1 /* gui_rpc_client_print.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = gui_rpc_client_print.cpp; sourceTree = "<group>"; };
@ -1054,6 +1053,7 @@
DDA1F1EC126D105B005EFFEB /* current_version.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = current_version.cpp; path = ../client/current_version.cpp; sourceTree = SOURCE_ROOT; };
DDA1F1ED126D105B005EFFEB /* current_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = current_version.h; path = ../client/current_version.h; sourceTree = SOURCE_ROOT; };
DDA290360CB5D80E00512BD8 /* Mac_Saver_Module.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Mac_Saver_Module.h; path = ../clientscr/Mac_Saver_Module.h; sourceTree = SOURCE_ROOT; };
DDA2EC1518AA592D002664B6 /* libsqlite3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsqlite3.a; path = "../../sqlite-autoconf-3080300/.libs/libsqlite3.a"; sourceTree = "<group>"; };
DDA45502140F85DD00D97676 /* str_replace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = str_replace.h; sourceTree = "<group>"; };
DDA6BD030BD4551F008F7921 /* dyld_gdb.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = dyld_gdb.h; path = ../lib/mac/dyld_gdb.h; sourceTree = SOURCE_ROOT; };
DDA6BD040BD4551F008F7921 /* mac_backtrace.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = mac_backtrace.cpp; path = ../lib/mac/mac_backtrace.cpp; sourceTree = SOURCE_ROOT; };
@ -1249,10 +1249,10 @@
DD3E15320A774397007E0084 /* IOKit.framework in Frameworks */,
DD3E15330A774397007E0084 /* Security.framework in Frameworks */,
DD21B49D0D750FC600AFFEE5 /* AppKit.framework in Frameworks */,
DD6FCB68167745E700C740DB /* libsqlite3.a in Frameworks */,
DD9E560A182D06A6002AF0F8 /* libwx_osx_cocoa_static.a in Frameworks */,
DD9E560F182D0D40002AF0F8 /* WebKit.framework in Frameworks */,
DD7811631851AC8D0050CF7B /* OpenGL.framework in Frameworks */,
DDA2EC1618AA592D002664B6 /* libsqlite3.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1469,13 +1469,13 @@
isa = PBXGroup;
children = (
DDE36DF517C3896A000E78D6 /* libwx_osx_cocoa_static.a */,
DDA2EC1518AA592D002664B6 /* libsqlite3.a */,
DDFE854A0B60CFD0009B43D9 /* AppKit.framework */,
DDE2552B07C62F3E008E7D6E /* IOKit.framework */,
20286C33FDCF999611CA2CEA /* Carbon.framework */,
DD7C5E7508110AE3002FCE1E /* ScreenSaver.framework */,
DD1929D80918A2F100C31BCF /* Security.framework */,
DD9E560E182D0D40002AF0F8 /* WebKit.framework */,
DD6FCB67167745E700C740DB /* libsqlite3.a */,
DD89165D0F3B1BC200DE5B1C /* GLUT.framework */,
DD89165E0F3B1BC200DE5B1C /* OpenGL.framework */,
);
@ -3545,7 +3545,8 @@
LIBRARY_SEARCH_PATHS = (
"../../wxWidgets-3.0.0/build/osx/build/Debug",
"\"$(SRCROOT)/../../wxWidgets-3.0.0/build/osx/build/Debug\"",
"../../sqlite-autoconf-3071401/.libs/",
"../../sqlite-autoconf-3080300/.libs/",
"\"$(SRCROOT)/../../sqlite-autoconf-3080300/.libs\"",
);
MACOSX_DEPLOYMENT_TARGET = 10.5;
OTHER_CFLAGS = (
@ -3601,7 +3602,8 @@
LIBRARY_SEARCH_PATHS = (
"../../wxWidgets-3.0.0/build/osx/build/Release",
"\"$(SRCROOT)/../../wxWidgets-3.0.0/build/osx/build/Release\"",
"../../sqlite-autoconf-3071401/.libs/",
"../../sqlite-autoconf-3080300/.libs/",
"\"$(SRCROOT)/../../sqlite-autoconf-3080300/.libs\"",
);
MACOSX_DEPLOYMENT_TARGET = 10.5;
OTHER_CFLAGS = (
@ -3744,14 +3746,6 @@
"-lbz2",
);
PRODUCT_NAME = boincscr;
WARNING_LDFLAGS = (
"-lresolv",
"-ljpeg",
"../../freetype-2.4.10/objs/.libs/libfreetype.a",
"../../ftgl-2.1.3~rc5/src/.libs/libftgl.a",
"-lz",
"-lbz2",
);
};
name = Development;
};
@ -3777,14 +3771,6 @@
"-lbz2",
);
PRODUCT_NAME = boincscr;
WARNING_LDFLAGS = (
"-lresolv",
"-ljpeg",
"../../freetype-2.4.10/objs/.libs/libfreetype.a",
"../../ftgl-2.1.3~rc5/src/.libs/libftgl.a",
"-lz",
"-lbz2",
);
};
name = Deployment;
};
@ -3896,10 +3882,10 @@
);
OTHER_LDFLAGS = (
"-L.",
"../../curl-7.26.0/lib/.libs/libcurl.a",
"../../c-ares-1.9.1/.libs/libcares.a",
"../../openssl-1.0.1e/libcrypto.a",
"../../openssl-1.0.1e/libssl.a",
"../../curl-7.35.0/lib/.libs/libcurl.a",
"../../c-ares-1.10.0/.libs/libcares.a",
"../../openssl-1.0.1f/libcrypto.a",
"../../openssl-1.0.1f/libssl.a",
"-lldap",
"-lz",
);
@ -4062,10 +4048,10 @@
LIBRARY_SEARCH_PATHS = "";
OTHER_LDFLAGS = (
"-L.",
"../../curl-7.26.0/lib/.libs/libcurl.a",
"../../c-ares-1.9.1/.libs/libcares.a",
"../../openssl-1.0.1e/libcrypto.a",
"../../openssl-1.0.1e/libssl.a",
"../../curl-7.35.0/lib/.libs/libcurl.a",
"../../c-ares-1.10.0/.libs/libcares.a",
"../../openssl-1.0.1f/libcrypto.a",
"../../openssl-1.0.1f/libssl.a",
"-lldap",
"-lz",
);

17
mac_build/buildc-ares.sh
View File

@ -2,7 +2,7 @@
# This file is part of BOINC.
# http://boinc.berkeley.edu
# Copyright (C) 2008 University of California
# Copyright (C) 2014 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
@ -18,13 +18,14 @@
# along with BOINC. If not, see <http://www.gnu.org/licenses/>.
#
#
# Script to build Macintosh 32-bit Intel library of c-ares-1.9.1 for
# Script to build Macintosh 32-bit Intel library of c-ares-1.10.0 for
# use in building BOINC.
#
# by Charlie Fenton 7/21/06
# Updated 10/18/11 for OS 10.7 Lion and XCode 4.2
# Updated 6/25/12 for c-ares 1.9.1
# Updated 7/10/12 for Xcode 4.3 and later which are not at a fixed address
# Updated 2/11/14 for c-ares 1.10.0
#
## This script requires OS 10.6 or later
#
@ -32,8 +33,8 @@
## and clicked the Install button on the dialog which appears to
## complete the Xcode installation before running this script.
#
## In Terminal, CD to the c-ares-1.9.1 directory.
## cd [path]/c-ares-1.9.1/
## In Terminal, CD to the c-ares-1.10.0 directory.
## cd [path]/c-ares-1.10.0/
## then run this script:
## source [path]/buildc-ares.sh [ -clean ]
##
@ -42,7 +43,7 @@
if [ "$1" != "-clean" ]; then
if [ -f .libs/libcares.a ]; then
echo "c-ares-1.9.1 already built"
echo "c-ares-1.10.0 already built"
return 0
fi
fi
@ -85,10 +86,12 @@ if [ $? -ne 0 ]; then return 1; fi
export CC="${GCCPATH}";export CXX="${GPPPATH}"
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,i386"
export CPPFLAGS="-isysroot ${SDKPATH} -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1040 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
export CFLAGS="-isysroot ${SDKPATH} -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1040 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
export CPPFLAGS="-isysroot ${SDKPATH} -arch i386"
export CFLAGS="-isysroot ${SDKPATH} -arch i386"
export SDKROOT="${SDKPATH}"
export MACOSX_DEPLOYMENT_TARGET=10.4
export MAC_OS_X_VERSION_MAX_ALLOWED=1040
export MAC_OS_X_VERSION_MIN_REQUIRED=1040
./configure --enable-shared=NO prefix=/tmp/installed-c-ares --host=i386
if [ $? -ne 0 ]; then return 1; fi

21
mac_build/buildcurl.sh
View File

@ -2,7 +2,7 @@
# This file is part of BOINC.
# http://boinc.berkeley.edu
# Copyright (C) 2008 University of California
# Copyright (C) 2014 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
@ -18,13 +18,14 @@
# along with BOINC. If not, see <http://www.gnu.org/licenses/>.
#
#
# Script to build Macintosh 32-bit Intel library of curl-7.26.0 for
# Script to build Macintosh 32-bit Intel library of curl-7.35.0 for
# use in building BOINC.
#
# by Charlie Fenton 7/21/06
# Updated 12/3/09 for OS 10.7 Lion and XCode 4.2
# Updated 6/25/12 for curl 7.26.0
# Updated 7/10/12 for Xcode 4.3 and later which are not at a fixed address
# Updated 2/11/14 for curl 7.35.0 with c-ares 1.10.0
#
## This script requires OS 10.6 or later
## This script requires OS 10.6 or later
@ -33,8 +34,8 @@
## and clicked the Install button on the dialog which appears to
## complete the Xcode installation before running this script.
#
## In Terminal, CD to the curl-7.26.0 directory.
## cd [path]/curl-7.26.0/
## In Terminal, CD to the curl-7.35.0 directory.
## cd [path]/curl-7.35.0/
## then run this script:
## source [path]/buildcurl.sh [ -clean ]
##
@ -43,7 +44,7 @@
if [ "$1" != "-clean" ]; then
if [ -f lib/.libs/libcurl.a ]; then
echo "curl-7.26.0 already built"
echo "curl-7.35.0 already built"
return 0
fi
fi
@ -83,9 +84,9 @@ export PATH="${TOOLSPATH1}":"${TOOLSPATH2}":/usr/local/bin:$PATH
SDKPATH=`xcodebuild -version -sdk macosx Path`
CURL_DIR=`pwd`
# curl configure and make expect a path to _installed_ c-ares-1.9.1
# curl configure and make expect a path to _installed_ c-ares-1.10.0
# so temporarily install c-ares at a path that does not contain spaces.
cd ../c-ares-1.9.1
cd ../c-ares-1.10.0
make install
cd "${CURL_DIR}"
@ -97,10 +98,12 @@ if [ $? -ne 0 ]; then return 1; fi
export PATH=/usr/local/bin:$PATH
export CC="${GCCPATH}";export CXX="${GPPPATH}"
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,i386"
export CPPFLAGS="-isysroot ${SDKPATH} -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1040 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
export CFLAGS="-isysroot ${SDKPATH} -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1040 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
export CPPFLAGS="-isysroot ${SDKPATH} -arch i386"
export CFLAGS="-isysroot ${SDKPATH} -arch i386"
export SDKROOT="${SDKPATH}"
export MACOSX_DEPLOYMENT_TARGET=10.4
export MAC_OS_X_VERSION_MAX_ALLOWED=1040
export MAC_OS_X_VERSION_MIN_REQUIRED=1040
./configure --enable-shared=NO --enable-ares=/tmp/installed-c-ares --host=i386
if [ $? -ne 0 ]; then return 1; fi

11
mac_build/buildopenssl.sh
View File

@ -2,7 +2,7 @@
# This file is part of BOINC.
# http://boinc.berkeley.edu
# Copyright (C) 2008 University of California
# Copyright (C) 2014 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
@ -24,6 +24,7 @@
# by Charlie Fenton 6/25/12
# Updated 7/10/12 for Xcode 4.3 and later which are not at a fixed address
# Updated 7/30/13 for openssl-1.0.1e
# Updated 2/12/14 for openssl-1.0.1f
#
## This script requires OS 10.6 or later
#
@ -31,8 +32,8 @@
## and clicked the Install button on the dialog which appears to
## complete the Xcode installation before running this script.
#
## In Terminal, CD to the openssl-1.0.1e directory.
## cd [path]/openssl-1.0.1e/
## In Terminal, CD to the openssl-1.0.1f directory.
## cd [path]/openssl-1.0.1f/
## then run this script:
## source [path]/buildopenssl.sh [ -clean ]
##
@ -41,7 +42,7 @@
if [ "$1" != "-clean" ]; then
if [ -f libssl.a ]&& [ -f libcrypto.a ]; then
echo "openssl-1.0.1e libraries already built"
echo "openssl-1.0.1f libraries already built"
return 0
fi
fi
@ -100,7 +101,7 @@ if [ "$1" = "-clean" ]; then
make clean
fi
make
make build_crypto build_ssl build_engines
if [ $? -ne 0 ]; then return 1; fi
export CC="";export CXX=""

11
mac_build/buildsqlite3.sh
View File

@ -2,7 +2,7 @@
# This file is part of BOINC.
# http://boinc.berkeley.edu
# Copyright (C) 2008 University of California
# Copyright (C) 2014 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
@ -18,10 +18,11 @@
# along with BOINC. If not, see <http://www.gnu.org/licenses/>.
#
#
# Script to build Macintosh 32-bit Intel library of sqlite3.7.14.1 for
# Script to build Macintosh 32-bit Intel library of sqlite 3.8.3 for
# use in building BOINC Manager.
#
# by Charlie Fenton 12/11/12
# Updated 2/11/14 for sqlite 3.8.3
#
## This script requires OS 10.6 or later
#
@ -29,8 +30,8 @@
## and clicked the Install button on the dialog which appears to
## complete the Xcode installation before running this script.
#
## In Terminal, CD to the sqlite-autoconf-3071401 directory.
## cd [path]/sqlite-autoconf-3071401/
## In Terminal, CD to the sqlite-autoconf-3080300 directory.
## cd [path]/sqlite-autoconf-3080300/
## then run this script:
## source [path]/buildsqlite3.sh [ -clean ]
##
@ -39,7 +40,7 @@
if [ "$1" != "-clean" ]; then
if [ -f .libs/libsqlite3.a ]; then
echo "sqlite-3.7.14.1 already built"
echo "sqlite-3.8.3 already built"
return 0
fi
fi

43
mac_build/setupForBOINC.sh
View File

@ -2,7 +2,7 @@
# This file is part of BOINC.
# http://boinc.berkeley.edu
# Copyright (C) 2008 University of California
# Copyright (C) 2014 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
@ -31,6 +31,7 @@
# Updated 12/11/12 for sqlite3.7.14.1 from sqlite-autoconf-3071401
# Updated 11/30/13 for openssl-1.0.1e
# Updated 2/7/14 for wxWidgets-3.0.0
# Updated 2/11/14 for c-ares 1.10.0, curl 7.35.0, openssl 1.0.1f, sqlite 3.8.3
#
# Download these seven packages and place them in a common parent
# directory with the BOINC source tree.
@ -64,11 +65,11 @@ SCRIPT_DIR=`pwd`
echo ""
echo "----------------------------------"
echo "------- BUILD C-ARES-1.9.1 -------"
echo "------- BUILD C-ARES-1.10.0 ------"
echo "----------------------------------"
echo ""
cd ../../c-ares-1.9.1/
cd ../../c-ares-1.10.0/
if [ $? -eq 0 ]; then
source "${SCRIPT_DIR}/buildc-ares.sh" ${cleanit}
if [ $? -eq 0 ]; then
@ -78,13 +79,13 @@ fi
echo ""
echo "----------------------------------"
echo "------- BUILD CURL-7.26.0 --------"
echo "------- BUILD CURL-7.35.0 --------"
echo "----------------------------------"
echo ""
cd "${SCRIPT_DIR}"
cd ../../curl-7.26.0/
cd ../../curl-7.35.0/
if [ $? -eq 0 ]; then
source "${SCRIPT_DIR}/buildcurl.sh" ${cleanit}
if [ $? -eq 0 ]; then
@ -94,13 +95,13 @@ fi
echo ""
echo "----------------------------------"
echo "----- BUILD OPENSSL-1.0.1e -------"
echo "----- BUILD OPENSSL-1.0.1f -------"
echo "----------------------------------"
echo ""
cd "${SCRIPT_DIR}"
cd ../../openssl-1.0.1e/
cd ../../openssl-1.0.1f/
if [ $? -eq 0 ]; then
source "${SCRIPT_DIR}/buildopenssl.sh" ${cleanit}
if [ $? -eq 0 ]; then
@ -126,13 +127,13 @@ fi
echo ""
echo "----------------------------------"
echo "------ BUILD sqlite-3.7.14.1 ------"
echo "------- BUILD sqlite-3.8.3 -------"
echo "----------------------------------"
echo ""
cd "${SCRIPT_DIR}"
cd ../../sqlite-autoconf-3071401/
cd ../../sqlite-autoconf-3080300/
if [ $? -eq 0 ]; then
source "${SCRIPT_DIR}/buildsqlite3.sh" ${cleanit}
if [ $? -eq 0 ]; then
@ -174,11 +175,11 @@ fi
if [ "${caresOK}" = "NO" ]; then
echo ""
echo "----------------------------------"
echo "------------ WARNING -------------"
echo "------------ -------------"
echo "-- COULD NOT BUILD C-ARES-1.9.1 --"
echo "----------------------------------"
echo "-----------------------------------"
echo "------------ WARNING --------------"
echo "------------ --------------"
echo "-- COULD NOT BUILD C-ARES-1.10.0 --"
echo "-----------------------------------"
echo ""
fi
@ -187,7 +188,7 @@ if [ "${curlOK}" = "NO" ]; then
echo "-----------------------------------"
echo "------------ WARNING --------------"
echo "------------ --------------"
echo "--- COULD NOT BUILD CURL-7.26.0 ---"
echo "--- COULD NOT BUILD CURL-7.35.0 ---"
echo "-----------------------------------"
echo ""
fi
@ -197,7 +198,7 @@ if [ "${opensslOK}" = "NO" ]; then
echo "----------------------------------"
echo "------------ WARNING -------------"
echo "------------ -------------"
echo "- COULD NOT BUILD OPENSSL-1.0.1e -"
echo "- COULD NOT BUILD OPENSSL-1.0.1f -"
echo "----------------------------------"
echo ""
fi
@ -214,11 +215,11 @@ fi
if [ "${sqlite3OK}" = "NO" ]; then
echo ""
echo "-----------------------------------"
echo "------------ WARNING --------------"
echo "------------ --------------"
echo "- COULD NOT BUILD sqlite-3.7.14.1 -"
echo "-----------------------------------"
echo "----------------------------------"
echo "------------ WARNING -------------"
echo "------------ -------------"
echo "-- COULD NOT BUILD sqlite-3.8.3 --"
echo "----------------------------------"
echo ""
fi

8
version.h
View File

@ -10,10 +10,10 @@
#define BOINC_MINOR_VERSION 3
/* Release part of BOINC version number */
#define BOINC_RELEASE 1
#define BOINC_RELEASE 2
/* String representation of BOINC version number */
#define BOINC_VERSION_STRING "7.3.1"
#define BOINC_VERSION_STRING "7.3.2"
/* Package is a pre-release (Alpha/Beta) package */
#define BOINC_PRERELEASE 1
@ -29,13 +29,13 @@
#define PACKAGE_NAME "BOINC"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "BOINC 7.3.1"
#define PACKAGE_STRING "BOINC 7.3.2"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "boinc"
/* Define to the version of this package. */
#define PACKAGE_VERSION "7.3.1"
#define PACKAGE_VERSION "7.3.2"
#endif /* #if (defined(_WIN32) || defined(__APPLE__)) */

12
win_build/installerv2/BOINC.ism
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?xml-stylesheet type="text/xsl" href="is.xsl" ?>
<!DOCTYPE msi [
<!ELEMENT msi (summary,table*)>
@ -271,7 +271,7 @@
<row><td>NewBinary3</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\Up.ibd</td></row>
<row><td>NewBinary4</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\WarningIcon.ibd</td></row>
<row><td>NewBinary5</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\IsDialogBitmap.ibd</td></row>
<row><td>NewBinary6</td><td/><td>NewBinary6</td></row>
<row><td>NewBinary6</td><td/><td>&lt;ISProjectFolder&gt;\redist\windows\Win32\boinccas.dll</td></row>
<row><td>NewBinary7</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\ReinstIco.ibd</td></row>
<row><td>NewBinary8</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\RemoveIco.ibd</td></row>
<row><td>NewBinary9</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\SetupIcon.ibd</td></row>
@ -352,7 +352,7 @@
<row><td>_BOINCData</td><td>{4E793828-A468-4366-892F-FC2F36EC99D9}</td><td>DATADIR</td><td>16</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDataProjects</td><td>{9C720438-35E8-4377-A105-AF3675664094}</td><td>PROJECTS</td><td>16</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDataSlots</td><td>{C9FE7A6E-2470-4666-949B-4DB2BB936E5F}</td><td>SLOTS</td><td>16</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDepends</td><td>{69AF1C45-9D67-4F33-B97B-5DA096D77908}</td><td>INSTALLDIR</td><td>0</td><td/><td>msvcr80.dll</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDepends</td><td>{69AF1C45-9D67-4F33-B97B-5DA096D77908}</td><td>INSTALLDIR</td><td>0</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCManager</td><td>{7EBB5E76-86BA-4EBA-98AA-DD908C215D72}</td><td>INSTALLDIR</td><td>0</td><td/><td>boincmgr.exe</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCManagerGlobalization</td><td>{F92B6595-2E79-45F0-BF41-4EDB52645FFC}</td><td>LOCALE</td><td>0</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCManagerSkin</td><td>{AD6F1C10-1DF7-4EDE-8ED8-18A9BA07CECA}</td><td>DEFAULT</td><td>0</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
@ -2467,7 +2467,7 @@
<row><td>WEBx86</td><td>ProductCode</td><td/></row>
<row><td>WEBx86</td><td>ProductName</td><td/></row>
<row><td>WEBx86</td><td>ProductVersion</td><td/></row>
<row><td>WEBx86</td><td>SetupFileName</td><td>boinc_7.2.4_windows_intelx86</td></row>
<row><td>WEBx86</td><td>SetupFileName</td><td>boinc_7.3.2_windows_intelx86</td></row>
<row><td>WEBx86</td><td>UpgradeCode</td><td/></row>
</table>
@ -4575,11 +4575,11 @@ VwBlAGIAAQBXAEUAQgB4ADgANgA=
<row><td>PROGMSG_IIS_ROLLBACKAPPPOOLS</td><td>##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS##</td><td/></row>
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
<row><td>PROGRAMFILETOLAUNCHATEND</td><td>[#boincmgr.exe]</td><td/></row>
<row><td>ProductCode</td><td>{65A7FA5C-6850-4CC6-B6D7-CBAC659B4E7E}</td><td/></row>
<row><td>ProductCode</td><td>{A93B3E06-4B66-4E7E-9290-BF89900D44F7}</td><td/></row>
<row><td>ProductID</td><td>none</td><td/></row>
<row><td>ProductLanguage</td><td>1033</td><td/></row>
<row><td>ProductName</td><td>BOINC</td><td/></row>
<row><td>ProductVersion</td><td>7.2.4</td><td/></row>
<row><td>ProductVersion</td><td>7.3.2</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>

12
win_build/installerv2/BOINC_vbox.ism
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?xml-stylesheet type="text/xsl" href="is.xsl" ?>
<!DOCTYPE msi [
<!ELEMENT msi (summary,table*)>
@ -271,7 +271,7 @@
<row><td>NewBinary3</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\Up.ibd</td></row>
<row><td>NewBinary4</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\WarningIcon.ibd</td></row>
<row><td>NewBinary5</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\IsDialogBitmap.ibd</td></row>
<row><td>NewBinary6</td><td/><td>NewBinary6</td></row>
<row><td>NewBinary6</td><td/><td>&lt;ISProjectFolder&gt;\redist\windows\Win32\boinccas.dll</td></row>
<row><td>NewBinary7</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\ReinstIco.ibd</td></row>
<row><td>NewBinary8</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\RemoveIco.ibd</td></row>
<row><td>NewBinary9</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\SetupIcon.ibd</td></row>
@ -352,7 +352,7 @@
<row><td>_BOINCData</td><td>{4E793828-A468-4366-892F-FC2F36EC99D9}</td><td>DATADIR</td><td>16</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDataProjects</td><td>{9C720438-35E8-4377-A105-AF3675664094}</td><td>PROJECTS</td><td>16</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDataSlots</td><td>{C9FE7A6E-2470-4666-949B-4DB2BB936E5F}</td><td>SLOTS</td><td>16</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDepends</td><td>{69AF1C45-9D67-4F33-B97B-5DA096D77908}</td><td>INSTALLDIR</td><td>0</td><td/><td>msvcr80.dll</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDepends</td><td>{69AF1C45-9D67-4F33-B97B-5DA096D77908}</td><td>INSTALLDIR</td><td>0</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCManager</td><td>{7EBB5E76-86BA-4EBA-98AA-DD908C215D72}</td><td>INSTALLDIR</td><td>0</td><td/><td>boincmgr.exe</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCManagerGlobalization</td><td>{F92B6595-2E79-45F0-BF41-4EDB52645FFC}</td><td>LOCALE</td><td>0</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCManagerSkin</td><td>{AD6F1C10-1DF7-4EDE-8ED8-18A9BA07CECA}</td><td>DEFAULT</td><td>0</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
@ -2467,7 +2467,7 @@
<row><td>WEBx86</td><td>ProductCode</td><td/></row>
<row><td>WEBx86</td><td>ProductName</td><td/></row>
<row><td>WEBx86</td><td>ProductVersion</td><td/></row>
<row><td>WEBx86</td><td>SetupFileName</td><td>boinc_7.2.4_windows_intelx86</td></row>
<row><td>WEBx86</td><td>SetupFileName</td><td>boinc_7.3.2_windows_intelx86_vbox</td></row>
<row><td>WEBx86</td><td>UpgradeCode</td><td/></row>
</table>
@ -4576,11 +4576,11 @@ VwBlAGIAAQBXAEUAQgB4ADgANgA=
<row><td>PROGMSG_IIS_ROLLBACKAPPPOOLS</td><td>##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS##</td><td/></row>
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
<row><td>PROGRAMFILETOLAUNCHATEND</td><td>[#boincmgr.exe]</td><td/></row>
<row><td>ProductCode</td><td>{65A7FA5C-6850-4CC6-B6D7-CBAC659B4E7E}</td><td/></row>
<row><td>ProductCode</td><td>{2C419967-6B58-4DF5-A508-8F924F7E8739}</td><td/></row>
<row><td>ProductID</td><td>none</td><td/></row>
<row><td>ProductLanguage</td><td>1033</td><td/></row>
<row><td>ProductName</td><td>BOINC</td><td/></row>
<row><td>ProductVersion</td><td>7.2.4</td><td/></row>
<row><td>ProductVersion</td><td>7.3.2</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>

10
win_build/installerv2/BOINCx64.ism
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?xml-stylesheet type="text/xsl" href="is.xsl" ?>
<!DOCTYPE msi [
<!ELEMENT msi (summary,table*)>
@ -352,7 +352,7 @@
<row><td>_BOINCData</td><td>{4E793828-A468-4366-892F-FC2F36EC99D9}</td><td>DATADIR</td><td>272</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDataProjects</td><td>{9C720438-35E8-4377-A105-AF3675664094}</td><td>PROJECTS</td><td>272</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDataSlots</td><td>{C9FE7A6E-2470-4666-949B-4DB2BB936E5F}</td><td>SLOTS</td><td>272</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDepends</td><td>{69AF1C45-9D67-4F33-B97B-5DA096D77908}</td><td>INSTALLDIR</td><td>256</td><td/><td>msvcr80.dll</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDepends</td><td>{69AF1C45-9D67-4F33-B97B-5DA096D77908}</td><td>INSTALLDIR</td><td>256</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCManager</td><td>{7EBB5E76-86BA-4EBA-98AA-DD908C215D72}</td><td>INSTALLDIR</td><td>256</td><td/><td>boincmgr.exe</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCManagerGlobalization</td><td>{F92B6595-2E79-45F0-BF41-4EDB52645FFC}</td><td>LOCALE</td><td>256</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCManagerSkin</td><td>{73A92885-CE76-42CE-916B-1B52DAADD11C}</td><td>DEFAULT</td><td>256</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
@ -2467,7 +2467,7 @@
<row><td>WEBx64</td><td>ProductCode</td><td/></row>
<row><td>WEBx64</td><td>ProductName</td><td/></row>
<row><td>WEBx64</td><td>ProductVersion</td><td/></row>
<row><td>WEBx64</td><td>SetupFileName</td><td>boinc_7.2.4_windows_x86_64</td></row>
<row><td>WEBx64</td><td>SetupFileName</td><td>boinc_7.3.2_windows_x86_64</td></row>
<row><td>WEBx64</td><td>UpgradeCode</td><td/></row>
</table>
@ -4574,11 +4574,11 @@ VwBlAGIAAQBXAEUAQgB4ADYANAA=
<row><td>PROGMSG_IIS_ROLLBACKAPPPOOLS</td><td>##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS##</td><td/></row>
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
<row><td>PROGRAMFILETOLAUNCHATEND</td><td>[#boincmgr.exe]</td><td/></row>
<row><td>ProductCode</td><td>{B71752EB-7921-40D2-B349-5782916C39CB}</td><td/></row>
<row><td>ProductCode</td><td>{903ECB00-E65A-4AA0-BE89-72F3B638A09A}</td><td/></row>
<row><td>ProductID</td><td>none</td><td/></row>
<row><td>ProductLanguage</td><td>1033</td><td/></row>
<row><td>ProductName</td><td>BOINC</td><td/></row>
<row><td>ProductVersion</td><td>7.2.4</td><td/></row>
<row><td>ProductVersion</td><td>7.3.2</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>

10
win_build/installerv2/BOINCx64_vbox.ism
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?xml-stylesheet type="text/xsl" href="is.xsl" ?>
<!DOCTYPE msi [
<!ELEMENT msi (summary,table*)>
@ -352,7 +352,7 @@
<row><td>_BOINCData</td><td>{4E793828-A468-4366-892F-FC2F36EC99D9}</td><td>DATADIR</td><td>272</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDataProjects</td><td>{9C720438-35E8-4377-A105-AF3675664094}</td><td>PROJECTS</td><td>272</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDataSlots</td><td>{C9FE7A6E-2470-4666-949B-4DB2BB936E5F}</td><td>SLOTS</td><td>272</td><td/><td/><td>145</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDepends</td><td>{69AF1C45-9D67-4F33-B97B-5DA096D77908}</td><td>INSTALLDIR</td><td>256</td><td/><td>msvcr80.dll</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCDepends</td><td>{69AF1C45-9D67-4F33-B97B-5DA096D77908}</td><td>INSTALLDIR</td><td>256</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCManager</td><td>{7EBB5E76-86BA-4EBA-98AA-DD908C215D72}</td><td>INSTALLDIR</td><td>256</td><td/><td>boincmgr.exe</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCManagerGlobalization</td><td>{F92B6595-2E79-45F0-BF41-4EDB52645FFC}</td><td>LOCALE</td><td>256</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>_BOINCManagerSkin</td><td>{73A92885-CE76-42CE-916B-1B52DAADD11C}</td><td>DEFAULT</td><td>256</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
@ -2467,7 +2467,7 @@
<row><td>WEBx64</td><td>ProductCode</td><td/></row>
<row><td>WEBx64</td><td>ProductName</td><td/></row>
<row><td>WEBx64</td><td>ProductVersion</td><td/></row>
<row><td>WEBx64</td><td>SetupFileName</td><td>boinc_7.2.4_windows_x86_64</td></row>
<row><td>WEBx64</td><td>SetupFileName</td><td>boinc_7.3.2_windows_x86_64_vbox</td></row>
<row><td>WEBx64</td><td>UpgradeCode</td><td/></row>
</table>
@ -4575,11 +4575,11 @@ VwBlAGIAAQBXAEUAQgB4ADYANAA=
<row><td>PROGMSG_IIS_ROLLBACKAPPPOOLS</td><td>##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS##</td><td/></row>
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
<row><td>PROGRAMFILETOLAUNCHATEND</td><td>[#boincmgr.exe]</td><td/></row>
<row><td>ProductCode</td><td>{B71752EB-7921-40D2-B349-5782916C39CB}</td><td/></row>
<row><td>ProductCode</td><td>{8D7B37E8-8B61-4404-9563-B16EA7CAA561}</td><td/></row>
<row><td>ProductID</td><td>none</td><td/></row>
<row><td>ProductLanguage</td><td>1033</td><td/></row>
<row><td>ProductName</td><td>BOINC</td><td/></row>
<row><td>ProductVersion</td><td>7.2.4</td><td/></row>
<row><td>ProductVersion</td><td>7.3.2</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>