*** empty log message ***

svn path=/trunk/boinc/; revision=9563

checkin_notes

@@ -2380,8 +2380,14 @@ David  24 Feb 2006
         sched/validator.C
         
 Charlie 25 Feb 2006
-    - Mac: Fix a small bug in release scripts whhich made the zip 
+    - Mac: Fix a small bug in release scripts which made the zip 
         files larger than necessary.
     mac_installer/
         release_boinc.sh
         release_GridRepublic.sh
+
+Charlie 27 Feb 2006
+    - Mac: Fix tilde expansion bug in build script.
+    
+    mac_build/
+        setupForBOINC.sh

mac_build/English.lproj/InfoPlist.strings

@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "BOINC";
-CFBundleShortVersionString = "BOINC version 5.3.20";
-CFBundleGetInfoString = "BOINC version 5.3.20, Copyright 2005 University of California.";
+CFBundleShortVersionString = "BOINC version 5.3.22";
+CFBundleGetInfoString = "BOINC version 5.3.22, Copyright 2005 University of California.";

mac_build/Info.plist

@@ -17,6 +17,6 @@
 	<key>CFBundleSignature</key>
 	<string>BNC!</string>
 	<key>CFBundleVersion</key>
-	<string>5.3.20</string>
+	<string>5.3.22</string>
 </dict>
 </plist>

mac_build/Installer-Info.plist

@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.3.20</string>
+	<string>5.3.22</string>
 </dict>
 </plist>

mac_build/ScreenSaver-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.3.20</string>
+	<string>5.3.22</string>
 	<key>NSPrincipalClass</key>
 	<string>BOINC_Saver_ModuleView</string>
 </dict>

mac_build/SystemMenu-Info.plist

@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.3.20</string>
+	<string>5.3.22</string>
 </dict>
 </plist>

mac_build/setupForBOINC.sh

@@ -23,16 +23,13 @@
 # Master script to build Universal Binary libraries needed by BOINC:
 # curl-7.15.1, jpeg-6b and wxMac-2.6.2
 #
-# by Charlie Fenton 2/22/06
+# by Charlie Fenton 2/27/06
 #
 # Download these three packages and place them in a common parent 
 # directory with the BOINC source tree.
 #
-# Before running this script, you must first prepare the wxMac-2.6.2 
-# package.  Read and follow the directions for this in the script 
-# buildWxMac.sh; it is in the same folder as this script.
-#
-## In Terminal, CD to the wxMac-2.6.2 directory.
+## In Terminal, cd to the mac_build directory of the boinc tree; for 
+## example:
 ##     cd [path]/boinc/mac_build/
 ## then run this script:
 ##     source setupForBoinc.sh [ -clean ]
@@ -48,11 +45,11 @@ echo "------- BUILD CURL-7.15.1 --------"
 echo "----------------------------------"
 echo ""
 
-pushd ./
+SCRIPT_DIR=`pwd`
 
 cd ../../curl-7.15.1/
 if [  $? -ne 0 ]; then exit 1; fi
-source "${DIRSTACK[1]}/buildcurl.sh"
+source "${SCRIPT_DIR}/buildcurl.sh"
 if [  $? -ne 0 ]; then exit 1; fi
 
 echo ""
@@ -61,12 +58,11 @@ echo "--------- BUILD JPEG-6B ----------"
 echo "----------------------------------"
 echo ""
 
-popd
-pushd ./
+cd "${SCRIPT_DIR}"
 
 cd ../../jpeg-6b/
 if [  $? -ne 0 ]; then exit 1; fi
-source "${DIRSTACK[1]}/buildjpeg.sh"
+source "${SCRIPT_DIR}/buildjpeg.sh"
 if [  $? -ne 0 ]; then exit 1; fi
 
 echo ""
@@ -75,15 +71,14 @@ echo "------- BUILD wxMac-2.6.2 --------"
 echo "----------------------------------"
 echo ""
 
-popd
-pushd ./
+cd "${SCRIPT_DIR}"
 
 cp -fpR wxMac-BOINC.xcodeproj ../../wxMac-2.6.2/src/
 
 cd ../../wxMac-2.6.2/
 if [  $? -ne 0 ]; then exit 1; fi
-source "${DIRSTACK[1]}/buildWxMac.sh"
+source "${SCRIPT_DIR}/buildWxMac.sh"
 if [  $? -ne 0 ]; then exit 1; fi
 
-popd
-exit 0
+cd "${SCRIPT_DIR}"
+return 0