Some updates in environment

diff --git a/env.sh b/env.sh
index 25e315873c04fb5d8baba23756bb6bb2ea5acede..55c6be7d3303d8d11c817e3fdcc5c8f0204bb717 100644 (file)
--- a/env.sh
+++ b/env.sh
@@ -11,7 +11,7 @@ export AUT_DIR=$(pwd)
 export TOOLS_DIR=$(pwd)
 
 export HOME_OLD=$HOME
-source /dn64/series8x/work/init.sh 2016-12-22
+source /dn64/series8x/work/init.sh 2016-12-26
 export HOME=$HOME_OLD
 
 # Path to solvespace-2

diff --git a/env_Salome.bat b/env_Salome.bat
index 996b0c07c668a33289ceb449f762b10712f8773e..416599222e367fb8522d2239306d4ec69da973ac 100644 (file)
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -40,10 +40,10 @@ if "%BOOST_ROOT_DIR%" == "" (
   )
 )
 
-cd %SALOME_ROOT_DIR%\WORK
+cd /d %SALOME_ROOT_DIR%\WORK
 call set_env.bat %1
 call "%PDIR%\env_compile.bat"
-cd %ROOT_DIR%
+cd /d %ROOT_DIR%
 
 @REM -------------------------
 @REM Python

diff --git a/env_linux.sh b/env_linux.sh
index e75fec9c530f14e3a3b15c3aa4d550bc3cc173b0..5fad007a8485d1f71939910f7e367da2fa8add0f 100644 (file)
--- a/env_linux.sh
+++ b/env_linux.sh
@@ -52,5 +52,5 @@ export PATH=${CASROOT}:${PATH}
 
 #------ SHAPER ------
 export PATH=${SHAPER_ROOT_DIR}/bin/salome:${PATH}
-export PYTHONPATH=${SHAPER_ROOT_DIR}/bin/salome:${PYTHONPATH}
+export PYTHONPATH=${SHAPER_ROOT_DIR}/bin/salome:${SHAPER_ROOT_DIR}/lib/python2.7/site-packages/salome:${PYTHONPATH}
 export LD_LIBRARY_PATH=${SHAPER_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}

diff --git a/salomeRun_deb.bat b/salomeRun_deb.bat
index 85fcc0fd2de0d6cda9e43c6162713fbcc3801852..75015844b2dcaa67bf0f2e862bec112959c9ffb0 100644 (file)
--- a/salomeRun_deb.bat
+++ b/salomeRun_deb.bat
@@ -6,5 +6,4 @@ call env_Salome.bat d
 @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
 @SET SalomeAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui
 
-echo %PYTHONPATH%
 start %PYTHONBIN% "%KERNEL_ROOT_DIR%\bin\salome\envSalome.py" "%PYTHONBIN%" "%KERNEL_ROOT_DIR%\bin\salome\runSalome.py" %*