Join modifications from branch OCC_debug_for_3_2_0b1

diff --git a/INSTALL b/INSTALL
index da8e8c894f5dda4d2988c365449c66eb0e9e91ea..1f0e9e0a1d9281b09550efaf821b5cd2f8007596 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-This is the version 3.2.0a2 of COMPONENT
+This is the version 3.2.0b1 of COMPONENT
 Compatible with :
-       - KERNEL 3.2.0a2
-       - SALOMEGUI 3.2.0a2
+       - KERNEL 3.2.0b1
+       - SALOMEGUI 3.2.0b1

diff --git a/Makefile.in b/Makefile.in
index 2c0b562c19aa1c09cee54d9527d88da3c3744782..a7e9f459c230b492bf482993bf4ea08cae8b4deb 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 = \
-       COMPONENTCatalog.xml
+       COMPONENTCatalog.xml SalomeApp.xml
 
 BIN_SCRIPT= VERSION
 

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 9d94dad7dbe53623433aefd8c900740a22a435dc..ec0f49a0470cfe33780f486b61d2054cc73213c1 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -236,7 +236,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_conclude make_omniorb
+
+KERNEL_MAKE = make_module 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 :-)
@@ -251,7 +257,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                \
@@ -266,10 +272,10 @@ check_GUI.m4                      check_corba_in_GUI.m4
 
 ACLOCAL_MED =                     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
-                                                                      
\ No newline at end of file
+                                                                      

diff --git a/bin/VERSION b/bin/VERSION
index f5efbeca071a53d25311b3fc5c642508fcb16dd9..196bfd1e27cdd8364280e6d0b0d860f9e2159ac9 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME - COMPONENT VERSION: 3.2.0a2
+THIS IS SALOME - COMPONENT VERSION: 3.2.0b1

diff --git a/build_configure b/build_configure
index 8dc1b2dbf325381acbcc5a7c0b9bbb5e83e05bb6..d67de2703f876b10da78692b2d2544ec7eb01d80 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -146,7 +146,7 @@ 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 " ./salome_adm/unix/make_module \\" >> configure.in_tmp1
 
@@ -156,8 +156,8 @@ echo "      ./salome_adm/unix/make_module \\" >> configure.in_tmp1
 # salome_adm, par le make_conclude (resp. make_commence) du module,
 # c'est à dire le make_conclude (resp. make_commence) du répertoire
 # adm_local
-echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1
-echo " ./adm_local/unix/make_conclude \\" >> configure.in_tmp1
+echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1
+echo " ./adm_local/unix/make_conclude:${ABS_CONF_DIR}/adm_local/unix/make_conclude.in \\" >> configure.in_tmp1
 
 \rm -f configure.in_tmp2 configure.in_tmp3
 touch configure.in_tmp2

diff --git a/idl/Makefile.in b/idl/Makefile.in
index def42ac1e02e7b1489f3a05bb7a9f60f8b4ecf0b..4b6ccb1157c16ba6a0f271880a84754d661a398b 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/COMPONENTCatalog.xml b/resources/COMPONENTCatalog.xml
index d73bdeba5417f87923800d377b200cccf3a08749..079f4d23694e70aa0482177d19f8a46221049af4 100644 (file)
--- a/resources/COMPONENTCatalog.xml
+++ b/resources/COMPONENTCatalog.xml
@@ -16,7 +16,7 @@
                <component-username>AddComponent</component-username>
                <component-type>SuperVisionTest</component-type>
                <component-author>MTJ</component-author>
-               <component-version>3.2.0a2</component-version>
+               <component-version>3.2.0b1</component-version>
                <component-comment>SuperVision test: Addition</component-comment>
                <component-multistudy>0</component-multistudy>
                <component-impltype>1</component-impltype>
@@ -479,7 +479,7 @@
                <component-username>AdditionComponent</component-username>
                <component-type>SuperVisionTest</component-type>
                <component-author>JR</component-author>
-               <component-version>3.2.0a2</component-version>
+               <component-version>3.2.0b1</component-version>
                <component-comment>SuperVision test: Addition</component-comment>
                <component-multistudy>0</component-multistudy>
                <component-impltype>1</component-impltype>
@@ -942,7 +942,7 @@
                <component-username>SubComponent</component-username>
                <component-type>SuperVisionTest</component-type>
                <component-author>MTJ</component-author>
-               <component-version>3.2.0a2</component-version>
+               <component-version>3.2.0b1</component-version>
                <component-comment>SuperVision test: Subtraction</component-comment>
                <component-multistudy>0</component-multistudy>
                <component-impltype>1</component-impltype>
@@ -990,7 +990,7 @@
                <component-username>MulComponent</component-username>
                <component-type>SuperVisionTest</component-type>
                <component-author>MTJ</component-author>
-               <component-version>3.2.0a2</component-version>
+               <component-version>3.2.0b1</component-version>
                <component-comment>SuperVision test: Multiplication</component-comment>
                <component-multistudy>0</component-multistudy>
                <component-impltype>1</component-impltype>
@@ -1038,7 +1038,7 @@
                <component-username>DivComponent</component-username>
                <component-type>SuperVisionTest</component-type>
                <component-author>MTJ</component-author>
