From: Gilles DAVID Date: Fri, 25 Mar 2022 10:46:58 +0000 (+0100) Subject: Fix venv directory in config files to point to appli symlink 'venv' X-Git-Tag: EMC2P_V_1_3_5-rc2^0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FBR_EMC2P_V_1_3_5;p=modules%2Fkernel.git Fix venv directory in config files to point to appli symlink 'venv' --- diff --git a/bin/appli_gen.py b/bin/appli_gen.py index b01e789b0..06de41b15 100755 --- a/bin/appli_gen.py +++ b/bin/appli_gen.py @@ -411,11 +411,11 @@ export LD_LIBRARY_PATH=${HOME}/${APPLI}/lib/salome:$LD_LIBRARY_PATH # Create environment for virtual env if venv_directory_path: command = """# SALOME venv Configuration -export SALOME_VENV_DIRECTORY=%s +export SALOME_VENV_DIRECTORY=${HOME}/${APPLI}/venv export PATH=${HOME}/${APPLI}/venv/bin:$PATH export LD_LIBRARY_PATH=${HOME}/${APPLI}/venv/lib:$LD_LIBRARY_PATH export PYTHONPATH=${HOME}/${APPLI}/venv/lib/python%s/site-packages -""" % (venv_directory_path, versionPython) +""" % (versionPython) f.write(command) pass @@ -456,11 +456,11 @@ ADD_TO_LD_LIBRARY_PATH: ${HOME}/${APPLI}/lib/salome # Create environment for virtual env if venv_directory_path: command = """[SALOME venv Configuration] -SALOME_VENV_DIRECTORY: %s +SALOME_VENV_DIRECTORY: ${HOME}/${APPLI}/venv ADD_TO_PATH: ${HOME}/${APPLI}/venv/bin ADD_TO_LD_LIBRARY_PATH: ${HOME}/${APPLI}/venv/lib ADD_TO_PYTHONPATH: ${HOME}/${APPLI}/venv/lib/python%s/site-packages -""" % (venv_directory_path, versionPython) +""" % (versionPython) f.write(command) pass