diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2010-10-14 06:23:01 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2010-10-14 06:23:01 +0400 |
| commit | 9d5b588ed397ee4bdbc57a62c065203ae7ebcdbd (patch) | |
| tree | 3f376652bb98856d46f67e175d6ce5c22c7f404d /main/build | |
| parent | aff661d091edf1e471ccff223a5d9b31b8f8365a (diff) | |
[Mac] Support "External" xbuild and pkgconfig dirs on Mac
Use env vars to support "External" directories for xbuild and
pkgconfig extensions that won't blown away when Mono is upgraded.
Diffstat (limited to 'main/build')
| -rwxr-xr-x | main/build/MacOSX/mdtool | 9 | ||||
| -rwxr-xr-x | main/build/MacOSX/monodevelop | 14 |
2 files changed, 20 insertions, 3 deletions
diff --git a/main/build/MacOSX/mdtool b/main/build/MacOSX/mdtool index 4dc8b1428e..df8c1514b3 100755 --- a/main/build/MacOSX/mdtool +++ b/main/build/MacOSX/mdtool @@ -27,6 +27,15 @@ else MONO_EXEC="exec -a monodevelop mono" fi +# The Mono "External" folder allows users (such as MonoDroid) to install +# things without worrying that they'll be removed next time mono is upgraded +# Mono doesn't support it get so we hack it via env vars for now. +MONO_FRAMEWORK_EXT=/Library/Frameworks/Mono.framework/External +export PKG_CONFIG_PATH="$MONO_FRAMEWORK_EXT/pkgconfig:$PKG_CONFIG_PATH" +export MSBuildExtensionsPath="$MONO_FRAMEWORK_EXT/xbuild:$MSBuildExtensionPath" +# N.B. MONO_FRAMEWORK_EXT/monodoc is handled inside MD itself +# N.B. no point in hacking MONO_FRAMEWORK_EXT/gac because it's for runtime + ## use an app-specific registry if possible #if [ -w "$DIR" ]; then # export MONO_ADDINS_REGISTRY="$DIR" diff --git a/main/build/MacOSX/monodevelop b/main/build/MacOSX/monodevelop index 0973391493..449884fcb6 100755 --- a/main/build/MacOSX/monodevelop +++ b/main/build/MacOSX/monodevelop @@ -4,7 +4,7 @@ # Michael Hutchinson (mhutchinson@novell.com) MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current -export DYLD_FALLBACK_LIBRARY_PATH=$MONO_FRAMEWORK_PATH/lib:/lib:/usr/lib +export DYLD_FALLBACK_LIBRARY_PATH="$MONO_FRAMEWORK_PATH/lib:$DYLD_FALLBACK_LIBRARY_PATH" #we need lots of file handles ulimit -n 1024 @@ -17,8 +17,7 @@ DIR=$(cd "$(dirname "$0")"; pwd) # $0 should contain the full path from the root i.e. /Applications/<folder>.app/Contents/MacOS/<script> EXE_PATH="$DIR/lib/monodevelop/bin/MonoDevelop.exe" -PKG_CONFIG_PATH="$DIR/lib/pkgconfig:$PKG_CONFIG_PATH" -export PKG_CONFIG_PATH +export PKG_CONFIG_PATH="$DIR/lib/pkgconfig:$PKG_CONFIG_PATH" # Work around a bug in 'exec' in older versions of macosx OSX_VERSION=$(uname -r | cut -f1 -d.) @@ -31,6 +30,15 @@ fi #mono version check if ! "$DIR/mono-version-check" MonoDevelop 2 6 7 ; then exit 1; fi +# The Mono "External" folder allows users (such as MonoDroid) to install +# things without worrying that they'll be removed next time mono is upgraded +# Mono doesn't support it get so we hack it via env vars for now. +MONO_FRAMEWORK_EXT=/Library/Frameworks/Mono.framework/External +export PKG_CONFIG_PATH="$MONO_FRAMEWORK_EXT/pkgconfig:$PKG_CONFIG_PATH" +export MSBuildExtensionsPath="$MONO_FRAMEWORK_EXT/xbuild:$MSBuildExtensionPath" +# N.B. MONO_FRAMEWORK_EXT/monodoc is handled inside MD itself +# N.B. no point in hacking MONO_FRAMEWORK_EXT/gac because it's for runtime + ## use an app-specific registry if possible #if [ -w "$DIR" ]; then # export MONO_ADDINS_REGISTRY="$DIR" |