Porting to Qt4

diff --git a/SUIT.pro b/SUIT.pro
new file mode 100644 (file)
index 0000000..4b8f9ce
--- /dev/null
+++ b/SUIT.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS = src

diff --git a/adm_local/unix/config_files/check_qt.m4 b/adm_local/unix/config_files/check_qt.m4
index a02543283b8ebe0a7463e91d74fcd4e195da7f85..d0a5eee512cb6883406b677c5363a87a3e296f0e 100644 (file)
--- a/adm_local/unix/config_files/check_qt.m4
+++ b/adm_local/unix/config_files/check_qt.m4
@@ -147,23 +147,23 @@ then
 fi
 
 #
-# check lupdate presence (translation files compiler)
+# check lrelease presence (translation files compiler)
 #
 if  test "x$qt_ok" = "xyes"
 then
-  if test -f ${QTDIR}/bin/lupdate
+  if test -f ${QTDIR}/bin/lrelease
   then
-    LUPDATE=${QTDIR}/bin/lupdate
+    LRELEASE=${QTDIR}/bin/lrelease
   else
-    AC_PATH_PROG(LUPDATE, lupdate)
+    AC_PATH_PROG(LRELEASE, lrelease)
   fi
-  if test "x$LUPDATE" = "x"
+  if test "x$LRELEASE" = "x"
   then
     qt_ok=no
-    AC_MSG_RESULT(lupdate (Qt translation files compiler) is not in the PATH variable)
+    AC_MSG_RESULT(lrelease (Qt translation files compiler) is not in the PATH variable)
   else
     qt_ok=yes
-    AC_MSG_RESULT(lupdate (Qt translation files compiler) is found)
+    AC_MSG_RESULT(lrelease (Qt translation files compiler) is found)
   fi
 fi
 
@@ -285,7 +285,7 @@ AC_SUBST(QTDIR)
 AC_SUBST(MOC)
 AC_SUBST(UIC)
 AC_SUBST(QRCC)
-AC_SUBST(LUPDATE)
+AC_SUBST(LRELEASE)
 
 AC_SUBST(QT_ROOT)
 AC_SUBST(QT_INCLUDES)

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 16a5054e50f1554ec6b08f5e8cb8ef36474d3fdf..c4cf97577072badf34f5486121636ab5cb26263b 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -36,10 +36,10 @@ docdir             = $(datadir)/doc/@PACKAGE@
        $(MOC) $< -o $@
 
 # qm-files generation
-%.qm: resources/%.po
-       $(MSG2QM) $< $@
+%.qm: resources/%.ts
+       $(LRELEASE) $< -qm $@
 
-EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=resources/%.po)
+EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=resources/%.ts)
 
 mostlyclean-local:
        rm -f @builddir@/*_moc.cxx

diff --git a/configure.ac b/configure.ac
index d6ed63709998b621f1dbf5690ecb7024b7fc28ea..67d1d2b6fec01af8a1ed257ed4aaf72e8e151864 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,18 +9,21 @@
 #
 
 
-AC_INIT([Salome2 Project GUI module], [3.2.2], [gboulant@CS], [salome])
+AC_INIT([Salome2 Project GUI module], [4.0.0], [gboulant@CS], [salome])
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 
-PACKAGE=salome
-AC_SUBST(PACKAGE)
+#VSR: commented: this auto-variable is set automatically by AC_INIT
+#PACKAGE=salome
+#AC_SUBST(PACKAGE)
 
-VERSION=4.0.0
-XVERSION=0x040000
-AC_SUBST(VERSION)
+#VSR: commented: this auto-variable is set automatically by AC_INIT
+#VERSION=4.0.0
+#VSR: commented: calculate XVERSION from VERSION
+#XVERSION=0x040000
+XVERSION=`echo $VERSION | awk -F. '{if(NF>0){maj=$1}else{maj=0};if(NF>1){min=$2}else{min=0};if(NF>2){rel=$3}else{rel=0};printf("0x%02d%02d%02d",maj,min,rel)}'`
 AC_SUBST(XVERSION)
 
 # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
@@ -298,14 +301,6 @@ echo
 
 CHECK_QT
 
-echo
-echo ---------------------------------------------
-echo testing msg2qm
-echo ---------------------------------------------
-echo
-
-CHECK_MSG2QM
-
 echo
 echo ---------------------------------------------
 echo testing VTK
@@ -493,10 +488,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
+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 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
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 1f3b48948ee53ba509009e7d635752fe8867eb73..16e2b6763d85c04151418ed99165b7034c646bde 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,43 +24,82 @@
 #  Module : SALOME
 # $Header$
 
-SUBDIRS = Qtx Style DDS QDS SUIT STD CAF CAM SUITApp LogWindow ObjBrowser Prs
+# VSR: this is the original packages list
+#SUBDIRS = Qtx Style DDS QDS SUIT STD CAF CAM SUITApp LogWindow ObjBrowser Prs
+# VSR: already migrated to Qt4 packages
+SUBDIRS = Qtx SUIT STD SUITApp LogWindow
 
 if ENABLE_SALOMEOBJECT
-  SUBDIRS += OBJECT
+# VSR: this is the original packages list
+#  SUBDIRS += OBJECT
+# VSR: already migrated to Qt4 packages
+  SUBDIRS += 
 endif
 
 if ENABLE_GLVIEWER
-  SUBDIRS += GLViewer
+# VSR: this is the original packages list
+#  SUBDIRS += GLViewer
+# VSR: already migrated to Qt4 packages
+  SUBDIRS += 
 endif
 
 if ENABLE_VTKVIEWER
-  SUBDIRS += VTKViewer
+# VSR: this is the original packages list
+#  SUBDIRS += VTKViewer
+# VSR: already migrated to Qt4 packages
+  SUBDIRS += 
 if ENABLE_SALOMEOBJECT
-  SUBDIRS += SVTK
+# VSR: this is the original packages list
+#    SUBDIRS += SVTK
+# VSR: already migrated to Qt4 packages
+    SUBDIRS += 
 endif
 endif
 if ENABLE_OCCVIEWER
- SUBDIRS += OCCViewer
+# VSR: this is the original packages list
+#  SUBDIRS += OCCViewer
+# VSR: already migrated to Qt4 packages
+  SUBDIRS += 
 if ENABLE_SALOMEOBJECT
-  SUBDIRS += SOCC
+# VSR: this is the original packages list
+#    SUBDIRS += SOCC
+# VSR: already migrated to Qt4 packages
+    SUBDIRS += 
 endif
 endif
 if ENABLE_PYCONSOLE
-  SUBDIRS += PyInterp PythonConsole
+# VSR: this is the original packages list
+#  SUBDIRS += PyInterp PythonConsole
+# VSR: already migrated to Qt4 packages
+  SUBDIRS += PyInterp PyConsole
 endif
 if ENABLE_PLOT2DVIEWER
-  SUBDIRS += Plot2d
+# VSR: this is the original packages list
+#  SUBDIRS += Plot2d
+# VSR: already migrated to Qt4 packages
+  SUBDIRS += 
 if ENABLE_SALOMEOBJECT
-  SUBDIRS += SPlot2d
+# VSR: this is the original packages list
+#    SUBDIRS += SPlot2d
+# VSR: already migrated to Qt4 packages
+    SUBDIRS += 
 endif
 endif
 if ENABLE_SUPERVGRAPHVIEWER
-  SUBDIRS += SUPERVGraph
+# VSR: this is the original packages list
+#  SUBDIRS += SUPERVGraph
+# VSR: already migrated to Qt4 packages
+  SUBDIRS += 
 endif
-SUBDIRS += LightApp ResExporter
+# VSR: this is the original packages list
+#SUBDIRS += LightApp ResExporter
+# VSR: already migrated to Qt4 packages
+SUBDIRS += 
 
 if GUI_ENABLE_CORBA
-  SUBDIRS +=  RegistryDisplay TOOLSGUI \
-          Event Session SalomeApp SALOME_SWIG SALOME_PY SALOME_PYQT
+# VSR: this is the original packages list
+#  SUBDIRS +=  RegistryDisplay TOOLSGUI \
+#          Event Session SalomeApp SALOME_SWIG SALOME_PY SALOME_PYQT
+# VSR: already migrated to Qt4 packages
+  SUBDIRS += 
 endif