From: jfa Date: Sat, 6 May 2006 08:59:55 +0000 (+0000) Subject: Join modifications from branch OCC_debug_for_3_2_0b1 X-Git-Tag: T3_2_0b1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=236e205417e6fc609b597811e538b7f4aa7cc211;p=samples%2Fcomponent.git Join modifications from branch OCC_debug_for_3_2_0b1 --- diff --git a/INSTALL b/INSTALL index da8e8c8..1f0e9e0 100644 --- 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 2c0b562..a7e9f45 100644 --- 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 9b5e810..40ceced 100644 --- 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 9d94dad..ec0f49a 100644 --- 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 f5efbec..196bfd1 100755 --- 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 8dc1b2d..d67de27 100755 --- 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 def42ac..4b6ccb1 100644 --- 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 d73bdeb..079f4d2 100644 --- a/resources/COMPONENTCatalog.xml +++ b/resources/COMPONENTCatalog.xml @@ -16,7 +16,7 @@ AddComponent SuperVisionTest MTJ - 3.2.0a2 + 3.2.0b1 SuperVision test: Addition 0 1 @@ -479,7 +479,7 @@ AdditionComponent SuperVisionTest JR - 3.2.0a2 + 3.2.0b1 SuperVision test: Addition 0 1 @@ -942,7 +942,7 @@ SubComponent SuperVisionTest MTJ - 3.2.0a2 + 3.2.0b1 SuperVision test: Subtraction 0 1 @@ -990,7 +990,7 @@ MulComponent SuperVisionTest MTJ - 3.2.0a2 + 3.2.0b1 SuperVision test: Multiplication 0 1 @@ -1038,7 +1038,7 @@ DivComponent SuperVisionTest MTJ - 3.2.0a2 + 3.2.0b1 SuperVision test: Division 0 1 @@ -1085,7 +1085,7 @@ SyrComponent SuperVisionTest JR - 3.2.0a2 + 3.2.0b1 SuperVision test 1 1 @@ -1529,7 +1529,7 @@ FactorialComponent SuperVisionTest Malvagi, Tajchman - 3.2.0a2 + 3.2.0b1 SuperVision test: Factorial 0 @@ -1594,7 +1594,7 @@ SyrControlComponent SuperVisionTest JR - 3.2.0a2 + 3.2.0b1 SuperVision test 1 0 @@ -1824,7 +1824,7 @@ TypesCheck - 3.2.0a2 + 3.2.0b1 SuperVision test 1 1 @@ -2104,7 +2104,7 @@ Calculator SOLVER LD - 3.2.0a2 + 3.2.0b1 SuperVision test: Arithmetic operations with MED_Field 0 1 @@ -2256,7 +2256,7 @@ DataStreamFactory OTHER jr - 3.2.0a2 + 3.2.0b1 SuperVision test 1 @@ -2735,7 +2735,7 @@ SIGNALSComponent OTHER jr - 3.2.0a2 + 3.2.0b1 unknown 1 1 @@ -2796,7 +2796,7 @@ UndefinedSymbolComponent OTHER jr - 3.2.0a2 + 3.2.0b1 unknown 1 1 diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml new file mode 100644 index 0000000..1dfb2bc --- /dev/null +++ b/resources/SalomeApp.xml @@ -0,0 +1,10 @@ + +
+ + +
+
+ + +
+ diff --git a/src/SyrComponent/COMPONENT_shared_modules.py b/src/SyrComponent/COMPONENT_shared_modules.py index 1dad963..10b1665 100644 --- 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 7de6f24..75796ef 100644 --- 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 5626f09..6427ea6 100644 --- 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)