diff --git a/html/languages/translations/hu.po b/html/languages/translations/hu.po index 28bdd28194..588466be51 100644 --- a/html/languages/translations/hu.po +++ b/html/languages/translations/hu.po @@ -7089,7 +7089,7 @@ msgstr "(minden alkalmazás)" #~ msgid "- private message" #~ msgstr "- privát üzenet" -# ####################################### +# ####################################### # Private messages #~ msgid "Private message from" #~ msgstr "Személyes üzenet tőle:" diff --git a/locale/hu/BOINC-Project-Generic.po b/locale/hu/BOINC-Project-Generic.po index 28bdd28194..588466be51 100644 --- a/locale/hu/BOINC-Project-Generic.po +++ b/locale/hu/BOINC-Project-Generic.po @@ -7089,7 +7089,7 @@ msgstr "(minden alkalmazás)" #~ msgid "- private message" #~ msgstr "- privát üzenet" -# ####################################### +# ####################################### # Private messages #~ msgid "Private message from" #~ msgstr "Személyes üzenet tőle:" diff --git a/locale/hu/BOINC-Web.po b/locale/hu/BOINC-Web.po index 6a168f536c..813f87c495 100644 --- a/locale/hu/BOINC-Web.po +++ b/locale/hu/BOINC-Web.po @@ -1530,21 +1530,21 @@ msgstr "" #~ msgid "Advanced" #~ msgstr "Haladó" -# The charset used for the text in this file (please try to use UTF-8 if possible) +# The charset used for the text in this file (please try to use UTF-8 if possible) #~ msgid "CHARSET" #~ msgstr "UTF-8" -# The name of this language in this language +# The name of this language in this language #~ msgid "LANG_NAME_NATIVE" #~ msgstr "English" -# The name of this language in an international language (English) +# The name of this language in an international language (English) #~ msgid "LANG_NAME_INTERNATIONAL" #~ msgstr "English" -# ####################################### -# poll-related stuff -# ####################################### +# ####################################### +# poll-related stuff +# ####################################### # ####################################### # poll-related stuff #~ msgid "POLL_TITLE" @@ -1841,9 +1841,9 @@ msgstr "" #~ "institutions). The server is chosen randomly - if a download fails, " #~ "reload this page and try again. " -# ############################################# -# help.php -# ############################################# +# ############################################# +# help.php +# ############################################# #~ msgid "HELP_TITLE" #~ msgstr "Getting help with BOINC" @@ -1908,9 +1908,9 @@ msgstr "" #~ "If you're already a Help Volunteer: to edit your settings, %sclick here" #~ "%s. " -# ############################################# -# index.php -# ############################################# +# ############################################# +# index.php +# ############################################# #~ msgid "HOME_HEADING1" #~ msgstr "Volunteer" diff --git a/locale/it_IT/BOINC-Project-Generic.po b/locale/it_IT/BOINC-Project-Generic.po index bc984e8a33..8b2bb94250 100644 --- a/locale/it_IT/BOINC-Project-Generic.po +++ b/locale/it_IT/BOINC-Project-Generic.po @@ -7192,7 +7192,7 @@ msgstr "(tutte le applicazioni)" #~ msgid "User names starting with" #~ msgstr "I nomi utente iniziano con" -# ########################################<br />
+# ########################################<br />
# "Weak account key" page (weak_auth.php) #~ msgid "" #~ "Your 'weak account key' lets you link a computer to your account without " diff --git a/locale/sv_SE/BOINC-Web.po b/locale/sv_SE/BOINC-Web.po index 0718ecb1aa..1d233a74d5 100644 --- a/locale/sv_SE/BOINC-Web.po +++ b/locale/sv_SE/BOINC-Web.po @@ -921,21 +921,21 @@ msgstr "" #~ msgid "The Lattice Project" #~ msgstr "BOINC-projektet" -# The charset used for the text in this file (please try to use UTF-8 if possible) +# The charset used for the text in this file (please try to use UTF-8 if possible) #~ msgid "CHARSET" #~ msgstr "UTF-8" -# The name of this language in this language +# The name of this language in this language #~ msgid "LANG_NAME_NATIVE" #~ msgstr "English" -# The name of this language in an international language (English) +# The name of this language in an international language (English) #~ msgid "LANG_NAME_INTERNATIONAL" #~ msgstr "English" -# ####################################### -# poll-related stuff -# ####################################### +# ####################################### +# poll-related stuff +# ####################################### # poll-related stuff # ####################################### #~ msgid "POLL_TITLE" @@ -1232,9 +1232,9 @@ msgstr "" #~ "institutions). The server is chosen randomly - if a download fails, " #~ "reload this page and try again. " -# ############################################# -# help.php -# ############################################# +# ############################################# +# help.php +# ############################################# #~ msgid "HELP_TITLE" #~ msgstr "Getting help with BOINC" @@ -1299,9 +1299,9 @@ msgstr "" #~ "If you're already a Help Volunteer: to edit your settings, %sclick here" #~ "%s. " -# ############################################# -# index.php -# ############################################# +# ############################################# +# index.php +# ############################################# #~ msgid "HOME_HEADING1" #~ msgstr "Volunteer" diff --git a/mac_installer/CE-ReadMe.rtf b/mac_installer/CE-ReadMe.rtf index 6c0ad85d32..b6177ad26f 100644 --- a/mac_installer/CE-ReadMe.rtf +++ b/mac_installer/CE-ReadMe.rtf @@ -1,6 +1,6 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510 -{\fonttbl\f0\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;} +{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210 +\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red56\green110\blue255;} \margl1440\margr1440\vieww9000\viewh9000\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc @@ -23,7 +23,7 @@ For more options, please see the BOINC Macintosh administrator tools at:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/wiki/Tools_for_Mac_OS_X"}}{\fldrslt \cf0 http://boinc.berkeley.edu/wiki/Tools_for_Mac_OS_X}}\ \ -Charity Engine Desktop on the Mac now supports processing with your graphics card, or GPU. Please see {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/gpu.php"}}{\fldrslt http://boinc.berkeley.edu/gpu.php}} for more information. If you have a CUDA-capable NVIDIA GPU and you wish to run CUDA applications, you will need to download and install the CUDA driver and libraries for your system from {\field{\*\fldinst{HYPERLINK "http://www.nvidia.com/object/mac-driver-archive.html"}}{\fldrslt http://www.nvidia.com/object/mac-driver-archive.html}}. Charity Engine Desktop also supports openCL applications on NVIDIA and ATI / AMD graphics processors. OpenCL support is standard as part of Mac OS 10.6 and later.\ +Charity Engine Desktop on the Mac now supports processing with your graphics card, or GPU. Please see {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/wiki/GPU_computing"}}{\fldrslt \cf2 \ul \ulc2 http://boinc.berkeley.edu/wiki/GPU_computing}} for more information. If you have a CUDA-capable NVIDIA GPU and you wish to run CUDA applications, you will need to download and install the CUDA driver and libraries for your system from {\field{\*\fldinst{HYPERLINK "http://www.nvidia.com/object/mac-driver-archive.html"}}{\fldrslt http://www.nvidia.com/object/mac-driver-archive.html}}. Charity Engine Desktop also supports openCL applications on NVIDIA and ATI / AMD graphics processors. OpenCL support is standard as part of Mac OS 10.6 and later.\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 diff --git a/mac_installer/GR-ReadMe.rtf b/mac_installer/GR-ReadMe.rtf index 7215b4e326..2502efa0b0 100644 --- a/mac_installer/GR-ReadMe.rtf +++ b/mac_installer/GR-ReadMe.rtf @@ -1,6 +1,6 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510 -{\fonttbl\f0\fswiss\fcharset204 Helvetica;} -{\colortbl;\red255\green255\blue255;} +{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210 +\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red56\green110\blue255;} \margl1440\margr1440\vieww9000\viewh9000\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc @@ -21,7 +21,7 @@ For more options, please see the BOINC Macintosh administrator tools at:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/wiki/Tools_for_Mac_OS_X"}}{\fldrslt \cf0 http://boinc.berkeley.edu/wiki/Tools_for_Mac_OS_X}}\ \ -GridRepublic Desktop on the Mac now supports processing with your graphics card, or GPU. Please see {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/gpu.php"}}{\fldrslt http://boinc.berkeley.edu/gpu.php}} for more information. If you have a CUDA-capable NVIDIA GPU and you wish to run CUDA applications, you will need to download and install the CUDA driver and libraries for your system from {\field{\*\fldinst{HYPERLINK "http://www.nvidia.com/object/mac-driver-archive.html"}}{\fldrslt http://www.nvidia.com/object/mac-driver-archive.html}}. GridRepublic Desktop also supports openCL applications on NVIDIA and ATI / AMD graphics processors. OpenCL support is standard as part of Mac OS 10.6 and later.\ +GridRepublic Desktop on the Mac now supports processing with your graphics card, or GPU. Please see {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/wiki/GPU_computing"}}{\fldrslt \cf2 \ul \ulc2 http://boinc.berkeley.edu/wiki/GPU_computing\cf0 \ulnone }}for more information. If you have a CUDA-capable NVIDIA GPU and you wish to run CUDA applications, you will need to download and install the CUDA driver and libraries for your system from {\field{\*\fldinst{HYPERLINK "http://www.nvidia.com/object/mac-driver-archive.html"}}{\fldrslt http://www.nvidia.com/object/mac-driver-archive.html}}. GridRepublic Desktop also supports openCL applications on NVIDIA and ATI / AMD graphics processors. OpenCL support is standard as part of Mac OS 10.6 and later.\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 diff --git a/mac_installer/PTP-ReadMe.rtf b/mac_installer/PTP-ReadMe.rtf index fb33685306..d5b400b7b8 100644 --- a/mac_installer/PTP-ReadMe.rtf +++ b/mac_installer/PTP-ReadMe.rtf @@ -1,6 +1,6 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510 -{\fonttbl\f0\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;} +{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210 +\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;\red56\green110\blue255;} \margl1440\margr1440\vieww9000\viewh9000\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc @@ -21,7 +21,7 @@ For more options, please see the BOINC Macintosh administrator tools at:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/wiki/Tools_for_Mac_OS_X"}}{\fldrslt \cf0 http://boinc.berkeley.edu/wiki/Tools_for_Mac_OS_X}}\ \ -ProgressThruProcessors Desktop on the Mac now supports processing with your graphics card, or GPU. Please see {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/gpu.php"}}{\fldrslt http://boinc.berkeley.edu/gpu.php}} for more information. If you have a CUDA-capable NVIDIA GPU and you wish to run CUDA applications, you will need to download and install the CUDA driver and libraries for your system from {\field{\*\fldinst{HYPERLINK "http://www.nvidia.com/object/mac-driver-archive.html"}}{\fldrslt http://www.nvidia.com/object/mac-driver-archive.html}}. ProgressThruProcessors Desktop also supports openCL applications on NVIDIA and ATI / AMD graphics processors. OpenCL support is standard as part of Mac OS 10.6 and later.\ +ProgressThruProcessors Desktop on the Mac now supports processing with your graphics card, or GPU. Please see {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/wiki/GPU_computing"}}{\fldrslt \cf2 \ul \ulc2 http://boinc.berkeley.edu/wiki/GPU_computing}} for more information. If you have a CUDA-capable NVIDIA GPU and you wish to run CUDA applications, you will need to download and install the CUDA driver and libraries for your system from {\field{\*\fldinst{HYPERLINK "http://www.nvidia.com/object/mac-driver-archive.html"}}{\fldrslt http://www.nvidia.com/object/mac-driver-archive.html}}. ProgressThruProcessors Desktop also supports openCL applications on NVIDIA and ATI / AMD graphics processors. OpenCL support is standard as part of Mac OS 10.6 and later.\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 diff --git a/mac_installer/ReadMe.rtf b/mac_installer/ReadMe.rtf index 57ef7da522..675304d557 100644 --- a/mac_installer/ReadMe.rtf +++ b/mac_installer/ReadMe.rtf @@ -1,6 +1,6 @@ {\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210 \cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;\red217\green11\blue0;} +{\colortbl;\red255\green255\blue255;\red217\green11\blue0;\red56\green110\blue255;} \margl1440\margr1440\vieww9000\viewh9000\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc @@ -25,7 +25,7 @@ For more options, please see the BOINC Macintosh administrator tools at:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/wiki/Tools_for_Mac_OS_X"}}{\fldrslt \cf0 http://boinc.berkeley.edu/wiki/Tools_for_Mac_OS_X}}\ \ -BOINC on the Mac now supports processing with your graphics card, or GPU. Please see {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/gpu.php"}}{\fldrslt http://boinc.berkeley.edu/gpu.php}} for more information. If you have a CUDA-capable NVIDIA GPU and you wish to run CUDA applications, you will need to download and install the CUDA driver and libraries for your system from {\field{\*\fldinst{HYPERLINK "http://www.nvidia.com/object/mac-driver-archive.html"}}{\fldrslt http://www.nvidia.com/object/mac-driver-archive.html}}. BOINC also supports openCL applications on NVIDIA and ATI / AMD graphics processors. OpenCL support is standard as part of Mac OS 10.6 and later.\ +BOINC on the Mac now supports processing with your graphics card, or GPU. Please see {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/wiki/GPU_computing"}}{\fldrslt \cf3 \ul \ulc3 http://boinc.berkeley.edu/wiki/GPU_computing\cf0 \ulnone }}for more information. If you have a CUDA-capable NVIDIA GPU and you wish to run CUDA applications, you will need to download and install the CUDA driver and libraries for your system from {\field{\*\fldinst{HYPERLINK "http://www.nvidia.com/object/mac-driver-archive.html"}}{\fldrslt http://www.nvidia.com/object/mac-driver-archive.html}}. BOINC also supports openCL applications on NVIDIA and ATI / AMD graphics processors. OpenCL support is standard as part of Mac OS 10.6 and later.\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640 diff --git a/mac_installer/V+BDistribution b/mac_installer/V+BDistribution index a2d4608267..79d6d7f834 100644 --- a/mac_installer/V+BDistribution +++ b/mac_installer/V+BDistribution @@ -14,6 +14,8 @@ # Modified by Charlie Fenton 11/2/13 for combined BOINC + VirtualBox # installer. # +## TODO: Find a way to automatically set the VirtualBox version +# # This file, as modified, is part of BOINC. # http://boinc.berkeley.edu # @@ -110,16 +112,16 @@ - #VBoxKEXTs.pkg - #VBoxStartupItems.pkg - #VirtualBox.pkg - #VirtualBoxCLI.pkg + #VBoxKEXTs.pkg + #VBoxStartupItems.pkg + #VirtualBox.pkg + #VirtualBoxCLI.pkg - - - - + + + + @@ -127,11 +129,11 @@ - + - + \ No newline at end of file diff --git a/mac_installer/release_boinc.sh b/mac_installer/release_boinc.sh index 2c8ea2bffa..3362aa42cf 100644 --- a/mac_installer/release_boinc.sh +++ b/mac_installer/release_boinc.sh @@ -39,6 +39,9 @@ ## updated 11/18/13 by Charlie Fenton for Xcode 5.0.2 ## updated 1/22/14 by Charlie Fenton: embed VBox uninstaller in BOINC uninstaller ## updated 9/30/14 by Charlie Fenton to code sign the BOINC client and Manager +## updated 12/16/14 by Charlie Fenton to name folders "x86_64" not "i686" +## updated 12/16/14 by Charlie Fenton to also code sign the installer package +## updated 12/17/14 by Charlie Fenton to fix typo in build of BOINC+VBox installer ## ## NOTE: This script requires Mac OS 10.6 or later, and uses XCode developer ## tools. So you must have installed XCode Developer Tools on the Mac @@ -63,8 +66,11 @@ ## Usage: ## ## If you wish to code sign the client, manager, installer and uninstaller, -## create a file ~/BOINCCodeSignIdentity.txt whose first line is the code -## signing identity +## create a file ~/BOINCCodeSignIdentities.txt whose first line is the code +## signing identity. +## If you wish to also code sign the installer package, add a second line +## to ~/BOINCCodeSignIdentities.txt with the installer code signing identity. + ## ## cd to the root directory of the boinc tree, for example: ## cd [path]/boinc @@ -105,7 +111,7 @@ DarwinMajorVersion=`echo $DarwinVersion | sed 's/\([0-9]*\)[.].*/\1/' `; if [ "$DarwinMajorVersion" -gt 10 ]; then # XCode 4.1 on OS 10.7 builds only Intel binaries - arch="i686" + arch="x86_64" # XCode 3.x and 4.x use different paths for their build products. # Our scripts in XCode's script build phase write those paths to @@ -229,23 +235,27 @@ sudo chmod -R u+rw,g+r-w,o+r-w ../BOINC_Installer/Installer\ Scripts/* ## If you wish to code sign the client, manager, installer and uninstaller, -## create a file ~/BOINCCodeSignIdentity.txt whose first line is the code -## signing identity +## create a file ~/BOINCCodeSignIdentities.txt whose first line is the +## application code signing identity and whose second line is the installer +## code signing identity. +## If you wish to also code sign the installer package, add a second line +## to ~/BOINCCodeSignIdentities.txt with the installer code signing identity. ## ## Code signing using a registered Apple Developer ID is necessary for GateKeeper ## with default settings to allow running downloaded applications under OS 10.8 ## Although code signing the installer application is sufficient to satisfy ## GateKeeper, OS X's software firewall can interfere with RPCs between the ## client and manager. Signing them may make this less likely to be a problem. -if [ -e "${HOME}/BOINCCodeSignIdentity.txt" ]; then - exec 8<"${HOME}/BOINCCodeSignIdentity.txt" - read -u 8 SIGNINGIDENTITY +if [ -e "${HOME}/BOINCCodeSignIdentities.txt" ]; then + exec 8<"${HOME}/BOINCCodeSignIdentities.txt" + read APPSIGNINGIDENTITY <&8 + read INSTALLERSIGNINGIDENTITY <&8 # Code Sign the BOINC client if we have a signing identity - sudo codesign -f -s "${SIGNINGIDENTITY}" "../BOINC_Installer/Pkg_Root/Applications/BOINCManager.app/Contents/Resources/boinc" + sudo codesign -f -s "${APPSIGNINGIDENTITY}" "../BOINC_Installer/Pkg_Root/Applications/BOINCManager.app/Contents/Resources/boinc" # Code Sign the BOINC Manager if we have a signing identity - sudo codesign -f -s "${SIGNINGIDENTITY}" "../BOINC_Installer/Pkg_Root/Applications/BOINCManager.app" + sudo codesign -f -s "${APPSIGNINGIDENTITY}" "../BOINC_Installer/Pkg_Root/Applications/BOINCManager.app" fi sudo rm -dfR ../BOINC_Installer/New_Release_$1_$2_$3/ @@ -311,8 +321,11 @@ cd "../BOINC_Installer/Installer templates" pkgbuild --quiet --scripts "../Installer Scripts" --ownership recommended --identifier edu.berkeley.boinc --root "../Pkg_Root" --component-plist "./complist.plist" "./BOINC.pkg" -productbuild --quiet --resources "../Installer Resources/" --version "BOINC Manager $1.$2.$3" --distribution "./myDistribution" "../New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC Installer.app/Contents/Resources/BOINC.pkg" - +if [ -n "${INSTALLERSIGNINGIDENTITY}" ]; then + productbuild --sign "${INSTALLERSIGNINGIDENTITY}" --quiet --resources "../Installer Resources/" --version "BOINC Manager $1.$2.$3" --distribution "./myDistribution" "../New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC Installer.app/Contents/Resources/BOINC.pkg" +else + productbuild --quiet --resources "../Installer Resources/" --version "BOINC Manager $1.$2.$3" --distribution "./myDistribution" "../New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC Installer.app/Contents/Resources/BOINC.pkg" +fi cd "${BOINCPath}" # Build the BOINC+VirtualBox installer if VirtualBox.pkg exists @@ -342,8 +355,13 @@ if [ -f "../VirtualBox Installer/${VirtualBoxPackageName}" ]; then cd "../BOINC_Installer/Installer templates" - productbuild --quiet --resources "../Installer Resources" --version "BOINC Manager 7.3.0 + VirtualBox 4.2.16" --distribution "./V+BDistribution" "../New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_${arch}_vbox/BOINC Installer.app/Contents/Resources/BOINC.pkg" - +## TODO: Find a way to automatically set the VirtualBox version + if [ -n "${INSTALLERSIGNINGIDENTITY}" ]; then + productbuild --sign "${INSTALLERSIGNINGIDENTITY}" --quiet --resources "../Installer Resources" --version "BOINC Manager $1.$2.$3 + VirtualBox 4.3.12" --distribution "./V+BDistribution" "../New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_${arch}_vbox/BOINC Installer.app/Contents/Resources/BOINC.pkg" + else + productbuild --quiet --resources "../Installer Resources" --version "BOINC Manager $1.$2.$3 + VirtualBox 4.3.12" --distribution "./V+BDistribution" "../New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_${arch}_vbox/BOINC Installer.app/Contents/Resources/BOINC.pkg" + fi + cd "${BOINCPath}" fi @@ -372,16 +390,16 @@ sudo chmod -R u+rw-s,g+r-ws,o+r-w ../BOINC_Installer/New_Release_$1_$2_$3/boinc_ cp -fpRL $BUILDPATH/SymbolTables/ ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_SymbolTables/ ## If you wish to code sign the installer and uninstaller, create a file -## ~/BOINCCodeSignIdentity.txt whose first line is the code signing identity +## ~/BOINCCodeSignIdentities.txt whose first line is the code signing identity ## ## Code signing using a registered Apple Developer ID is necessary for GateKeeper ## with default settings to allow running downloaded applications under OS 10.8 -if [ -e "${HOME}/BOINCCodeSignIdentity.txt" ]; then - # Code Sign the BOINC installer if we have a signing identity - sudo codesign -f -s "${SIGNINGIDENTITY}" "../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC Installer.app" +if [ -n "${APPSIGNINGIDENTITY}" ]; then + # Code Sign the BOINC installer application if we have a signing identity + sudo codesign -f -s "${APPSIGNINGIDENTITY}" "../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC Installer.app" - # Code Sign the BOINC uninstaller if we have a signing identity - sudo codesign -f -s "${SIGNINGIDENTITY}" "../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/extras/Uninstall BOINC.app" + # Code Sign the BOINC uninstaller application if we have a signing identity + sudo codesign -f -s "${APPSIGNINGIDENTITY}" "../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/extras/Uninstall BOINC.app" fi cd ../BOINC_Installer/New_Release_$1_$2_$3