Join modifications from branch OCC_debug_for_3_2_0b1

diff --git a/Makefile.in b/Makefile.in
index 48b723cd1a112a188b9b119130d6948107009e76..88ff5cc4c5bc198b7f290097a9d6d102d120ebaf 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 # -* Makefile *- 
 #
 # Author : C. Caremoli
@@ -16,7 +34,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
 SUBDIRS = idl src adm_local
 
 RESOURCES_FILES = CALCULATORCatalog.xml CALCULATOR.png CALCULATOR_en.xml \
-                  ExecCALCULATOR.png config
+                  ExecCALCULATOR.png config SalomeApp.xml
 
 BIN_SCRIPT= VERSION runAppli myrunSalome.py
 

diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in
index 9b5e810db5609f348cfc90502d69bd7da12b084f..40cecedb639bcd74fe032f2c3a4c68cd83c4dd17 100644 (file)
--- a/adm_local/Makefile.in
+++ b/adm_local/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 # source path
 top_srcdir=@top_srcdir@
 top_builddir=..

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 79cded1cfe0edbfd0ed6f8f411bad7b862860bc9..ee10727ba01ae68f49e7de2ae4da6a1069944b74 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -224,7 +224,13 @@ all:
 Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in
        cd $(top_builddir) ; ./config.status
 
-$(top_builddir)/config.status: $(top_srcdir)/configure
+LOCAL_MAKE = make_commence make_omniorb
+
+KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript
+
+$(top_builddir)/config.status: $(top_srcdir)/configure \
+                              $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \
+                              $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in)
        cd $(top_builddir) ; ./config.status --recheck
 
 # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-)
@@ -239,7 +245,7 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
        cd $(top_srcdir) && ./build_configure
 
 
-ACLOCAL_SRC = \
+ACLOCAL_KERNEL = \
 ac_cxx_bool.m4                    check_corba.m4                       \
 ac_cxx_depend_flag.m4             check_hdf5.m4      enable_pthreads.m4        \
 ac_cxx_mutable.m4                 check_mico.m4      libtool.m4                \
@@ -254,9 +260,9 @@ check_GUI.m4                      check_corba_in_GUI.m4
 
 ACLOCAL_MED =                     check_Med.m4       check_Med2.m4
 
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
                           $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) \
                          $(ACLOCAL_MED:%=@MED_ROOT_DIR@/adm_local/unix/config_files/%)
-       cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
+       cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
                                                                       -I @GUI_ROOT_DIR@/adm_local/unix/config_files \
                                                                       -I @MED_ROOT_DIR@/adm_local/unix/config_files

diff --git a/bin/VERSION b/bin/VERSION
index de44de965b8e58a771536fce28dccfddf5393d02..4d562dae48b3999350ca373104e4d5d2144a34dc 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1,2 +1,2 @@
-SALOME 2 EXEMPLE MODULE C++ - CALCULATOR VERSION: 3.2.0a2
-This module works with KERNEL 3.2.0a2
+SALOME 2 EXEMPLE MODULE C++ - CALCULATOR VERSION: 3.2.0b1
+This module works with KERNEL 3.2.0b1

diff --git a/bin/myrunSalome.py b/bin/myrunSalome.py
index 28f3f0bb9f4365d12c4137cb10a0b14c0d7411d1..c430ebeaf9b4d1f6e64dffb2b4f01a45c20368f9 100755 (executable)
--- a/bin/myrunSalome.py
+++ b/bin/myrunSalome.py
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 #!/usr/bin/env python
 
 def test(clt):

diff --git a/build_configure b/build_configure
index 209885f42dd6b9499bc49d1c4cec48ec382015b4..ca1383fe3894b9e46365fde6bea3ff67964fc936 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -138,9 +138,9 @@ echo "./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
 echo "./salome_adm/unix/F77config.h \\" >> configure.in_tmp1
 echo "./salome_adm/unix/sstream \\" >> configure.in_tmp1
 echo "./salome_adm/unix/depend \\" >> configure.in_tmp1
-echo "./adm_local/unix/make_omniorb \\" >> configure.in_tmp1
+echo "./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1
 echo "./salome_adm/unix/envScript \\" >> configure.in_tmp1
-echo "./adm_local/unix/make_commence \\" >> configure.in_tmp1
+echo "./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1
 echo "./salome_adm/unix/make_conclude \\" >> configure.in_tmp1
 echo "./salome_adm/unix/make_module \\" >> configure.in_tmp1
 

