From 62915386e913cafdb1119d3a254161eb6e560679 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Thu, 8 Nov 2007 12:05:56 +0000
Subject: [PATCH] Mac: Additional changes to release scripts for compatibility
 with new PackageMaker

svn path=/trunk/boinc/; revision=14124
---
 checkin_notes                         | 5 +++++
 mac_installer/release_GridRepublic.sh | 1 +
 mac_installer/release_boinc.sh        | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/checkin_notes b/checkin_notes
index 033136b2ff..94d15ac161 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -10678,6 +10678,11 @@ David  7 Nov 2007
 Charlie 8 Nov 2007
     Mgr SG: Fix SG preferences bug: set "custom" checkmark only if
         global_prefs_override.xml file exists.
+    Mac: Additional changes to release scripts for compatibility with new 
+         PackageMaker.    
         
     clientgui/
         sg_DlgPreferences.cpp,h
+    mac_installer/
+        release_boinc.sh
+        release_GridRepublic.sh
diff --git a/mac_installer/release_GridRepublic.sh b/mac_installer/release_GridRepublic.sh
index fc9f13d371..2a1f640f9c 100644
--- a/mac_installer/release_GridRepublic.sh
+++ b/mac_installer/release_GridRepublic.sh
@@ -277,6 +277,7 @@ if [ "$DarwinMajorVersion" = "9" ]; then
     /Developer/usr/bin/packagemaker -r "${PR_PATH}" -e "${IR_PATH}" -s "${SCRIPTS_PATH}" -f "${NEW_DIR_PATH}/Pkg-Info.plist" -t "${MANAGER_NAME}" -n "$1.$2.$3" -b -o "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal/${BRAND_NAME} Installer.app/Contents/Resources/${BRAND_NAME}.pkg"
     # Remove TokenDefinitions.plist which, along with IFPkgPathMappings in Info.plist, would cause installer to find a previous copy of BOINCManager and install there
     sudo rm -f "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal/${BRAND_NAME} Installer.app/Contents/Resources/${BRAND_NAME}.pkg/Contents/Resources/TokenDefinitions.plist"
+    defaults delete "$PWD/${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal/${BRAND_NAME} Installer.app/Contents/Resources/${BRAND_NAME}.pkg/Contents/Info" IFPkgPathMappings
 else
     # OS 10.4 packagemaker
     /Developer/Tools/packagemaker -build -p "${NEW_DIR_PATH}/${LC_BRAND_NAME}_$1.$2.$3_macOSX_universal/${BRAND_NAME} Installer.app/Contents/Resources/${BRAND_NAME}.pkg" -f "${PR_PATH}" -r "${IR_PATH}" -i "${NEW_DIR_PATH}/Pkg-Info.plist" -d "${NEW_DIR_PATH}/Description.plist" -ds 
diff --git a/mac_installer/release_boinc.sh b/mac_installer/release_boinc.sh
index cf1033e366..d53e04d1e8 100644
--- a/mac_installer/release_boinc.sh
+++ b/mac_installer/release_boinc.sh
@@ -176,8 +176,9 @@ DarwinMajorVersion=`echo $DarwinVersion | sed 's/\([0-9]*\)[.].*/\1/' `;
 if [ "$DarwinMajorVersion" = "9" ]; then
     # OS 10.5 packagemaker
     /Developer/usr/bin/packagemaker -r ../BOINC_Installer/Pkg_Root -e ../BOINC_Installer/Installer\ Resources/ -s ../BOINC_Installer/Installer\ Scripts/ -f mac_build/Pkg-Info.plist -t "BOINC Manager" -n "$1.$2.$3" -b -o ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/BOINC\ Installer.app/Contents/Resources/BOINC.pkg
-    # Remove TokenDefinitions.plist which, along with IFPkgPathMappings in Info.plist, would cause installer to find a previous copy of BOINCManager and install there
+    # Remove TokenDefinitions.plist and IFPkgPathMappings in Info.plist, which would cause installer to find a previous copy of BOINCManager and install there
     sudo rm -f ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/BOINC\ Installer.app/Contents/Resources/BOINC.pkg/Contents/Resources/TokenDefinitions.plist
+    defaults delete "$BOINCPath/../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/BOINC Installer.app/Contents/Resources/BOINC.pkg/Contents/Info" IFPkgPathMappings
 else
     # OS 10.4 packagemaker
     /Developer/Tools/packagemaker -build -p ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_universal/BOINC\ Installer.app/Contents/Resources/BOINC.pkg -f ../BOINC_Installer/Pkg_Root -r ../BOINC_Installer/Installer\ Resources/ -i mac_build/Pkg-Info.plist -d mac_Installer/Description.plist -ds