Changeset 3844:90ce8c205d4e in roaraudio

Timestamp:

05/16/10 22:15:11 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for --no-load-*

File:

• roarclients/roarify.sht (modified) (5 diffs)

roarclients/roarify.sht

@@ -13 +13 @@
  echo " --server SERVER      - Sets server to SERVER"
  echo " --load   MODULE      - Force loading of MODULE"
+ echo " --no-load-roar       - Do not preload libroar"
+ echo " --no-load-oss        - Do not preload libroaross (OSS Emulation)"
 }
 
@@ -19 +21 @@
 print_env=false
 print_mode=none
+
+preload_libroar='%%%PREFIX_LIB%%%/libroar.so.%%%VERSION%%% '
+preload_libroaross='%%%PREFIX_LIB%%%/libroaross.so.%%%VERSION%%% '
 
 while [ "$1" != '' ]
@@ -38 +43 @@
    LD_PRELOAD="%%%PREFIX_COMP_LIBS%%%/lib$1.so $LD_PRELOAD"
    shift;
+  ;;
+  '--no-load-roar')
+   preload_libroar=''
+  ;;
+  '--no-load-oss')
+   preload_libroaross=''
   ;;
   '--help'|'-h')
@@ -59 +70 @@
 done
 
-export LD_PRELOAD="%%%PREFIX_LIB%%%/libroar.so.%%%VERSION%%% %%%PREFIX_LIB%%%/libroaross.so.%%%VERSION%%% $LD_PRELOAD"
+# spaces are included in $preload_*
+LD_PRELOAD="$preload_libroar$preload_libroaross$LD_PRELOAD"
+
+if [ "$LD_PRELOAD" = '' ]
+then
+ unset LD_PRELOAD
+else
+ export LD_PRELOAD
+fi
+
 export LD_LIBRARY_PATH='%%%PREFIX_COMP_LIBS%%%'":$LD_LIBRARY_PATH"
 export PATH='%%%PREFIX_COMP_BINS%%%'":$PATH"
@@ -68 +88 @@
   'bash')
    [ "$ROAR_SERVER" != '' ] && echo "ROAR_SERVER='$ROAR_SERVER'; export ROAR_SERVER;"
-   echo "LD_PRELOAD='$LD_PRELOAD'; export LD_PRELOAD;"
+   [ "$LD_PRELOAD"  != '' ] && echo "LD_PRELOAD='$LD_PRELOAD'; export LD_PRELOAD;"
    echo "LD_LIBRARY_PATH='$LD_LIBRARY_PATH'; export LD_LIBRARY_PATH;"
    echo "PATH='$PATH'; export PATH;"