From 70ca510811de88336988f8503a81eb638a784c62 Mon Sep 17 00:00:00 2001 From: crouzet Date: Tue, 13 Dec 2005 16:06:16 +0000 Subject: [PATCH] environment variable name normalization --- scripts/hxx2salome | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/hxx2salome b/scripts/hxx2salome index c343ee0..c7a25a3 100755 --- a/scripts/hxx2salome +++ b/scripts/hxx2salome @@ -142,8 +142,8 @@ create_component_tree() get_info_makefile() { - makefile_lib="-L\${${CLASS_NAME}_CPP_ROOT}${lib_dir#${CPP_ROOT_DIR}} -l${lib_file}" - makefile_include="-I\${${CLASS_NAME}_CPP_ROOT}${hxx_dir#${CPP_ROOT_DIR}}" + makefile_lib="-L\${${CLASS_NAME}CPP_ROOT_DIR}${lib_dir#${CPP_ROOT_DIR}} -l${lib_file}" + makefile_include="-I\${${CLASS_NAME}CPP_ROOT_DIR}${hxx_dir#${CPP_ROOT_DIR}}" echo -e "\nlinking option : $makefile_lib" echo -e "include option : $makefile_include" @@ -288,8 +288,8 @@ update_environment() then echo -e "###\n#------ ${CLASS_NAME}-Bin ------" >> ${ENVIRON_FILE} echo -e "setenv ${CLASS_NAME}_ROOT_DIR \${${CLASS_NAME}_BASE}/${CLASS_NAME}_INSTALL" >> ${ENVIRON_FILE} - echo -e "setenv ${CLASS_NAME}_CPP_ROOT ${CPP_ROOT_DIR}" >> ${ENVIRON_FILE} - echo -e "setenv LD_LIBRARY_PATH \${${CLASS_NAME}_CPP_ROOT}${lib_dir#${CPP_ROOT_DIR}}:\${LD_LIBRARY_PATH}" >> ${ENVIRON_FILE} + echo -e "setenv ${CLASS_NAME}CPP_ROOT_DIR ${CPP_ROOT_DIR}" >> ${ENVIRON_FILE} + echo -e "setenv LD_LIBRARY_PATH \${${CLASS_NAME}CPP_ROOT_DIR}${lib_dir#${CPP_ROOT_DIR}}:\${LD_LIBRARY_PATH}" >> ${ENVIRON_FILE} fi fi if [ "${SHELL_EXT}" == "sh" ] @@ -309,8 +309,8 @@ update_environment() then echo -e "###\n#------ ${CLASS_NAME}-Bin ------" >> ${ENVIRON_FILE} echo -e "export ${CLASS_NAME}_ROOT_DIR=\${${CLASS_NAME}_BASE}/${CLASS_NAME}_INSTALL" >> ${ENVIRON_FILE} - echo -e "export ${CLASS_NAME}_CPP_ROOT=${CPP_ROOT_DIR}" >> ${ENVIRON_FILE} - echo -e "export LD_LIBRARY_PATH=\${${CLASS_NAME}_CPP_ROOT}${lib_dir#${CPP_ROOT_DIR}}:\${LD_LIBRARY_PATH}" \ + echo -e "export ${CLASS_NAME}CPP_ROOT_DIR=${CPP_ROOT_DIR}" >> ${ENVIRON_FILE} + echo -e "export LD_LIBRARY_PATH=\${${CLASS_NAME}CPP_ROOT_DIR}${lib_dir#${CPP_ROOT_DIR}}:\${LD_LIBRARY_PATH}" \ >> ${ENVIRON_FILE} fi @@ -517,7 +517,7 @@ create_component_tree # update_environment export `echo ${CLASS_NAME}`_ROOT_DIR=${NEW_COMPONENT_ROOT_DIR} # to avoid resource env for compiling and launching salome -export `echo ${CLASS_NAME}`_CPP_ROOT=${CPP_ROOT_DIR} # idem +export `echo ${CLASS_NAME}`CPP_ROOT_DIR=${CPP_ROOT_DIR} # idem # # ---------------------- Copy the generated source from temp dir ------------------------------------------- # -- 2.39.2