From 548cbab763a938c138d4d62127496e7128fa9dbe Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 3 Oct 2005 07:38:17 +0000 Subject: [PATCH] Fix a bug: after installation of omni binaries it is necessary to correct path to python in omniidl tool. --- config_files/GUI_BIN.sh | 4 ---- config_files/omniORB-4.0.5.sh | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config_files/GUI_BIN.sh b/config_files/GUI_BIN.sh index 576e989..05a30a2 100755 --- a/config_files/GUI_BIN.sh +++ b/config_files/GUI_BIN.sh @@ -22,8 +22,6 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then export PATH=\${GUI_ROOT_DIR}/bin/salome:\${PATH} export LD_LIBRARY_PATH=\${GUI_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH} export PYTHONPATH=\${GUI_ROOT_DIR}/bin/salome:\${GUI_ROOT_DIR}/lib/salome:\${GUI_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} - export SUITRoot=\${GUI_ROOT_DIR}/share/salome - export SalomeAppConfig=\${GUI_ROOT_DIR}/share/salome/resources fi fi ## @@ -44,8 +42,6 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then export PATH=\${GUI_ROOT_DIR}/bin/salome:\${PATH} export LD_LIBRARY_PATH=\${GUI_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH} export PYTHONPATH=\${GUI_ROOT_DIR}/bin/salome:\${GUI_ROOT_DIR}/lib/salome:\${GUI_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} - export SUITRoot=\${GUI_ROOT_DIR}/share/salome - export SalomeAppConfig=\${GUI_ROOT_DIR}/share/salome/resources fi fi ## diff --git a/config_files/omniORB-4.0.5.sh b/config_files/omniORB-4.0.5.sh index e5f0223..7fcb7bf 100755 --- a/config_files/omniORB-4.0.5.sh +++ b/config_files/omniORB-4.0.5.sh @@ -144,6 +144,12 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/omniORB-4.0.5.tar.gz -C ${INSTALL_ROOT} ln -s ${PRODUCT_DIR} ${INSTALL_ROOT}/omni + +cd ${PRODUCT_DIR}/bin +sed -e "s%#\!.*python%#\!`which python`%" omniidl > _omniidl +mv -f _omniidl omniidl +chmod a+x omniidl + print_env } -- 2.39.2