diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-dependencies.sh | 22 | ||||
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 3 |
2 files changed, 23 insertions, 2 deletions
diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh index 6a3e637..9393b4d 100755 --- a/scripts/check-dependencies.sh +++ b/scripts/check-dependencies.sh @@ -418,12 +418,14 @@ find_installed_version() depname=$1 # try to find/parse headers and/or binary output + # break on the first match. (change the order to change precedence) if [ ! $fsv_tmp ]; then - for syspath in "/opt" "/usr/pkg" "/usr" "/usr/local" $OPENSCAD_LIBRARIES; do + for syspath in "/usr/local" "/opt/local" "/usr/pkg" "/usr" $OPENSCAD_LIBRARIES; do if [ -e $syspath ]; then debug $depname"_sysver" $syspath eval $depname"_sysver" $syspath fsv_tmp=`eval echo "$"$depname"_sysver_result"` + if [ $fsv_tmp ]; then break; fi fi done fi @@ -471,6 +473,24 @@ check_misc() if [ "`uname -a|grep -i netbsd`" ]; then echo "NetBSD: Please manually verify the X Sets have been installed" fi + + if [ "`uname -a|grep -i darwin`" ]; then + sparkle= + libs="~/Library /Library" + for libhome in $libs; do + echo "$libhome/Frameworks/Sparkle.framework..." + if [ -d $libhome/Frameworks/Sparkle.framework ]; then + echo "Found in $libhome" + sparkle=$libhome + break + fi + done + if [ -n "$sparkle" ]; then + echo "OS X: Make sure Sparkle.framework is installed in your Frameworks path" + else + echo "OS X: Sparkle.framework found in $libhome" + fi + fi } checkargs() diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 57dd3bf..8f32ac3 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -343,8 +343,9 @@ build_sparkle() if $OPTION_32BIT; then SPARKLE_EXTRA_FLAGS="-arch i386" fi + xcodebuild -project Sparkle.xcodeproj clean xcodebuild -project Sparkle.xcodeproj -scheme Sparkle -configuration Release -arch x86_64 $SPARKLE_EXTRA_FLAGS - rm -r $DEPLOYDIR/lib/Sparkle.framework + rm -rf $DEPLOYDIR/lib/Sparkle.framework cp -Rf build/Release/Sparkle.framework $DEPLOYDIR/lib/ install_name_tool -id $DEPLOYDIR/lib/Sparkle.framework/Versions/A/Sparkle $DEPLOYDIR/lib/Sparkle.framework/Sparkle } |