Merging from the BR_V5_DEV branch.

diff --git a/GUI_version.h.in b/GUI_version.h.in
index 9a5df78eb6f66e73f76dad717af0d82a48db4b23..ca6285403f07844885cb0d352299ad44f2df1c2e 100644 (file)
--- a/GUI_version.h.in
+++ b/GUI_version.h.in
@@ -17,9 +17,9 @@
 //
 // See http://www.salome-platform.org/
 //
-//  File   : GUI_version.h
-//  Author : Vadim SANDLER
-//  Module : SALOME
+// File   : GUI_version.h
+// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
+//
 
 #if !defined(__GUI_VERSION_H__)
 #define __GUI_VERSION_H__

diff --git a/Makefile.am b/Makefile.am
index 62e21b1b5c7e9a8475073ba41e36d6eb4009ba92..728722e717d9e0e5fd8fba0e07bed9e9d093aafb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,9 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
+ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
+                  -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+
 if GUI_ENABLE_CORBA
     IDLDIR = idl
 else !GUI_ENABLE_CORBA
@@ -37,11 +40,11 @@ DIST_SUBDIRS = idl adm_local resources src doc bin
 
 DISTCLEANFILES = a.out aclocal.m4 configure
 
-salomeinclude_DATA=GUI_version.h
+salomeinclude_DATA = GUI_version.h
 
-EXTRA_DIST+= \
-       build_configure \
-       clean_configure \
+EXTRA_DIST +=          \
+       build_configure \
+       clean_configure \
        LICENCE
 
 dist-hook:
