From d2f39fd85d07bc426fab6979c4612131b7853d4f Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 8 Jul 2008 07:42:55 +0000 Subject: [PATCH] Merge from BR_QT4_Dev1 --- configure.ac | 4 ++-- src/KERNEL_PY/salome_test.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index ce460dfa2..8ff7688d2 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # ================================================================ # #AC_PREREQ(2.59) -AC_INIT([Salome2 Project], [4.1.3], [paul.rascle@edf.fr], [SalomeKer]) +AC_INIT([Salome2 Project], [5.0.0], [paul.rascle@edf.fr], [SalomeKer]) # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary # scripts such as config.guess, install-sh, ... @@ -14,7 +14,7 @@ AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([tar-pax]) #AC_CONFIG_HEADER([config.h]) -XVERSION=0x040103 +XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` AC_SUBST(XVERSION) # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) diff --git a/src/KERNEL_PY/salome_test.py b/src/KERNEL_PY/salome_test.py index d18c706e2..94d2b81f0 100755 --- a/src/KERNEL_PY/salome_test.py +++ b/src/KERNEL_PY/salome_test.py @@ -237,7 +237,10 @@ print ret smesh.Compute(mesh, box) sg.updateObjBrowser(1); -if sys.platform != "win32": +# SUPERVISOR module is not available since SALOME 5.0 version +defineSuperV = 0 + +if (defineSuperV != 0) & (sys.platform != "win32"): print print "============= Test Supervisor =============================" print -- 2.39.2