diff --git a/idl/CALCULATOR_Gen.idl b/idl/CALCULATOR_Gen.idl
index 6cc3087f3b3b2ea87943b2f6d50741c0bc1c8c3a..30fd926325bb550a21ee8261aa21bbfb75c871aa 100644 (file)
--- a/idl/CALCULATOR_Gen.idl
+++ b/idl/CALCULATOR_Gen.idl
@@ -1,3 +1,21 @@
+// Copyright (C) 2005  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/
+//
 #ifndef __CALCULATOR_GEN__
 #define __CALCULATOR_GEN__
 /*!

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 0feff6b62cd4458f3d81b49cbaf43f8d7462b4a8..bca770e88e560af2f92d86e338defbf2449100fd 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 #
 # generate dependencies for idl file :
 #

diff --git a/resources/CALCULATORCatalog.xml b/resources/CALCULATORCatalog.xml
index 8e57e9e784e15301b390c8e6c55bd041ae2bbea2..b4461e7ccdf1dbb58dc93b65e09b2b1482623ed1 100644 (file)
--- a/resources/CALCULATORCatalog.xml
+++ b/resources/CALCULATORCatalog.xml
@@ -8,7 +8,7 @@
             <component-username>CALCULATOR</component-username>
             <component-type>MED EXAMPLE</component-type>
             <component-author>crouzet</component-author>
-            <component-version>3.2.0a2</component-version>
+            <component-version>3.2.0b1</component-version>
             <component-comment>unknown</component-comment>
             <component-multistudy>1</component-multistudy>
             <component-icone>CALCULATOR.png</component-icone>

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
new file mode 100644 (file)
index 0000000..98b146d
--- /dev/null
+++ b/resources/SalomeApp.xml
@@ -0,0 +1,11 @@
+<document>
+  <section name="CALCULATOR">
+    <!-- Major module parameters -->
+    <parameter name="name" value="Calculator"/>
+    <parameter name="icon" value="CALCULATOR.png"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="CALCULATOR" value="${CALCULATOR_ROOT_DIR}/share/salome/resources"/>
+  </section>
+</document>

diff --git a/src/CALCULATOR/CALCULATOR.cxx b/src/CALCULATOR/CALCULATOR.cxx
index 31b4c62b36e94d07c25aa1c0c9f6dc3d11ed703a..e790e22202bf8c9ad403c4a854031adcb58c7d7e 100644 (file)
--- a/src/CALCULATOR/CALCULATOR.cxx
+++ b/src/CALCULATOR/CALCULATOR.cxx
@@ -1,3 +1,21 @@
+// Copyright (C) 2005  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/
+//
 #include "CALCULATOR.hxx"
 #include "FIELDClient.hxx"
 #include "MESHClient.hxx"

diff --git a/src/CALCULATOR/CALCULATOR.hxx b/src/CALCULATOR/CALCULATOR.hxx
index 960c1b666dd58ec5b03e4e916a7ffaf8f6c9f7c9..d2b1d1e2dfc2ccd77e8d934c6f967360ed1d1be3 100644 (file)
--- a/src/CALCULATOR/CALCULATOR.hxx
+++ b/src/CALCULATOR/CALCULATOR.hxx
@@ -1,3 +1,21 @@
+// Copyright (C) 2005  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/
+//
 #ifndef _CALCULATOR_HXX_
 #define _CALCULATOR_HXX_
 

diff --git a/src/CALCULATOR/CALCULATOR_TEST.py b/src/CALCULATOR/CALCULATOR_TEST.py
index 994e24a2f5246dc35d16c1f2ff53ccc37a18379f..656f35e3c1584ee0a88d7c3da6efc7dc78e82c84 100644 (file)
--- a/src/CALCULATOR/CALCULATOR_TEST.py
+++ b/src/CALCULATOR/CALCULATOR_TEST.py
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 from omniORB import CORBA
 
 import salome

diff --git a/src/CALCULATOR/Makefile.in b/src/CALCULATOR/Makefile.in
index 63b00f6c72d4327b454ef413282b58f3a93d1357..dae1f3020233f18a41cf3e7769f38814709e18b4 100644 (file)
--- a/src/CALCULATOR/Makefile.in
+++ b/src/CALCULATOR/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 # source path
 top_srcdir=@top_srcdir@
 top_builddir=../..

diff --git a/src/CALCULATOR/graphe1.py b/src/CALCULATOR/graphe1.py
index 0b0981066e68b86830f0d22b1829b8d02903ba47..d0064ae03eb01f48ba6959ff6f7fdf9f50c719b5 100644 (file)
--- a/src/CALCULATOR/graphe1.py
+++ b/src/CALCULATOR/graphe1.py
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 
 # Generated python file of Graph aNewDataFlow
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 96c90282371d621d2cedc26f1ce97904f049c9e9..247167caa36960b0feee04602a0ca6ebaf079a3c 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/
+#
 #==============================================================================
 #  File      : Makefile.in
 #  Created   : ven déc  7 13:32:20 CET 2001