# HG changeset patch # User wenzelm # Date 1295467216 -3600 # Node ID b7cd80330a16745ad14df3cd15bdc63bd68fc499 # Parent 5bde4a5cc17228a0f97b2261ee76a96fc4922692 added librarypath: shared library convenience in bash, keeping LD_LIBRARY_PATH and DYLD_LIBRARY_PATH separate; diff -r 5bde4a5cc172 -r b7cd80330a16 lib/scripts/getsettings --- a/lib/scripts/getsettings Wed Jan 19 15:22:35 2011 +0100 +++ b/lib/scripts/getsettings Wed Jan 19 21:00:16 2011 +0100 @@ -63,6 +63,31 @@ fi HOME_JVM="$HOME" +#shared library convenience +function librarypath () { + for X in "$@" + do + case "$ISABELLE_PLATFORM" in + *-darwin) + if [ -z "$DYLD_LIBRARY_PATH" ]; then + DYLD_LIBRARY_PATH="$X" + else + DYLD_LIBRARY_PATH="$X:$DYLD_LIBRARY_PATH" + fi + export DYLD_LIBRARY_PATH + ;; + *) + if [ -z "$LD_LIBRARY_PATH" ]; then + LD_LIBRARY_PATH="$X" + else + LD_LIBRARY_PATH="$X:$LD_LIBRARY_PATH" + fi + export LD_LIBRARY_PATH + ;; + esac + done +} + #CLASSPATH convenience function classpath () { for X in "$@" diff -r 5bde4a5cc172 -r b7cd80330a16 lib/scripts/run-polyml --- a/lib/scripts/run-polyml Wed Jan 19 15:22:35 2011 +0100 +++ b/lib/scripts/run-polyml Wed Jan 19 21:00:16 2011 +0100 @@ -39,8 +39,7 @@ POLYLIB="$ML_HOME" fi -export LD_LIBRARY_PATH="$POLYLIB:$LD_LIBRARY_PATH" -export DYLD_LIBRARY_PATH="$POLYLIB:$DYLD_LIBRARY_PATH" +librarypath "$POLYLIB" ## prepare databases