From 276bf33f1ca21fbfa8c3e2bb53db72ff4bb39278 Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 1 Jun 2006 11:51:25 +0000 Subject: [PATCH] Join modifications from branch BR_DEBUG_3_2_0b1 --- INSTALL | 5 +---- Makefile.in | 20 +++++++++++++------ adm_local/Makefile.in | 2 +- bin/VERSION | 1 - bin/VERSION.in | 1 + bin/myrunSalome.py | 2 +- configure.in.base | 4 +++- idl/Makefile.in | 2 +- idl/PYHELLO_Gen.idl | 2 +- ...HELLOCatalog.xml => PYHELLOCatalog.xml.in} | 2 +- src/Makefile.in | 2 +- src/PYHELLO/Makefile.in | 2 +- src/PYHELLO/PYHELLO.py | 2 +- src/PYHELLOGUI/Makefile.in | 2 +- src/PYHELLOGUI/PYHELLOGUI.py | 2 +- src/PYHELLOGUI/PYHELLO_icons.po | 2 +- src/PYHELLOGUI/PYHELLO_msg_en.po | 2 +- 17 files changed, 31 insertions(+), 24 deletions(-) delete mode 100755 bin/VERSION create mode 100755 bin/VERSION.in rename resources/{PYHELLOCatalog.xml => PYHELLOCatalog.xml.in} (92%) diff --git a/INSTALL b/INSTALL index 968bce7..e490384 100644 --- 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 bd44218..d1dbea2 100644 --- 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 40ceced..cfbe6f4 100644 --- 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 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 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 a3a2d53..3b4d6cf 100755 --- 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 ec8d23d..b3ee35c 100644 --- 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 de2dd55..ea79c31 100644 --- 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 30d82a5..665544c 100644 --- 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.in similarity index 92% rename from resources/PYHELLOCatalog.xml rename to resources/PYHELLOCatalog.xml.in index 701ef00..dae8a28 100644 --- a/resources/PYHELLOCatalog.xml +++ b/resources/PYHELLOCatalog.xml.in @@ -16,7 +16,7 @@ PYHELLO GUI Data C. Caremoli - 3.2.0a1 + @VERSION@ EDF - RD 1 PYHELLO.png diff --git a/src/Makefile.in b/src/Makefile.in index a58a04f..ac69a9f 100644 --- 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 32bd7fa..e6fa779 100644 --- 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 d154458..0a12777 100644 --- 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 1291459..4c52b1b 100644 --- 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 673933f..8afba72 100644 --- 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 241a725..7268d4d 100644 --- 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 241a725..7268d4d 100644 --- 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" -- 2.39.2