From: Sergey BELASH Date: Mon, 14 Apr 2014 12:05:05 +0000 (+0400) Subject: Linux environment script updated X-Git-Tag: V_0.1~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=70f196470184960d92ea546d2974dc651688cf9a;p=modules%2Fshaper.git Linux environment script updated --- diff --git a/eclipse.sh b/eclipse.sh index 3f1c9c832..76b880add 100644 --- a/eclipse.sh +++ b/eclipse.sh @@ -10,7 +10,7 @@ mkdir -p ${ROOT_DIR}/build cd ${ROOT_DIR}/build CMAKE_ARGS="-D_ECLIPSE_VERSION=4.3" -CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Debug" +CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Release" CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=ON" CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${ROOT_DIR}/install" CMAKE_ARGS="${CMAKE_ARGS} ${SRC_DIR}" diff --git a/linux_env.sh b/linux_env.sh index a84ae8b7c..2c3a9e612 100644 --- a/linux_env.sh +++ b/linux_env.sh @@ -1,8 +1,12 @@ #------ Setting products installation directory ------ -export INST_ROOT=/misc/dn21/hdfeditor/sbh/NewGeom/products + +# Find absolute path to ROOT_DIR +export ROOT_DIR=$(pwd)/.. +export ROOT_DIR=`cd "${ROOT_DIR}";pwd` +export PDIR=${ROOT_DIR}/products #------ Python ------ -export PYTHON_ROOT_DIR=${INST_ROOT}/Python-2.7.3 +export PYTHON_ROOT_DIR=${PDIR}/Python-2.7.3 export PYTHONHOME=${PYTHON_ROOT_DIR} export PYTHON_INCLUDE=${PYTHON_ROOT_DIR}/include/python2.7 export PYTHON_VERSION=2.7 @@ -14,45 +18,45 @@ export PYTHON_LIB_DIR=${PYTHON_ROOT_DIR}/lib export PYTHON_INC_DIR=${PYTHON_INCLUDE} ## #------ Qt ------ -export QT4_ROOT_DIR=${INST_ROOT}/qt-4.8.4 +export QT4_ROOT_DIR=${PDIR}/qt-4.8.4 export QT_PLUGIN_PATH=${QT4_ROOT_DIR}/plugins export PATH=${QT4_ROOT_DIR}/bin:${PATH} export LD_LIBRARY_PATH=${QT4_ROOT_DIR}/lib:${LD_LIBRARY_PATH} ## #------ boost ------ -#export BOOST_ROOT_DIR=${INST_ROOT}/boost-1.52.0 +#export BOOST_ROOT_DIR=${PDIR}/boost-1.52.0 #export LD_LIBRARY_PATH ${BOOST_ROOT_DIR}/lib ## #------ swig ------ -export SWIG_ROOT_DIR=${INST_ROOT}/swig-2.0.8 +export SWIG_ROOT_DIR=${PDIR}/swig-2.0.8 export SWIG_LIB=${SWIG_ROOT_DIR}/share/swig/2.0.8 export PATH=${SWIG_ROOT_DIR}/bin:${PATH} ## #------ cmake ------ -export CMAKE_ROOT_DIR=${INST_ROOT}/cmake-2.8.10.2 +export CMAKE_ROOT_DIR=${PDIR}/cmake-2.8.10.2 export PATH=${CMAKE_ROOT_DIR}/bin:${PATH} ## #------ freetype ------ -export FREETYPE_ROOT_DIR=${INST_ROOT}/freetype-2.4.11 +export FREETYPE_ROOT_DIR=${PDIR}/freetype-2.4.11 export LD_LIBRARY_PATH=${FREETYPE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} ## #------ freeimage ------ -export FREEIMAGE_ROOT_DIR=${INST_ROOT}/freeimage-3.15.4 +export FREEIMAGE_ROOT_DIR=${PDIR}/freeimage-3.15.4 export PATH=${FREEIMAGE_ROOT_DIR}/bin:${PATH} export LD_LIBRARY_PATH=${FREEIMAGE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} ## #------ gl2ps ------ -export GL2PS_ROOT_DIR=${INST_ROOT}/gl2ps-1.3.8 +export GL2PS_ROOT_DIR=${PDIR}/gl2ps-1.3.8 export PATH=${GL2PS_ROOT_DIR}/bin:${PATH} export LD_LIBRARY_PATH=${GL2PS_ROOT_DIR}/lib:${LD_LIBRARY_PATH} ## #------ tbb ------ -export TBB_ROOT_DIR=${INST_ROOT}/tbb-30_018oss +export TBB_ROOT_DIR=${PDIR}/tbb-30_018oss export PATH=${TBB_ROOT_DIR}/bin/intel64/cc4.1.0_libc2.4_kernel2.6.16.21:${PATH} export LD_LIBRARY_PATH=${TBB_ROOT_DIR}/lib/intel64/cc4.1.0_libc2.4_kernel2.6.16.21:${LD_LIBRARY_PATH} ## #------ libxml2 ------ -export LIBXML2_ROOT_DIR=${INST_ROOT}/libxml2-2.9.0 +export LIBXML2_ROOT_DIR=${PDIR}/libxml2-2.9.0 export PATH=${LIBXML2_ROOT_DIR}/bin:${PATH} export LD_LIBRARY_PATH=${LIBXML2_ROOT_DIR}/lib:${LD_LIBRARY_PATH} # DO NOT rename following 3 variables, @@ -62,7 +66,7 @@ export LIBXML2_LIB_DIR=${LIBXML2_ROOT_DIR}/lib export LIBXML2_BIN_DIR=${LIBXML2_ROOT_DIR}/bin ## #------ OCCT ------ -export CAS_ROOT_DIR=${INST_ROOT}/OCCT-6.7.0 +export CAS_ROOT_DIR=${PDIR}/OCCT-6.7.0 export PATH=${CAS_ROOT_DIR}:${CAS_ROOT_DIR}/bin:${PATH} export LD_LIBRARY_PATH=${CAS_ROOT_DIR}:${CAS_ROOT_DIR}/lib:${LD_LIBRARY_PATH} @@ -83,5 +87,7 @@ export CASROOT=${CAS_ROOT_DIR} ## export LIB=${LD_LIBRARY_PATH} -export PATH=${INST_ROOT}/../install/bin:${PATH} -export LD_LIBRARY_PATH=${INST_ROOT}/../install/bin:${INST_ROOT}/../install/swig:${LD_LIBRARY_PATH} +export INST_DIR=${ROOT_DIR}/install +export PATH=${INST_DIR}/bin:${INST_DIR}/plugins:${PATH} +export LD_LIBRARY_PATH=${INST_DIR}/bin:${INST_DIR}/swig:${LD_LIBRARY_PATH} +export NEW_GEOM_CONFIG_FILE=${INST_DIR}/plugins diff --git a/msvc10_env.bat b/msvc10_env.bat index 670d4400c..a21fa9f5e 100644 --- a/msvc10_env.bat +++ b/msvc10_env.bat @@ -128,8 +128,6 @@ set PATH=%CMAKEDIR%\bin;%PATH% @SET PATH=%BOOST_ROOT_DIR%\lib;%PATH% @REM ------------------------- -@SET PATH=D:\NewGEOM\build-eclipse\bin;%PATH% - @SET NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins @SET PATH=%ROOT_DIR%\install\plugins;%PATH%