Join modifications from branch BR_DEBUG_3_2_0b1

diff --git a/CALCULATOR_version.h.in b/CALCULATOR_version.h.in
new file mode 100644 (file)
index 0000000..d5cebaf
--- /dev/null
+++ b/CALCULATOR_version.h.in
@@ -0,0 +1,34 @@
+// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// 
+// 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   : CALCULATOR_version.h
+//  Author : Vadim SANDLER
+//  Module : SALOME
+
+#if !defined(__CALCULATOR_VERSION_H__)
+#define __CALCULATOR_VERSION_H__
+
+/*
+  CALCULATOR_VERSION is (major << 16) + (minor << 8) + patch.
+*/
+
+#define CALCULATOR_VERSION_STR "@VERSION@"
+#define CALCULATOR_VERSION     @XVERSION@
+
+#endif // __CALCULATOR_VERSION_H__

diff --git a/INSTALL b/INSTALL
new file mode 100644 (file)
index 0000000..71fa36c
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1 @@
+SALOME2 : CALCULATOR module (sample)

diff --git a/Makefile.in b/Makefile.in
index 88ff5cc4c5bc198b7f290097a9d6d102d120ebaf..7e389070b2f45486a899ff318290374d093bc066 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@
 #  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/
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 # -* Makefile *- 
 #
@@ -27,7 +27,8 @@
 top_srcdir=@top_srcdir@
 top_builddir=.
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
+VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl
+
 
 @COMMENCE@
 
@@ -39,14 +40,22 @@ RESOURCES_FILES = CALCULATORCatalog.xml CALCULATOR.png CALCULATOR_en.xml \
 BIN_SCRIPT= VERSION runAppli myrunSalome.py
 
 # copy header files in common directory
-ifeq ($(HAVE_SSTREAM),yes)
-  include_list=include/salome/SALOMEconfig.h
-else
-  include_list=include/salome/SALOMEconfig.h include/salome/sstream
+
+include_list = include/salome/SALOMEconfig.h \
+               include/salome/CALCULATOR_version.h
+
+ifneq ($(HAVE_SSTREAM),yes)
+       include_list += include/salome/sstream
 endif
 
 inc: idl $(include_list)
 
+bin: bin/salome/VERSION
+
+bin/salome/VERSION : bin/VERSION
+       -$(RM) $@
+       $(LN_S) ../../$< $@
+
 include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
        -$(RM) $@
        $(LN_S) ../../$< $@
@@ -64,6 +73,10 @@ include/salome/sstream: salome_adm/unix/sstream
        -$(RM) $@
        $(LN_S) ../../$< $@
 
+include/salome/CALCULATOR_version.h: CALCULATOR_version.h
+       -$(RM) $@
+       $(LN_S) ../../$< $@
+
 depend: depend_idl
 
 depend_idl:

diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in
index 40cecedb639bcd74fe032f2c3a4c68cd83c4dd17..cfbe6f4fd5a4d6ab16b6cc642bcc0686f4771544 100644 (file)
--- a/adm_local/Makefile.in
+++ b/adm_local/Makefile.in
@@ -14,7 +14,7 @@
 #  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/
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 # source path
 top_srcdir=@top_srcdir@

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index ee10727ba01ae68f49e7de2ae4da6a1069944b74..9d9393a78fc4347e2522c0bf316513a2d47ba4b2 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -10,12 +10,12 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 
 LIBS=@LIBS@ 
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome
+LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= @STDLIB@
 
 LIBSFORBIN=@LIBS@
-LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome
+LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
 LDFLAGSFORBIN+= @STDLIB@
 
 CP=@CP@
@@ -188,16 +188,26 @@ INSTALL_DATA=@INSTALL_DATA@
 # create a symbolic link (or a copie ?)
 LN_S=@LN_S@
 
+KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@
+KERNEL_SITE_DIR=@KERNEL_SITE_DIR@
+
+KERNEL_LDFLAGS=@KERNEL_LDFLAGS@
+KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@
+
+MED_ROOT_DIR=@MED_ROOT_DIR@
+MED_LDFLAGS=@MED_LDFLAGS@
+MED_CXXFLAGS=@MED_CXXFLAGS@
+
 ## Installation points
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-bindir=@bindir@/salome
-libdir=@libdir@/salome
+bindir=@exec_prefix@/bin/salome
+libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome
 # warning : if user give this path in configure we could have salome/salome :-(
 includedir=@includedir@/salome
 datadir=@datadir@/salome
 idldir=$(prefix)/idl/salome
-sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
+sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
 
 docdir=$(datadir)/doc
 

