diff --git a/checkin_notes b/checkin_notes index 6fe04cba5c..a7f40fc217 100644 --- a/checkin_notes +++ b/checkin_notes @@ -4882,6 +4882,8 @@ Charlie 12 July 2012 under OS 10.8 GM seed. samples/ + example_app/ + MakeMacExample.sh mac_build/ UpperCase2.xcodeproj/ project.pbxproj @@ -4889,3 +4891,5 @@ Charlie 12 July 2012 BuildMacVboxWrapper.sh vboxwrapper.xcodeproj/ project.pbxproj + wrapper/ + BuildMacWrapper.sh diff --git a/samples/example_app/MakeMacExample.sh b/samples/example_app/MakeMacExample.sh index 28442d58ae..6a10c4bacd 100644 --- a/samples/example_app/MakeMacExample.sh +++ b/samples/example_app/MakeMacExample.sh @@ -22,7 +22,7 @@ # # by Charlie Fenton 2/16/10 # Updated 10/11/10 for XCode 3.2 and OS 10.6 -# Updated 7/10/12 for Xcode 4.3 and later which are not at a fixed address +# Updated 7/12/12 for Xcode 4.3 and later which are not at a fixed address # ## This script requires OS 10.6 or later # @@ -41,19 +41,19 @@ GCCPATH=`xcrun -find gcc` if [ $? -ne 0 ]; then echo "ERROR: can't find gcc compiler" - return 1 + exit 1 fi GPPPATH=`xcrun -find g++` if [ $? -ne 0 ]; then echo "ERROR: can't find g++ compiler" - return 1 + exit 1 fi MAKEPATH=`xcrun -find make` if [ $? -ne 0 ]; then echo "ERROR: can't find make tool" - return 1 + exit 1 fi TOOLSPATH1=${MAKEPATH%/make} @@ -61,7 +61,7 @@ TOOLSPATH1=${MAKEPATH%/make} ARPATH=`xcrun -find ar` if [ $? -ne 0 ]; then echo "ERROR: can't find ar tool" - return 1 + exit 1 fi TOOLSPATH2=${ARPATH%/ar} diff --git a/samples/wrapper/BuildMacWrapper.sh b/samples/wrapper/BuildMacWrapper.sh index 44bde6dbf6..1fc9eedf12 100644 --- a/samples/wrapper/BuildMacWrapper.sh +++ b/samples/wrapper/BuildMacWrapper.sh @@ -22,7 +22,7 @@ # # by Charlie Fenton 2/15/10 # Updated 11/16/11 for XCode 4.1 and OS 10.7 -# Updated 7/10/12 for Xcode 4.3 and later which are not at a fixed address +# Updated 7/12/12 for Xcode 4.3 and later which are not at a fixed address # ## This script requires OS 10.6 or later # @@ -41,19 +41,19 @@ GCCPATH=`xcrun -find gcc` if [ $? -ne 0 ]; then echo "ERROR: can't find gcc compiler" - return 1 + exit 1 fi GPPPATH=`xcrun -find g++` if [ $? -ne 0 ]; then echo "ERROR: can't find g++ compiler" - return 1 + exit 1 fi MAKEPATH=`xcrun -find make` if [ $? -ne 0 ]; then echo "ERROR: can't find make tool" - return 1 + exit 1 fi TOOLSPATH1=${MAKEPATH%/make} @@ -61,7 +61,7 @@ TOOLSPATH1=${MAKEPATH%/make} ARPATH=`xcrun -find ar` if [ $? -ne 0 ]; then echo "ERROR: can't find ar tool" - return 1 + exit 1 fi TOOLSPATH2=${ARPATH%/ar}