diff --git a/checkin_notes b/checkin_notes index d57f50d7d6..b981ab6fc9 100755 --- a/checkin_notes +++ b/checkin_notes @@ -13041,3 +13041,10 @@ David 28 Nov 2006 clientgui/ ViewResources.cpp + +Charlie 30 Nov 2006 + - Mac: Add WCG skin to Mac installer. + + mac_installer/ + release_boinc.sh + preinstall diff --git a/mac_installer/preinstall b/mac_installer/preinstall index d5f12a4dab..f23765e8a0 100644 --- a/mac_installer/preinstall +++ b/mac_installer/preinstall @@ -1,11 +1,14 @@ #!/bin/csh ## -# Pre-Install / Pre-Upgrade Script for Macintosh BOINC Manager for OS X revised 1/23/06 +# Pre-Install / Pre-Upgrade Script for Macintosh BOINC Manager for OS X revised 12/1/06 ## # If we are replacing an earlier GridRepublic installation, fix the data directory name before installing ## We don't customize BOINC Data directory name for branding ## mv -n "/Library/Application Support/GridRepublic Data" "/Library/Application Support/BOINC Data" +# Delete old World Community Grid Skins +sudo rm -dfR /Library/Application\ Support/BOINC\ Data/skins/World\ Community\ Grid/ + exit 0 diff --git a/mac_installer/release_boinc.sh b/mac_installer/release_boinc.sh index 16ea0b732b..07b2f906ee 100644 --- a/mac_installer/release_boinc.sh +++ b/mac_installer/release_boinc.sh @@ -45,7 +45,8 @@ echo " source [path_to_this_script] major_version minor_version revision_numbe return 1 fi -pushd ./ +#pushd ./ +BOINCPath=$PWD ## XCode 2.x has separate directories for Development and Deployment build products if [ "$4" = "-dev" ]; then @@ -73,8 +74,8 @@ cp -fp mac_installer/ReadMe.rtf ../BOINC_Installer/Installer\ Resources/ sed -i "" s/""/"$1.$2.$3"/g ../BOINC_Installer/Installer\ Resources/ReadMe.rtf #### We don't customize BOINC Data directory name for branding -#### cp -fp mac_installer/preinstall ../BOINC_Installer/Installer\ Resources/ -#### cp -fp mac_installer/preinstall ../BOINC_Installer/Installer\ Resources/preupgrade +cp -fp mac_installer/preinstall ../BOINC_Installer/Installer\ Resources/ +cp -fp mac_installer/preinstall ../BOINC_Installer/Installer\ Resources/preupgrade cp -fp mac_installer/postinstall ../BOINC_Installer/Installer\ Resources/ cp -fp mac_installer/postupgrade ../BOINC_Installer/Installer\ Resources/ @@ -93,6 +94,14 @@ cp -fpR $BUILDPATH/switcher ../BOINC_Installer/Pkg_Root/Library/Application\ Sup cp -fpR $BUILDPATH/setprojectgrp ../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data/switcher/ cp -fpR $BUILDPATH/AppStats ../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data/switcher/ +## Copy the World Community Grid skins into the installer tree, minus the CVS files +mkdir -p ../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data/skins +cd "${BOINCPath}/clientgui/skins" +cp -fpR World\ Community\ Grid ../../../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data/skins/ +cd "${BOINCPath}" +sudo rm -dfR ../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data/skins/World\ Community\ Grid/CVS +sudo rm -dfR ../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data/skins/World\ Community\ Grid/graphic/CVS + cp -fpR curl/ca-bundle.crt ../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data/ cp -fpR $BUILDPATH/BOINCManager.app ../BOINC_Installer/Pkg_Root/Applications/ @@ -170,5 +179,7 @@ zip -rqy boinc_$1.$2.$3_macOSX_universal.zip boinc_$1.$2.$3_macOSX_universal zip -rqy boinc_$1.$2.$3_universal-apple-darwin.zip boinc_$1.$2.$3_universal-apple-darwin zip -rqy boinc_$1.$2.$3_macOSX_SymbolTables.zip boinc_$1.$2.$3_macOSX_SymbolTables -popd +#popd +cd "${BOINCPath}" + return 0