diff --git a/bin/VERSION b/bin/VERSION
deleted file mode 100755 (executable)
index 4d562da..0000000
--- a/bin/VERSION
+++ /dev/null
@@ -1,2 +0,0 @@
-SALOME 2 EXEMPLE MODULE C++ - CALCULATOR VERSION: 3.2.0b1
-This module works with KERNEL 3.2.0b1

diff --git a/bin/VERSION.in b/bin/VERSION.in
new file mode 100755 (executable)
index 0000000..ad934e1
--- /dev/null
+++ b/bin/VERSION.in
@@ -0,0 +1 @@
+SALOME 2 EXEMPLE MODULE C++ - CALCULATOR VERSION: @VERSION@

diff --git a/bin/myrunSalome.py b/bin/myrunSalome.py
index c430ebeaf9b4d1f6e64dffb2b4f01a45c20368f9..55d8818463dff6591ff9d00347ab076aa3b95358 100755 (executable)
--- a/bin/myrunSalome.py
+++ b/bin/myrunSalome.py
@@ -14,7 +14,7 @@
 #  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/
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #!/usr/bin/env python
 

diff --git a/configure.in.base b/configure.in.base
index ea4b5a89a4d11c99f3370d0ee0b8246b707cec52..07c71263e744e7567a1b236103650e11dde510ef 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -22,8 +22,10 @@ AC_CANONICAL_HOST
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=1.2.1
+VERSION=3.2.0
+XVERSION=0x030200
 AC_SUBST(VERSION)
+AC_SUBST(XVERSION)
 
 dnl
 dnl Initialize source and build root directories
@@ -246,7 +248,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources share/salome/doc idl
 do
     $INSTALL -d $rep
 done

diff --git a/idl/CALCULATOR_Gen.idl b/idl/CALCULATOR_Gen.idl
index 30fd926325bb550a21ee8261aa21bbfb75c871aa..d5dfec05817d496ebb9d1528847ea7ca8dfb7b94 100644 (file)
--- a/idl/CALCULATOR_Gen.idl
+++ b/idl/CALCULATOR_Gen.idl
@@ -14,7 +14,7 @@
 // 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/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef __CALCULATOR_GEN__
 #define __CALCULATOR_GEN__

diff --git a/idl/Makefile.in b/idl/Makefile.in
index bca770e88e560af2f92d86e338defbf2449100fd..36bdce53568b5bb58dc66800cffdf2c4a17cd56c 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -14,7 +14,7 @@
 #  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/
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 # generate dependencies for idl file :
@@ -41,7 +41,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/%):$(top_builddir)/idl/%:%
 
 lib: pyidl
 
-PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@
+PYTHON_BUILD_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/@PACKAGE@
 
 pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py)
 

diff --git a/resources/CALCULATORCatalog.xml b/resources/CALCULATORCatalog.xml
deleted file mode 100644 (file)
index b4461e7..0000000
--- a/resources/CALCULATORCatalog.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version='1.0' encoding='us-ascii' ?>
-
-<begin-catalog>
-    <path-prefix-list></path-prefix-list>
-    <component-list>
-        <component>
-            <component-name>CALCULATOR</component-name>
-            <component-username>CALCULATOR</component-username>
-            <component-type>MED EXAMPLE</component-type>
-            <component-author>crouzet</component-author>
-            <component-version>3.2.0b1</component-version>
-            <component-comment>unknown</component-comment>
-            <component-multistudy>1</component-multistudy>
-            <component-icone>CALCULATOR.png</component-icone>
-            <constraint>'linux' ~ OS</constraint>
-            <component-interface-list>
-                <component-interface-name>CALCULATOR_Gen</component-interface-name>
-                <component-interface-comment>unknown</component-interface-comment>
-                <component-service-list>
-                    <component-service>
-                        <service-name>convergenceCriteria</service-name>
-                        <service-author>crouzet</service-author>
-                        <service-version>2.2.2</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>field</inParameter-name>
-                                <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-name>return</outParameter-name>
-                                <outParameter-type>double</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                        </outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>applyLin</service-name>
-                        <service-author>crouzet</service-author>
-                        <service-version>2.2.2</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>field1</inParameter-name>
-                                <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>a1</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>a2</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-name>return</outParameter-name>
-                                <outParameter-type>FIELDDOUBLE</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                        </outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>add</service-name>
-                        <service-author>crouzet</service-author>
-                        <service-version>2.2.2</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>field1</inParameter-name>
-                                <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>field2</inParameter-name>
-                                <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-name>return</outParameter-name>
-                                <outParameter-type>FIELDDOUBLE</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                        </outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>norm2</service-name>
-                        <service-author>crouzet</service-author>
-                        <service-version>2.2.2</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>field</inParameter-name>
-                                <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-name>return</outParameter-name>
-                                <outParameter-type>double</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                        </outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>normL2</service-name>
-                        <service-author>crouzet</service-author>
-                        <service-version>2.2.2</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>field</inParameter-name>
-                                <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-name>return</outParameter-name>
-                                <outParameter-type>double</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                        </outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>normL1</service-name>
-                        <service-author>crouzet</service-author>
-                        <service-version>2.2.2</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>field</inParameter-name>
-                                <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-name>return</outParameter-name>
-                                <outParameter-type>double</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                        </outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>normMax</service-name>
-                        <service-author>crouzet</service-author>
-                        <service-version>2.2.2</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>field</inParameter-name>
-                                <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-name>return</outParameter-name>
-                                <outParameter-type>double</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                        </outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>printField</service-name>
-                        <service-author>crouzet</service-author>
-                        <service-version>2.2.2</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>field</inParameter-name>
-                                <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list></outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>cloneField</service-name>
-                        <service-author>crouzet</service-author>
-                        <service-version>2.2.2</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>field</inParameter-name>
-                                <inParameter-type>FIELDDOUBLE</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-name>clone1</outParameter-name>
-                                <outParameter-type>FIELDDOUBLE</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                            <outParameter>
-                                <outParameter-name>clone2</outParameter-name>
-                                <outParameter-type>FIELDDOUBLE</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                            <outParameter>
-                                <outParameter-name>clone3</outParameter-name>
-                                <outParameter-type>FIELDDOUBLE</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                            <outParameter>
-                                <outParameter-name>clone4</outParameter-name>
-                                <outParameter-type>FIELDDOUBLE</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                        </outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                </component-service-list>
-            </component-interface-list>
-        </component>
-    </component-list>
-</begin-catalog>

