Join modifications from branch BR_DEBUG_3_2_0b1

diff --git a/INSTALL b/INSTALL
index 7cd600c205b23b0f95e9d4546546e6550979f228..db625a36801720cdddb9c8991ad60504e80c470f 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1 @@
-This is the version 0.2 of SIERPINSKY module
-Requires :
-       - SALOME KERNEL 3.0.2
-       - SALOME GUI    3.0.2
-       - SALOME MED    3.0.2
-       - SALOME VISU   3.0.2
-       - RANDOMIZER    0.2
+SALOME2 : SIERPINSKY module (sample)

diff --git a/Makefile.in b/Makefile.in
index ca3a4613482f718519609e4709a1b216b46d676e..0c61cf4bdc5abe96fa12f49e47489597c862544a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,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@
 
@@ -26,14 +27,22 @@ RESOURCES_FILES = \
 BIN_SCRIPT = VERSION
 
 # 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/SIERPINSKY_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) ../../$< $@
@@ -51,6 +60,10 @@ include/salome/sstream: salome_adm/unix/sstream
        -$(RM) $@
        $(LN_S) ../../$< $@
 
+include/salome/SIERPINSKY_version.h: SIERPINSKY_version.h
+       -$(RM) $@
+       $(LN_S) ../../$< $@
+
 depend: depend_idl
 
 depend_idl:

diff --git a/SIERPINSKY_version.h.in b/SIERPINSKY_version.h.in
new file mode 100644 (file)
index 0000000..c3c023f
--- /dev/null
+++ b/SIERPINSKY_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   : SIERPINSKY_version.h
+//  Author : Vadim SANDLER
+//  Module : SALOME
+
+#if !defined(__SIERPINSKY_VERSION_H__)
+#define __SIERPINSKY_VERSION_H__
+
+/*
+  SIERPINSKY_VERSION is (major << 16) + (minor << 8) + patch.
+*/
+
+#define SIERPINSKY_VERSION_STR "@VERSION@"
+#define SIERPINSKY_VERSION     @XVERSION@
+
+#endif // __SIERPINSKY_VERSION_H__

diff --git a/adm_local/unix/config_files/check_SIERPINSKY.m4 b/adm_local/unix/config_files/check_SIERPINSKY.m4
index 2b64e644fdaf64c0b3b17cc995a2d90cb4fdf82a..34cbc06a266f8cb24a6cfded95d25eaaa58bc546 100755 (executable)
--- a/adm_local/unix/config_files/check_SIERPINSKY.m4
+++ b/adm_local/unix/config_files/check_SIERPINSKY.m4
@@ -34,14 +34,21 @@ if test "x$SIERPINSKY_DIR" = "x" ; then
 
 fi
 
-if test -f ${SIERPINSKY_DIR}/lib/salome/libSIERPINSKY.so  ; then
+if test -f ${SIERPINSKY_DIR}/lib${LIB_LOCATION_SUFFIX}/salome/libSIERPINSKY.so  ; then
   Sierpinsky_ok=yes
   AC_MSG_RESULT(Using SIERPINSKY module distribution in ${SIERPINSKY_DIR})
 
   if test "x$SIERPINSKY_ROOT_DIR" == "x" ; then
     SIERPINSKY_ROOT_DIR=${SIERPINSKY_DIR}
   fi
