Commit 91214930 authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Get the real path to the python executable to ensure relocation

works correctly in cc-run and cc-sh (CORALCOOL-2829)


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19880 4525493e-7705-40b1-a816-d608a930855b
parent 0badd794
......@@ -153,6 +153,7 @@ endif()
coral_generate_env_conf()
get_filename_component(PYTHON_EXECUTABLE_REALPATH ${PYTHON_EXECUTABLE} REALPATH)
configure_file(cmake/cc-run.in cc-run @ONLY)
configure_file(cmake/cc-sh.in cc-sh @ONLY)
execute_process(COMMAND chmod +x ${CMAKE_BINARY_DIR}/cc-run ${CMAKE_BINARY_DIR}/cc-sh)
......
......@@ -27,7 +27,7 @@ envxmlold=@env_release_xml@
envxmlnew=$topdir/env/@env_xml_basename@
###echo envxmlold is $envxmlold
###echo envxmlnew is $envxmlnew
pythonExecutable=@PYTHON_EXECUTABLE@
pythonExecutable=@PYTHON_EXECUTABLE_REALPATH@
project=`basename $envxmlnew .xenv`
projsysold=`more $envxmlnew | grep variable=\"${project}SYS\" | tr "<" " " | tr ">" " " | awk '{print $3}'`
if [ -d $projsysold ]; then projsysold=`cd $projsysold; pwd`; fi
......
......@@ -26,7 +26,7 @@ envxmlold=@env_release_xml@
envxmlnew=$topdir/env/@env_xml_basename@
###echo envxmlold is $envxmlold
###echo envxmlnew is $envxmlnew
pythonExecutable=@PYTHON_EXECUTABLE@
pythonExecutable=@PYTHON_EXECUTABLE_REALPATH@
project=`basename $envxmlnew .xenv`
projsysold=`more $envxmlnew | grep variable=\"${project}SYS\" | tr "<" " " | tr ">" " " | awk '{print $3}'`
if [ -d $projsysold ]; then projsysold=`cd $projsysold; pwd`; fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment