Changeset 34387

Show
Ignore:
Timestamp:
15.09.2020 15:13:22 (2 weeks ago)
Author:
davidb
Message:

Some refinement of the development setup scripts

Location:
gs3-extensions/mars-src/trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/mars-src/trunk/devel.bash

    r34345 r34387  
    11#!/bin/bash 
    22 
    3 if [ -d cascade-make ] ; then 
    4   source cascade-make/lib/cascade-lib.bash GEXT_MARS . $* 
     3#if [ -d cascade-make ] ; then 
     4#  source cascade-make/lib/cascade-lib.bash GEXT_MARS . $* 
     5#fi 
     6 
     7 
     8if [ "x$1" = "x" ] ; then 
     9    echo "" >&2 
     10    echo "Usage: source ${BASH_SOURCE} 2|3" >&2 
     11    echo "  where '2' specifies Python v2 is to be used" >&2 
     12    echo "  where '3' specifies Python v3 is to be used" >&2 
     13    echo "" >&2 
     14    return 1 
    515fi 
    616 
     17_pyver_=$1 
    718 
    8 if [ -z $GEXT_MARS ] ; then 
     19if [ "x$GEXT_MARS" = "x" ] ; then 
    920  source ./setup.bash 
    1021fi 
    1122 
     23if [ ! -f "$GEXT_MARS_INSTALLED/virtualenv-python$_pyver_/bin/activate" ] ; then 
     24    echo "" >&2 
     25    echo "!!!!" >&2 
     26    echo "! Failed to find:" >&2 
     27    echo "!   $GEXT_MARS_INSTALLED/virtualenv-python$_pyver_/bin/activate" >&2 
     28    echo "!" >&2 
     29    echo "! Have you run:" >&2 
     30    echo "!   ./CREATE-VEN-PYTHON$_pyver_.sh" >&2 
     31    echo "!" >&2 
     32    echo "! Followed by:" >&2 
     33    echo "!   source $GEXT_MARS_INSTALLED/virtualenv-python$_pyver_/bin/activate" >&2 
     34    echo "!!!!" >&2 
     35    echo "" >&2 
    1236 
     37    # Uncomment the following if you want to stop everything immediately 
     38    # 
     39    # While it is commented out, it means the issue is flagged, but  
     40    # allows for the circumstance that the developer is (for some reason) 
     41    # needing to make use of a version of pythno outside of the MARS_EXT arae 
     42    #  
     43    # return 1 
     44 
     45elif  [ "x$VIRTUAL_ENV" = "x" ] ; then 
     46    # It exists, but it hasn't been activated  
     47    echo "" 
     48    echo "****" 
     49    echo "* Warning: To run" 
     50    echo "*   ./CASCADE-MAKE.sh" 
     51    echo "*" 
     52    echo "* You first need to activate Python v$_pyver_ Virtual Env:" 
     53    echo "*   source $GEXT_MARS_INSTALLED/virtualenv-python$_pyver_/bin/activate" 
     54    echo "*" 
     55    echo "* So you have a version of the python scripting language under user control" 
     56    echo "* where the 'essentia' build can be installed as a site-package"  
     57    echo "****" 
     58    echo "" 
     59elif [ "$VIRTUAL_ENV" != "$GEXT_MARS_INSTALLED/virtualenv-python$_pyver_" ] ; then 
     60    # A python virtual env is in play, but not the one for Python v$_pyver_ in the MARS_EXT area 
     61    echo "" 
     62    echo "****" 
     63    echo "* Warning: VIRTUAL_ENV points to different location to the one in MARS_EXT" 
     64    echo "*   VIRTUAL_ENV      = $VIRTUAL_ENV" 
     65    echo "*   MARS_EXT python$_pyver_ = $GEXT_MARS_INSTALLED/virtualenv-python$_pyver_" 
     66    echo "****" 
     67    echo "" 
     68fi 
     69 
     70export GEXT_MARS_DEVEL=1 
     71     
     72 
  • gs3-extensions/mars-src/trunk/devel/CASCADE-MAKE.sh

    r34385 r34387  
    22 
    33source ../cascade-make/lib/cascade-lib.bash GEXT_MARS .. $* 
     4 
     5if [ -z "$GEXT_MARS_DEVEL" ] ; then 
     6  cd .. && source ./devel.bash 
     7fi 
    48 
    59for d in CMAKE NODEJS ; do 
  • gs3-extensions/mars-src/trunk/packages/CASCADE-MAKE.sh

    r34384 r34387  
    22 
    33source ../cascade-make/lib/cascade-lib.bash GEXT_MARS .. $* 
     4 
     5if [ -z "$GEXT_MARS_DEVEL" ] ; then 
     6  cd .. && source ./devel.bash 
     7fi 
    48 
    59for d in EIGEN3 ESSENTIA ; do 
  • gs3-extensions/mars-src/trunk/src/CASCADE-MAKE.sh

    r34370 r34387  
    11#!/bin/bash 
    22 
     3source ../cascade-make/lib/cascade-lib.bash GEXT_MARS .. $* 
    34 
    4 source ../cascade-make/lib/cascade-lib.bash GEXT_MARS .. $* 
     5if [ -z "$GEXT_MARS_DEVEL" ] ; then 
     6  cd .. && source ./devel.bash 
     7fi 
    58 
    69for d in WAVESURFER ; do