X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FGUI_BIN.sh;h=a7bc60661cc7c50ab82fdeb7995960a3b8b49068;hb=32d2fa76852104794187a7ba6f6bf62b3e87ac1b;hp=979c890274a8bf6dc5f743139d9e061d4339e616;hpb=eac723b794cbc35686079552f16b7b68792578be;p=tools%2Finstall.git diff --git a/config_files/GUI_BIN.sh b/config_files/GUI_BIN.sh index 979c890..a7bc606 100755 --- a/config_files/GUI_BIN.sh +++ b/config_files/GUI_BIN.sh @@ -5,7 +5,7 @@ if [ -n "${GUI_ROOT_DIR}" ]; then check_lib_version VERSION ${GUI_ROOT_DIR}/bin/salome if [ "$?" -eq "0" ]; then ver=`cat ${GUI_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` - if [ "$ver" = "3.1.0a2" ]; then + if [ "$ver" = "3.2.0b1" ]; then return 0 fi fi @@ -22,6 +22,8 @@ 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 ## @@ -42,6 +44,8 @@ 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 ## @@ -67,10 +71,11 @@ install_binary() make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} source ${INSTALL_WORK}/$SHRC -check_jb tar xfz ${SOURCE_DIR}/GUIbinariesV3.1.0a2.tar.gz -C ${INSTALL_ROOT} +check_jb tar xfz ${SOURCE_DIR}/GUIbinariesV3.2.0b1.tar.gz -C ${INSTALL_ROOT} -# remove all *.la files -rm -rf ${PRODUCT_DIR}/lib/salome/*.la +# modify all *.la files +export GUI_ROOT_DIR=${PRODUCT_DIR} +modif_la_files ${PRODUCT_DIR} print_env } @@ -81,7 +86,7 @@ export SOURCE_DIR=$3; export INSTALL_ROOT=$4; export PRODUCT_SEQUENCE=$5; if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="GUIBin" ; fi -export PRODUCT="GUI_3.1.0a2" +export PRODUCT="GUI_3.2.0b1" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh