Changeset 34388 for gs3-extensions/mars-src/trunk/packages/CASCADE-MAKE/ESSENTIA.sh

Timestamp:

2020-09-15T15:14:05+12:00 (4 years ago)

Author:

davidb

Message:

Work with virtual-env if present; assume python to use is on path

File:

• gs3-extensions/mars-src/trunk/packages/CASCADE-MAKE/ESSENTIA.sh (modified) (2 diffs)

gs3-extensions/mars-src/trunk/packages/CASCADE-MAKE/ESSENTIA.sh

@@ -8 +8 @@
 source ../cascade-make/lib/cascade-lib.bash GEXT_MARS ../.. $*
 
-prefix=$GEXT_MARS_INSTALLED
+if [ "x$VIRTUAL_ENV" != "x" ] ; then
+    prefix="$VIRTUAL_ENV"
+else
+    prefix="$GEXT_MARS_INSTALLED"
+fi
 
 opt_run_untar $force_untar $auto_untar $package $version
@@ -19 +23 @@
     ( cd $package$version ; \
       # Do full configure with testing (note: needs full recursive git cloned version of repository to provide models and sample audio files)
-      echo ./waf configure --build-static --with-python --with-cpptests --with-examples --python=/usr/local/bin/python3 --prefix="$prefix" $@ ; \
-      eval ./waf configure --build-static --with-python --with-cpptests --with-examples --python=/usr/local/bin/python3 --prefix="$prefix" $@ ; )
+      echo ./waf configure --build-static --with-python --with-cpptests --with-examples --prefix="$prefix" $@ ; \
+      eval ./waf configure --build-static --with-python --with-cpptests --with-examples --prefix="$prefix" $@ ; )
     if [ $? != 0 ] ; then
         echo "      Error encountered running *configure* stage of $progname"