From a3d151d3c85c3ba8997f1f5388e4a84dd9edb790 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Thu, 18 Nov 2010 11:30:51 +0000 Subject: [PATCH] Mac Installer: remove obsolete kludge for generating x86_64 screensaver svn path=/trunk/boinc/; revision=22707 --- checkin_notes | 6 ++++++ mac_installer/release_boinc.sh | 13 +------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/checkin_notes b/checkin_notes index 7c7e0c56ff..6fe2bbd5f2 100644 --- a/checkin_notes +++ b/checkin_notes @@ -8157,3 +8157,9 @@ Charlie 18 Nov 2010 client/ hostinfo_unix.cpp + +Charlie 18 Nov 2010 + - Mac Installer: remove obsolete kludge for generating x86_64 screensaver. + + mac_installer/ + release_boinc.sh diff --git a/mac_installer/release_boinc.sh b/mac_installer/release_boinc.sh index a9b4e621e0..056f84305e 100644 --- a/mac_installer/release_boinc.sh +++ b/mac_installer/release_boinc.sh @@ -21,6 +21,7 @@ # Release Script for Macintosh BOINC Manager 10/31/07 by Charlie Fenton ## updated 11/18/09 by Charlie Fenton for OS 10.6 Snow Leopard ## updated 9/28/10 by Charlie Fenton for new BOINC skins +## updated 11/18/10 by Charlie Fenton ## ## NOTE: This script uses PackageMaker, which is installed as part of the ## XCode developer tools. So you must have installed XCode Developer @@ -133,18 +134,6 @@ cp -fpR $BUILDPATH/BOINCManager.app ../BOINC_Installer/Pkg_Root/Applications/ cp -fpR $BUILDPATH/BOINCSaver.saver ../BOINC_Installer/Pkg_Root/Library/Screen\ Savers/ -## If x86_64 version of screen saver for OS 10.6 exists, merge it into our screen saver -if [ -x ../_boinc_SnowLeopard/mac_build/build/Deployment/BOINCSaver.saver/Contents/MacOS/BOINCSaver ]; then - if [ "$4" != "-dev" ]; then - rm -f ../BOINC_Installer/Pkg_Root/Library/Screen\ Savers/BOINCSaver.saver/Contents/MacOS/BOINCSaver - rm -fR ../BOINC_Installer/temp/ - mkdir -p ../BOINC_Installer/temp/ - lipo ../_boinc_SnowLeopard/mac_build/build/Deployment/BOINCSaver.saver/Contents/MacOS/BOINCSaver -thin x86_64 -output ../BOINC_Installer/temp/saver64 - lipo ../BOINC_Installer/temp/saver64 $BUILDPATH/BOINCSaver.saver/Contents/MacOS/BOINCSaver -create -output ../BOINC_Installer/Pkg_Root/Library/Screen\ Savers/BOINCSaver.saver/Contents/MacOS/BOINCSaver - rm -fR ../BOINC_Installer/temp/ - fi -fi - ## Copy the localization files into the installer tree ## Old way copies CVS and *.po files which are not needed ## cp -fpR locale/ ../BOINC_Installer/Pkg_Root/Library/Application\ Support/BOINC\ Data/locale