Join modifications from branch BR_DEBUG_3_2_0b1

diff --git a/INSTALL b/INSTALL
index 968bce7d690e09eebf6b2182f23da5e66ba3f908..e490384f3c137ce8d9018891f1486aab134a6f94 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1 @@
-This is the version 3.2.0b1 of PYHELLO (SALOME 2 EXAMPLE MODULE)
-Compatible with :
-       - KERNEL 3.2.0b1
-        - GUI 3.2.0b1
+SALOME2 : PYHELLO module (sample)

diff --git a/Makefile.in b/Makefile.in
index bd44218613573e1d79c1a89facb2d2a78bc2ae1d..d1dbea2bd8ecb5d3492d5fee97444c74b8b90a2e 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,21 @@ RESOURCES_FILES = PYHELLOCatalog.xml PYHELLO.png PYHELLO_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
+
+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) ../../$< $@

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/bin/VERSION b/bin/VERSION
deleted file mode 100755 (executable)
index 0fc7088..0000000
--- a/bin/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-THIS IS SALOME - PYHELLO VERSION: 3.2.0b1

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

diff --git a/bin/myrunSalome.py b/bin/myrunSalome.py
index a3a2d538292a94860f42b5bea6eb15c7d4afddf1..3b4d6cf8e96debe73e04dd283c4b8a06abe9ce54 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 ec8d23d7ad1c9dccc6e66547c492e21a0ff9ca8c..b3ee35cac2e576d2f2b1d16d3e807fa1cbd98a59 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

diff --git a/idl/Makefile.in b/idl/Makefile.in
index de2dd55a52262eb5e5ca7a5f559129b86704b753..ea79c3146ccc048d9beed9b1540f476949cc4251 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 :

diff --git a/idl/PYHELLO_Gen.idl b/idl/PYHELLO_Gen.idl
index 30d82a5d7b5845845cf47495287a230e0eaff103..665544c80fce22cec5ed65379f8a3f0b0131801f 100644 (file)
--- a/idl/PYHELLO_Gen.idl
+++ b/idl/PYHELLO_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 __PYHELLO_GEN__
 #define __PYHELLO_GEN__

diff --git a/resources/PYHELLOCatalog.xml b/resources/PYHELLOCatalog.xml
deleted file mode 100644 (file)
index 701ef00..0000000
--- a/resources/PYHELLOCatalog.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='us-ascii' ?>
- 
-<!-- XML component catalog -->
-<begin-catalog>
-
-<!-- Path prefix information -->
-
-<path-prefix-list>
-</path-prefix-list>
-
-<!-- Component list -->
-<component-list>
-        <component>
-                <!-- Component identification -->
-                <component-name>PYHELLO</component-name>
-               <component-username>PYHELLO GUI</component-username>
-                <component-type>Data</component-type>
-                <component-author>C. Caremoli</component-author>
-                <component-version>3.2.0a1</component-version>
-                <component-comment>EDF - RD</component-comment>
-                <component-multistudy>1</component-multistudy>
-                <component-icone>PYHELLO.png</component-icone>
-                <constraint>'linux' ~ OS</constraint>
-       
-       </component>
-</component-list>
-</begin-catalog>

diff --git a/resources/PYHELLOCatalog.xml.in b/resources/PYHELLOCatalog.xml.in
new file mode 100644 (file)
index 0000000..dae8a28
--- /dev/null
+++ b/resources/PYHELLOCatalog.xml.in
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='us-ascii' ?>
+ 
+<!-- XML component catalog -->
+<begin-catalog>
+
+<!-- Path prefix information -->
+
+<path-prefix-list>
+</path-prefix-list>
+
+<!-- Component list -->
+<component-list>
+        <component>
+                <!-- Component identification -->
+                <component-name>PYHELLO</component-name>
+               <component-username>PYHELLO GUI</component-username>
+                <component-type>Data</component-type>
+                <component-author>C. Caremoli</component-author>
+                <component-version>@VERSION@</component-version>
+                <component-comment>EDF - RD</component-comment>
+                <component-multistudy>1</component-multistudy>
+                <component-icone>PYHELLO.png</component-icone>
+                <constraint>'linux' ~ OS</constraint>
+       
+       </component>
+</component-list>
+</begin-catalog>

diff --git a/src/Makefile.in b/src/Makefile.in
index a58a04f3f8ea034c2e15038c1cdc59f0bc255caa..ac69a9ff977e3b38f5760b0625808e74dd02bf99 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

diff --git a/src/PYHELLO/Makefile.in b/src/PYHELLO/Makefile.in
index 32bd7fae465163613066cdab3bd1826b31267a29..e6fa7792acda0b095bc4354eababe920d105c628 100644 (file)
--- a/src/PYHELLO/Makefile.in
+++ b/src/PYHELLO/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/src/PYHELLO/PYHELLO.py b/src/PYHELLO/PYHELLO.py
index d15445829e0fb8da5b0126172fa57f4b5b517cd1..0a12777c6055306401dd103d57c0eb95331c3103 100644 (file)
--- a/src/PYHELLO/PYHELLO.py
+++ b/src/PYHELLO/PYHELLO.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
 #
 import PYHELLO_ORB__POA
 import SALOME_ComponentPy

diff --git a/src/PYHELLOGUI/Makefile.in b/src/PYHELLOGUI/Makefile.in
index 12914596bd0f51b2874fbb0817ab73a928bbdf99..4c52b1b7cd898cc454c4d5fcdf9500d97f3ef49f 100644 (file)
--- a/src/PYHELLOGUI/Makefile.in
+++ b/src/PYHELLOGUI/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/src/PYHELLOGUI/PYHELLOGUI.py b/src/PYHELLOGUI/PYHELLOGUI.py
index 673933fd7324d61b8c86c371c88830ccecbb5393..8afba7277c496fd5ef27065aa8dc281b9d79980a 100644 (file)
--- a/src/PYHELLOGUI/PYHELLOGUI.py
+++ b/src/PYHELLOGUI/PYHELLOGUI.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 qt import *
 import traceback

diff --git a/src/PYHELLOGUI/PYHELLO_icons.po b/src/PYHELLOGUI/PYHELLO_icons.po
index 241a7258dab35a46a7e44a51185a1e951fbc9ac7..7268d4d43302e2c04e49feb80c2548dab30a1204 100644 (file)
--- a/src/PYHELLOGUI/PYHELLO_icons.po
+++ b/src/PYHELLOGUI/PYHELLO_icons.po
@@ -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
 #
 # This is a Qt message file in .po format.  Each msgid starts with
 # a scope.  This scope should *NOT* be translated - eg. "Foo::Bar"

diff --git a/src/PYHELLOGUI/PYHELLO_msg_en.po b/src/PYHELLOGUI/PYHELLO_msg_en.po
index 241a7258dab35a46a7e44a51185a1e951fbc9ac7..7268d4d43302e2c04e49feb80c2548dab30a1204 100644 (file)
--- a/src/PYHELLOGUI/PYHELLO_msg_en.po
+++ b/src/PYHELLOGUI/PYHELLO_msg_en.po
@@ -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
 #
 # This is a Qt message file in .po format.  Each msgid starts with
 # a scope.  This scope should *NOT* be translated - eg. "Foo::Bar"