Changeset 14213


Ignore:
Timestamp:
Nov 28, 2019 3:56:08 PM (2 weeks ago)
Author:
aramle
Message:

#5877 Made JMODELICA_HOME an environment variable

Location:
branches/dev-2385/Python
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-2385/Python/jm_ipython.sh.in

    r14206 r14213  
    88CURRENT_DIR="$(pwd)"
    99cd "$(dirname "$0")"
    10 FILE_DIR="$(pwd)"
     10cd ..
     11export JMODELICA_HOME="$(pwd)"
    1112#Go back to previous location
    1213cd ${CURRENT_DIR}
     
    1617    . ${PY_VENV_PATH}/bin/activate
    1718elif [[ -d "${FILE_DIR}/../../py3venv" ]]; then
    18     . ${FILE_DIR}/../../py3venv/bin/activate
     19    . ${JMODELICA_HOME}/../py3venv/bin/activate
    1920fi
    2021
    2122#Set variables using relative paths
    22 JMODELICA_HOME=${FILE_DIR}/.. \
    2323IPOPT_HOME=@IPOPT_HOME@ \
    2424SUNDIALS_HOME=${JMODELICA_HOME}/ThirdParty/Sundials \
  • branches/dev-2385/Python/jm_python.sh.in

    r14206 r14213  
    88CURRENT_DIR="$(pwd)"
    99cd "$(dirname "$0")"
    10 FILE_DIR="$(pwd)"
     10cd ..
     11export JMODELICA_HOME="$(pwd)"
    1112#Go back to previous location
    1213cd ${CURRENT_DIR}
     
    1617    . ${PY_VENV_PATH}/bin/activate
    1718elif [[ -d "${FILE_DIR}/../../py3venv" ]]; then
    18     . ${FILE_DIR}/../../py3venv/bin/activate
     19    . ${JMODELICA_HOME}/../py3venv/bin/activate
    1920fi
    2021
    2122#Set variables using relative paths
    22 JMODELICA_HOME=${FILE_DIR}/.. \
    2323IPOPT_HOME=@IPOPT_HOME@ \
    2424SUNDIALS_HOME=${JMODELICA_HOME}/ThirdParty/Sundials \
Note: See TracChangeset for help on using the changeset viewer.