+  
+  SIERPINSKY_LDFLAGS=-L${SIERPINSKY_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
+  SIERPINSKY_CXXFLAGS=-I${SIERPINSKY_ROOT_DIR}/include/salome
+
   AC_SUBST(SIERPINSKY_ROOT_DIR)
+  AC_SUBST(SIERPINSKY_LDFLAGS)
+  AC_SUBST(SIERPINSKY_CXXFLAGS)
+
 else
   AC_MSG_WARN("Cannot find compiled SIERPINSKY module distribution")
 fi

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 6e6bd288eda5098947db02120f14eaf4dc236136..a84dfbb7c5017aa73bb2fbccfed5d01daa09501f 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -17,8 +17,8 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 LIBS=@LIBS@
 LIBSFORBIN=@LIBS@
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome
-LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(KERNEL_ROOT_DIR)/lib/salome
+LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
+LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(KERNEL_ROOT_DIR)/lib@LIB_LOCATION_SUFFIX@/salome
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= -lstdc++
 LDFLAGSFORBIN+= -lstdc++
@@ -63,8 +63,8 @@ PYTHON_VERSION = @PYTHON_VERSION@
 # Changes from the SalomePro V1.2c
 #PYTHON_SITE = @PYTHON_SITE@
 #PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
-PYTHON_SITE = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages
-PYTHON_SITE_INSTALL = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome
+PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages
+PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome
 
 # QT
 
@@ -214,16 +214,34 @@ 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@
+
+GUI_ROOT_DIR=@GUI_ROOT_DIR@
+GUI_LDFLAGS=@GUI_LDFLAGS@
+GUI_CXXFLAGS=@GUI_CXXFLAGS@
+
+MED_ROOT_DIR=@MED_ROOT_DIR@
+MED_LDFLAGS=@MED_LDFLAGS@
+MED_CXXFLAGS=@MED_CXXFLAGS@
+
+RANDOMIZER_ROOT_DIR=@RANDOMIZER_ROOT_DIR@
+RANDOMIZER_CXXFLAGS=@RANDOMIZER_CXXFLAGS@
+RANDOMIZER_LDFLAGS=@RANDOMIZER_LDFLAGS@
+
 ## Installation points
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@/salome
-libdir=@libdir@/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
 incmakedir=${prefix}/salome_adm/unix
 
 docdir=$(datadir)/doc

diff --git a/bin/VERSION b/bin/VERSION
deleted file mode 100755 (executable)
index 1f21a15..0000000
--- a/bin/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-THIS IS SIERPINSKY COMPONENT - VERSION: 0.2

diff --git a/bin/VERSION.in b/bin/VERSION.in
new file mode 100755 (executable)
index 0000000..76cd9ff
--- /dev/null
+++ b/bin/VERSION.in
@@ -0,0 +1 @@
+THIS IS SIERPINSKY COMPONENT - VERSION: @VERSION@

diff --git a/configure.in.base b/configure.in.base
index 9858e284deb889df31b99aaa9e5f1d6efd2f44f6..d3530f5dbedd384132bff4889a330c72b71898ab 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -22,8 +22,10 @@ AC_CANONICAL_HOST
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=0.0.1
+VERSION=3.2.0
+XVERSION=0x030200
 AC_SUBST(VERSION)
+AC_SUBST(XVERSION)
 
 dnl
 dnl Initialize source and build root directories
@@ -113,14 +115,6 @@ dnl
 
 AC_CXX_HAVE_SSTREAM
 
-echo
-echo ---------------------------------------------
-echo BOOST Library
-echo ---------------------------------------------
-echo
-
-CHECK_BOOST
-
 dnl
 dnl ---------------------------------------------
 dnl testing MPICH
@@ -241,6 +235,14 @@ echo
 
 CHECK_HDF5
 
+echo
+echo ---------------------------------------------
+echo BOOST Library
+echo ---------------------------------------------
+echo
+
+CHECK_BOOST
+
 echo
 echo ---------------------------------------------
 echo testing MED2
@@ -371,7 +373,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
 #   if test ! -d $rep ; then
 #      eval mkdir $rep

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 31e2cb31de29f26dcae07ae77bbe07fadd2f6c60..440eb3a782d9642042e31ae65bbfa14da0a57e23 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -30,7 +30,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/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/SIERPINSKYCatalog.xml b/resources/SIERPINSKYCatalog.xml
deleted file mode 100644 (file)
index 21828a4..0000000
--- a/resources/SIERPINSKYCatalog.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version='1.0' encoding='us-ascii' ?>
-
-<begin-catalog>
-    <path-prefix-list></path-prefix-list>
-    <component-list>
-        <component>
-            <component-name>SIERPINSKY</component-name>
-            <component-username>Sierpinsky</component-username>
-            <component-type>OTHER</component-type>
-            <component-author>Vadim SANDLER (VSR)</component-author>
-            <component-version>0.2</component-version>
-            <component-comment>unknown</component-comment>
-            <component-multistudy>0</component-multistudy>
-            <component-icone>SIERPINSKY.png</component-icone>
-            <constraint></constraint>
-            <component-interface-list>
-                <component-interface-name>SIERPINSKY</component-interface-name>
-                <component-interface-comment>unknown</component-interface-comment>
-                <component-service-list>
-                    <component-service>
-                        <service-name>Init</service-name>
-                        <service-author>VSR</service-author>
-                        <service-version>0.1</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>X1</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Y1</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>X2</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Y2</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>X3</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Y3</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list></outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>Reset</service-name>
-                        <service-author>VSR</service-author>
-                        <service-version>0.1</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list></inParameter-list>
-                        <outParameter-list></outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>NextPoint</service-name>
-                        <service-author>VSR</service-author>
-                        <service-version>0.1</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>X</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Y</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>iter</inParameter-name>
-                                <inParameter-type>long</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-name>nextX</outParameter-name>
-                                <outParameter-type>double</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                            <outParameter>
-                                <outParameter-name>nextY</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>ExportToJPEG</service-name>
-                        <service-author>VSR</service-author>
-                        <service-version>0.1</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>fileName</inParameter-name>
-                                <inParameter-type>string</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>size</inParameter-name>
-                                <inParameter-type>long</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-name>return</outParameter-name>
-                                <outParameter-type>boolean</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                        </outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>ExportToMED</service-name>
-                        <service-author>VSR</service-author>
-                        <service-version>0.1</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
-                            <inParameter>
-                                <inParameter-name>fileName</inParameter-name>
-                                <inParameter-type>string</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>size</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>boolean</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/SIERPINSKYCatalog.xml.in b/resources/SIERPINSKYCatalog.xml.in
new file mode 100644 (file)
index 0000000..988bbc0
--- /dev/null
+++ b/resources/SIERPINSKYCatalog.xml.in
@@ -0,0 +1,166 @@
+<?xml version='1.0' encoding='us-ascii' ?>
+
+<begin-catalog>
+    <path-prefix-list></path-prefix-list>
+    <component-list>
+        <component>
+            <component-name>SIERPINSKY</component-name>
+            <component-username>Sierpinsky</component-username>
+            <component-type>OTHER</component-type>
+            <component-author>Vadim SANDLER (VSR)</component-author>
+            <component-version>@VERSION@</component-version>
+            <component-comment>unknown</component-comment>
+            <component-multistudy>0</component-multistudy>
+            <component-icone>SIERPINSKY.png</component-icone>
+            <constraint></constraint>
+            <component-interface-list>
+                <component-interface-name>SIERPINSKY</component-interface-name>
+                <component-interface-comment>unknown</component-interface-comment>
+                <component-service-list>
+                    <component-service>
+                        <service-name>Init</service-name>
+                        <service-author>VSR</service-author>
+                        <service-version>0.1</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>X1</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Y1</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>X2</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Y2</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>X3</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Y3</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list></outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>Reset</service-name>
+                        <service-author>VSR</service-author>
+                        <service-version>0.1</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list></inParameter-list>
+                        <outParameter-list></outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>NextPoint</service-name>
+                        <service-author>VSR</service-author>
+                        <service-version>0.1</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>X</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Y</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>iter</inParameter-name>
+                                <inParameter-type>long</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>nextX</outParameter-name>
+                                <outParameter-type>double</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                            <outParameter>
+                                <outParameter-name>nextY</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>ExportToJPEG</service-name>
+                        <service-author>VSR</service-author>
+                        <service-version>0.1</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>fileName</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>size</inParameter-name>
+                                <inParameter-type>long</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>return</outParameter-name>
+                                <outParameter-type>boolean</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>ExportToMED</service-name>
+                        <service-author>VSR</service-author>
+                        <service-version>0.1</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>fileName</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>size</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>boolean</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/Sierpinsky/Makefile.in b/src/Sierpinsky/Makefile.in
index bac9125c632c598ace3f8a59744c7a3a3c67e546..cf1c2c741ea73be6abda3b99156fab9cc0262be2 100644 (file)
--- a/src/Sierpinsky/Makefile.in
+++ b/src/Sierpinsky/Makefile.in
@@ -23,9 +23,9 @@ LIB_SRC = SIERPINSKY_Gen_i.cxx
 LIB_SERVER_IDL = Sierpinsky.idl MED.idl
 LIB_CLIENT_IDL = SALOME_Component.idl SALOME_Exception.idl SALOMEDS.idl SALOME_GenericObj.idl SALOME_Comm.idl
 
-CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome $(HDF5_INCLUDES) -I${MED_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
+CPPFLAGS += $(KERNEL_CXXFLAGS) $(HDF5_INCLUDES) $(MED_CXXFLAGS) $(BOOST_CPPFLAGS)
 
-LDFLAGS       += -L${KERNEL_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper
-LDFLAGSFORBIN += -L${KERNEL_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase
+LDFLAGS       += $(KERNEL_LDFLAGS) $(MED_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper
+LDFLAGSFORBIN += $(KERNEL_LDFLAGS) $(MED_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase
 
 @CONCLUDE@

diff --git a/src/SierpinskyGUI/Makefile.in b/src/SierpinskyGUI/Makefile.in
index cde2f8fdc693ebca55431f1b3fd8f27f5c1d572e..9cfa01678cfefcd0449afb1909759e6b09df2b3d 100644 (file)
--- a/src/SierpinskyGUI/Makefile.in
+++ b/src/SierpinskyGUI/Makefile.in
@@ -33,10 +33,10 @@ LIB_MOC = \
 LIB_CLIENT_IDL = SALOME_Component.idl SALOME_Exception.idl SALOMEDS.idl Sierpinsky.idl Randomizer.idl \
 SALOME_GenericObj.idl SALOMEDS_Attributes.idl SALOME_Comm.idl MED.idl VISU_Gen.idl
 
-CPPFLAGS+= $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${RANDOMIZER_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
+CPPFLAGS+= $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(KERNEL_CXXFLAGS) $(RANDOMIZER_CXXFLAGS) $(GUI_CXXFLAGS) $(BOOST_CPPFLAGS)
 
-CXXFLAGS+= $(QT_INCLUDES) $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${RANDOMIZER_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
+CXXFLAGS+= $(QT_INCLUDES) $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) $(RANDOMIZER_CXXFLAGS) $(GUI_CXXFLAGS)
 
-LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome $(QT_LIBS) -L${GUI_ROOT_DIR}/lib/salome -lSalomeApp -lSIERPINSKYEngine -L${RANDOMIZER_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/include/salome -lSalomeLifeCycleCORBA
+LDFLAGS+= $(KERNEL_LDFLAGS) $(QT_LIBS) $(GUI_LDFLAGS) -lSalomeApp -lSIERPINSKYEngine $(RANDOMIZER_LDFLAGS) -lSalomeLifeCycleCORBA
 
 @CONCLUDE@