-               <component-version>3.2.0a2</component-version>
+               <component-version>3.2.0b1</component-version>
                <component-comment>SuperVision test: Division</component-comment>
                <component-multistudy>0</component-multistudy>
                <component-impltype>1</component-impltype>
@@ -1085,7 +1085,7 @@
                <component-username>SyrComponent</component-username>
                <component-type>SuperVisionTest</component-type>
                <component-author>JR</component-author>
-               <component-version>3.2.0a2</component-version>
+               <component-version>3.2.0b1</component-version>
                <component-comment>SuperVision test</component-comment>
                <component-multistudy>1</component-multistudy>
                <component-impltype>1</component-impltype>
@@ -1529,7 +1529,7 @@
                <component-username>FactorialComponent</component-username>
                <component-type>SuperVisionTest</component-type>
                <component-author>Malvagi, Tajchman</component-author>
-               <component-version>3.2.0a2</component-version>
+               <component-version>3.2.0b1</component-version>
                <component-comment>SuperVision test: Factorial</component-comment>
                <component-multistudy>0</component-multistudy>
                <component-icone></component-icone>
@@ -1594,7 +1594,7 @@
                <component-username>SyrControlComponent</component-username>
                <component-type>SuperVisionTest</component-type>
                <component-author>JR</component-author>
-               <component-version>3.2.0a2</component-version>
+               <component-version>3.2.0b1</component-version>
                <component-comment>SuperVision test</component-comment>
                <component-multistudy>1</component-multistudy>
                <component-impltype>0</component-impltype>
@@ -1824,7 +1824,7 @@
                <component-username>TypesCheck</component-username>
                <component-type></component-type>
                <component-author></component-author>
-               <component-version>3.2.0a2</component-version>
+               <component-version>3.2.0b1</component-version>
                <component-comment>SuperVision test</component-comment>
                <component-multistudy>1</component-multistudy>
                <component-impltype>1</component-impltype>
@@ -2104,7 +2104,7 @@
                <component-username>Calculator</component-username>
                <component-type>SOLVER</component-type>
                <component-author>LD</component-author>
-               <component-version>3.2.0a2</component-version>
+               <component-version>3.2.0b1</component-version>
                <component-comment>SuperVision test: Arithmetic operations with MED_Field</component-comment>
                <component-multistudy>0</component-multistudy>
                <component-impltype>1</component-impltype>
@@ -2256,7 +2256,7 @@
             <component-username>DataStreamFactory</component-username>
             <component-type>OTHER</component-type>
             <component-author>jr</component-author>
-            <component-version>3.2.0a2</component-version>
+            <component-version>3.2.0b1</component-version>
             <component-comment>SuperVision test</component-comment>
             <component-multistudy>1</component-multistudy>
             <component-icone></component-icone>
@@ -2735,7 +2735,7 @@
             <component-username>SIGNALSComponent</component-username>
             <component-type>OTHER</component-type>
             <component-author>jr</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-impltype>1</component-impltype>
@@ -2796,7 +2796,7 @@
             <component-username>UndefinedSymbolComponent</component-username>
             <component-type>OTHER</component-type>
             <component-author>jr</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-impltype>1</component-impltype>

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
new file mode 100644 (file)
index 0000000..1dfb2bc
--- /dev/null
+++ b/resources/SalomeApp.xml
@@ -0,0 +1,10 @@
+<document>
+  <section name="COMPONENT">
+    <!-- Major module parameters -->
+    <parameter name="name" value="Component"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="COMPONENT" value="${COMPONENT_ROOT_DIR}/share/salome/resources"/>
+  </section>
+</document>

diff --git a/src/SyrComponent/COMPONENT_shared_modules.py b/src/SyrComponent/COMPONENT_shared_modules.py
index 1dad963513b085fa2b4645279e79a798c884b915..10b1665c5caf686c72d11cfbc4196168366bc53c 100644 (file)
--- a/src/SyrComponent/COMPONENT_shared_modules.py
+++ b/src/SyrComponent/COMPONENT_shared_modules.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/
+#
 """
 
 """

diff --git a/src/TestFunctions/GEOM.py b/src/TestFunctions/GEOM.py
index 7de6f247b8a8bfb6d8282a04745d67eb96ee19ef..75796ef25ecc0b0d05716dc98905214acc027bf6 100644 (file)
--- a/src/TestFunctions/GEOM.py
+++ b/src/TestFunctions/GEOM.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 LifeCycleCORBA import *
 orb = CORBA.ORB_init([''], CORBA.ORB_ID)
 lcc = LifeCycleCORBA(orb)

diff --git a/src/TestFunctions/TestFunctions.py b/src/TestFunctions/TestFunctions.py
index 5626f095d41bf8b2687b20ba84f7be3b168bf29b..6427ea68bd2d7cc674e614939588a4ffed415bc4 100644 (file)
--- a/src/TestFunctions/TestFunctions.py
+++ b/src/TestFunctions/TestFunctions.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 LifeCycleCORBA import *
 orb = CORBA.ORB_init([''], CORBA.ORB_ID)
 lcc = LifeCycleCORBA(orb)