diff --git a/resources/CALCULATORCatalog.xml.in b/resources/CALCULATORCatalog.xml.in
new file mode 100644 (file)
index 0000000..dc064ea
--- /dev/null
+++ b/resources/CALCULATORCatalog.xml.in
@@ -0,0 +1,246 @@
+<?xml version='1.0' encoding='us-ascii' ?>
+
+<begin-catalog>
+    <path-prefix-list></path-prefix-list>
+    <component-list>
+        <component>
+            <component-name>CALCULATOR</component-name>
+            <component-username>CALCULATOR</component-username>
+            <component-type>MED EXAMPLE</component-type>
+            <component-author>crouzet</component-author>
+            <component-version>@VERSION@</component-version>
+            <component-comment>unknown</component-comment>
+            <component-multistudy>1</component-multistudy>
+            <component-icone>CALCULATOR.png</component-icone>
+            <constraint>'linux' ~ OS</constraint>
+            <component-interface-list>
+                <component-interface-name>CALCULATOR_Gen</component-interface-name>
+                <component-interface-comment>unknown</component-interface-comment>
+                <component-service-list>
+                    <component-service>
+                        <service-name>convergenceCriteria</service-name>
+                        <service-author>crouzet</service-author>
+                        <service-version>2.2.2</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>return</outParameter-name>
+                                <outParameter-type>double</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>applyLin</service-name>
+                        <service-author>crouzet</service-author>
+                        <service-version>2.2.2</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field1</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>a1</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>a2</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>return</outParameter-name>
+                                <outParameter-type>FIELDDOUBLE</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>add</service-name>
+                        <service-author>crouzet</service-author>
+                        <service-version>2.2.2</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field1</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>field2</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>return</outParameter-name>
+                                <outParameter-type>FIELDDOUBLE</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>norm2</service-name>
+                        <service-author>crouzet</service-author>
+                        <service-version>2.2.2</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>return</outParameter-name>
+                                <outParameter-type>double</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>normL2</service-name>
+                        <service-author>crouzet</service-author>
+                        <service-version>2.2.2</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>return</outParameter-name>
+                                <outParameter-type>double</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>normL1</service-name>
+                        <service-author>crouzet</service-author>
+                        <service-version>2.2.2</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>return</outParameter-name>
+                                <outParameter-type>double</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>normMax</service-name>
+                        <service-author>crouzet</service-author>
+                        <service-version>2.2.2</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>return</outParameter-name>
+                                <outParameter-type>double</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>printField</service-name>
+                        <service-author>crouzet</service-author>
+                        <service-version>2.2.2</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list></outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>cloneField</service-name>
+                        <service-author>crouzet</service-author>
+                        <service-version>2.2.2</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>field</inParameter-name>
+                                <inParameter-type>FIELDDOUBLE</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>clone1</outParameter-name>
+                                <outParameter-type>FIELDDOUBLE</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                            <outParameter>
+                                <outParameter-name>clone2</outParameter-name>
+                                <outParameter-type>FIELDDOUBLE</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                            <outParameter>
+                                <outParameter-name>clone3</outParameter-name>
+                                <outParameter-type>FIELDDOUBLE</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                            <outParameter>
+                                <outParameter-name>clone4</outParameter-name>
+                                <outParameter-type>FIELDDOUBLE</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                </component-service-list>
+            </component-interface-list>
+        </component>
+    </component-list>
+</begin-catalog>