@@ -50,7 +53,7 @@ dist-hook:
 usr_docs:
        (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
 
-docs:usr_docs
+docs: usr_docs
 
 dev_docs:
        (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs)

diff --git a/SUIT.pro b/SUIT.pro
index f6ce446371b1f7ce121adc99ff68e03364459c30..00634c6cf44ec8657e32896ce74025a6ee0d028a 100644 (file)
--- a/SUIT.pro
+++ b/SUIT.pro
@@ -7,6 +7,7 @@ SUBDIRS = src/Qtx \
           src/SUIT \
           src/SUITApp \
           src/LogWindow \
+          src/Event \
           src/PyInterp \
           src/PyConsole \
          src/Plot2d \

diff --git a/build_configure b/build_configure
index 733a8cea69bde22bdb1fcec1f67a5be6fd7dfb71..ef97954dd1fc952b2464a57efa1148956ee57c9f 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -53,8 +53,8 @@ cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix
 #   autom4te.cache (directory)
 echo "====================================================== aclocal"
 
-aclocal -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
-        -I adm_local/unix/config_files  || exit 1
+aclocal -I adm_local/unix/config_files \
+        -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1
 
 # ____________________________________________________________________
 # libtoolize creates some configuration files (ltmain.sh,

diff --git a/configure.ac b/configure.ac
index a1ec14bbfe5b913f1e5638e2ae03f14d3ebb88a0..4d86c95fa7eb62a6fc881dceafcfa7346b86f4be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,9 +5,8 @@
 # Modified by : Marc Tajchman (CEA)
 # Modified by : Mikhail PONIKAROV (OCN) - autotools usage
 #
-# Created from configure.in.base
-#
-AC_INIT([Salome2 Project GUI module], [4.1.1], [webmaster.salome@opencascade.com], [salome])
+
+AC_INIT([Salome2 Project GUI module], [5.0.0], [webmaster.salome@opencascade.com], [SalomeGUI])
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -82,7 +81,9 @@ if test "x${enable_qxGraphViewer}" != "xno" ; then
 else 
     DISABLE_QXGRAPHVIEWER="yes"
 fi
-
+dnl THIS IS A TEMPORARY SOLUTION BECAUSE QXGRAPH NOT YET PORTING TO QT4
+dnl AFTER PORTING QXGARPH TO QT4 THE STRING BELOW HAVE TO BE REMOVED
+DISABLE_QXGRAPHVIEWER="yes"
 
 dnl
 dnl Initialize source and build root directories
@@ -297,14 +298,6 @@ echo
 
 CHECK_QT
 
-echo
-echo ---------------------------------------------
-echo testing msg2qm
-echo ---------------------------------------------
-echo
-
-CHECK_MSG2QM
-
 echo
 echo ---------------------------------------------
 echo testing VTK
@@ -361,6 +354,8 @@ echo
 
 CHECK_QWT
 
+CHECK_TESTRECORDER
+
 echo
 echo ---------------------------------------------
 echo Testing PyConsole
@@ -462,10 +457,12 @@ if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then
     echo "failed : for full configuration of GUI module necessary enable SalomeObject !"
     exit
   fi
-  if test "x${DISABLE_QXGRAPHVIEWER}" == "xyes" ; then
-    echo "failed : for full configuration of GUI module necessary enable QxGraphViewer !"
-    exit
-  fi
+  dnl THIS IS A TEMPORARY SOLUTION BECAUSE QXGRAPH NOT YET PORTING TO QT4
+  dnl AFTER PORTING QXGARPH TO QT4 THE FOLLOWING CHECK HAVE TO BE UNCOMMENTED
+  dnl if test "x${DISABLE_QXGRAPHVIEWER}" == "xyes" ; then
+  dnl   echo "failed : for full configuration of GUI module necessary enable QxGraphViewer !"
+  dnl   exit
+  dnl fi
 fi
 
 echo
@@ -513,10 +510,10 @@ fi
 
 
 if test "$GUI_DISABLE_CORBA" != "yes"; then
-variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok msg2qm_ok vtk_ok hdf5_ok
-omniORB_ok boost_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok Kernel_ok"
+variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok
+omniORB_ok boost_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok libxml_ok Kernel_ok"
 else
-variables="cc_ok lex_yacc_ok python_ok threads_ok OpenGL_ok qt_ok msg2qm_ok vtk_ok hdf5_ok boost_ok
+variables="cc_ok lex_yacc_ok python_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok boost_ok
 occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok Kernel_ok"
 fi
 
@@ -527,7 +524,7 @@ do
 done
 
 echo "---Optional:"
-variables="cppunit_ok"
+variables="cppunit_ok TestRecorder_ok"
 
 for var in $variables
 do
@@ -561,32 +558,7 @@ AM_CONDITIONAL(ENABLE_OCCVIEWER, [test "$DISABLE_OCCVIEWER" = no])
 AM_CONDITIONAL(ENABLE_VTKVIEWER, [test "$DISABLE_VTKVIEWER" = no])
 AM_CONDITIONAL(ENABLE_SALOMEOBJECT, [test "$DISABLE_SALOMEOBJECT" = no])
 AM_CONDITIONAL(ENABLE_QXGRAPHVIEWER, [test "$DISABLE_QXGRAPHVIEWER" = no])
-
-echo
-echo ---------------------------------------------
-echo copying resource files, shell scripts, and
-echo xml files
-echo ---------------------------------------------
-echo
-
-
-dnl copy shells and utilities contained in the bin directory
-dnl excluding .in files (treated in AC-OUTPUT below) and CVS
-dnl directory
-
-mkdir -p bin/salome
-cd bin/salome
-
-for i in $ROOT_SRCDIR/bin/*
-do
-  local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
-  case "$local_bin" in
-        *.in | *~)                    ;;
-        ./bin/CVS | ./bin/salome)                    ;;
-        *) $INSTALL $i . ; echo $local_bin ;;
-  esac
-done
-cd $ROOT_BUILDDIR
+AM_CONDITIONAL(ENABLE_TESTRECORDER, [test "$DISABLE_TESTRECORDER" = no])
 
 echo
 echo ---------------------------------------------
@@ -594,10 +566,10 @@ echo generating Makefiles and configure files
 echo ---------------------------------------------
 echo
 
-AC_OUTPUT_COMMANDS([ \
-  chmod +x ./bin/*; \
-  chmod +x ./bin/salome/*; \
-])
+#AC_OUTPUT_COMMANDS([ \
+#  chmod +x ./bin/*; \
+#  chmod +x ./bin/salome/*; \
+#])
 
 # This list is initiated using autoscan and must be updated manually
 # when adding a new file <filename>.in to manage. When you execute
@@ -614,9 +586,9 @@ AC_OUTPUT([ \
   ./doc/Makefile \
   ./doc/salome/Makefile \
   ./doc/salome/gui/Makefile \
-  ./doc/salome/gui/GUI/doxyfile \
+  ./doc/salome/gui/doxyfile \
   ./doc/salome/tui/Makefile \
-  ./doc/salome/tui/GUI/doxyfile \
+  ./doc/salome/tui/doxyfile \
   ./src/Makefile \
   ./src/CASCatch/Makefile \
   ./src/Qtx/Makefile \
@@ -638,14 +610,13 @@ AC_OUTPUT([ \
   ./src/OCCViewer/Makefile \
   ./src/SOCC/Makefile \
   ./src/PyInterp/Makefile \
-  ./src/PythonConsole/Makefile \
+  ./src/PyConsole/Makefile \
   ./src/Plot2d/Makefile \
   ./src/SPlot2d/Makefile \
   ./src/SUPERVGraph/Makefile \
   ./src/QxGraph/Makefile \
   ./src/LightApp/Makefile \
   ./src/ResExporter/Makefile \
-  ./src/RegistryDisplay/Makefile \
   ./src/TOOLSGUI/Makefile \
   ./src/Event/Makefile \
   ./src/Session/Makefile \
@@ -657,7 +628,6 @@ AC_OUTPUT([ \
   ./src/SALOME_PY/Makefile \
   ./src/SALOME_PYQT/Makefile \
   ./src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile \
-  ./src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_SipDefs.h \
   ./src/SALOME_PYQT/SalomePyQt/Makefile \
   ./resources/Makefile \
   ./idl/Makefile \