diff --git a/src/CALCULATOR/CALCULATOR.cxx b/src/CALCULATOR/CALCULATOR.cxx
index e790e22202bf8c9ad403c4a854031adcb58c7d7e..d74f4fdde3b325b5ad8aaedd5ffa8a5453c2af89 100644 (file)
--- a/src/CALCULATOR/CALCULATOR.cxx
+++ b/src/CALCULATOR/CALCULATOR.cxx
@@ -14,7 +14,7 @@
 // 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/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #include "CALCULATOR.hxx"
 #include "FIELDClient.hxx"

diff --git a/src/CALCULATOR/CALCULATOR.hxx b/src/CALCULATOR/CALCULATOR.hxx
index d2b1d1e2dfc2ccd77e8d934c6f967360ed1d1be3..353685069f021c8cd2e2da0d2100ccbc50a077a6 100644 (file)
--- a/src/CALCULATOR/CALCULATOR.hxx
+++ b/src/CALCULATOR/CALCULATOR.hxx
@@ -14,7 +14,7 @@
 // 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/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _CALCULATOR_HXX_
 #define _CALCULATOR_HXX_

diff --git a/src/CALCULATOR/CALCULATOR_TEST.py b/src/CALCULATOR/CALCULATOR_TEST.py
index 656f35e3c1584ee0a88d7c3da6efc7dc78e82c84..bd7c1641a9c2c487d81f91ce3b14386a319e969d 100644 (file)
--- a/src/CALCULATOR/CALCULATOR_TEST.py
+++ b/src/CALCULATOR/CALCULATOR_TEST.py
@@ -14,7 +14,7 @@
 #  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/
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 from omniORB import CORBA
 

diff --git a/src/CALCULATOR/Makefile.in b/src/CALCULATOR/Makefile.in
index dae1f3020233f18a41cf3e7769f38814709e18b4..39cada30919a55efd81747e66571dc157079ed35 100644 (file)
--- a/src/CALCULATOR/Makefile.in
+++ b/src/CALCULATOR/Makefile.in
@@ -14,7 +14,7 @@
 #  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/
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 # source path
 top_srcdir=@top_srcdir@
@@ -38,11 +38,9 @@ OMNIORB_IDLCXXFLAGS+=-I${MED_ROOT_DIR}/idl/salome
 
 # additionnal information to compil and link file
 
-CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${MED_ROOT_DIR}/include/salome $(MED2_INCLUDES) $(HDF5_INCLUDES)
-# CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
+CPPFLAGS += $(KERNEL_CXXFLAGS) $(MED_CXXFLAGS) $(MED2_INCLUDES) $(HDF5_INCLUDES)
 
-LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lOpUtil $(MED2_LIBS) $(HDF5_LIBS) -L${MED_ROOT_DIR}/lib/salome -lMEDClientcmodule
-# -lmedmem -lMEDWrapper_V2_1 -lMEDWrapperBase
+LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lOpUtil $(MED2_LIBS) $(HDF5_LIBS) $(MED_LDFLAGS) -lMEDClientcmodule
 
 MED.hh MEDSK.cc: MED.idl
        omniidl -bcxx -Wbtp -I$(top_builddir)/idl -I${KERNEL_ROOT_DIR}/idl/salome $^

diff --git a/src/CALCULATOR/graphe1.py b/src/CALCULATOR/graphe1.py
index d0064ae03eb01f48ba6959ff6f7fdf9f50c719b5..37659be84162869ded26ec419f345b1ddb2d389c 100644 (file)
--- a/src/CALCULATOR/graphe1.py
+++ b/src/CALCULATOR/graphe1.py
@@ -14,7 +14,7 @@
 #  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/
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
 # Generated python file of Graph aNewDataFlow

diff --git a/src/Makefile.in b/src/Makefile.in
index 247167caa36960b0feee04602a0ca6ebaf079a3c..2e9982106d134aa139e6f111009477f75c771a80 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,7 +14,7 @@
 #  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/
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #==============================================================================
 #  File      : Makefile.in