From 7edaa2f9cd548aac9a5778dd10c4197d4bfce6c3 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 7 May 2010 15:27:13 +0000 Subject: [PATCH] Merge from V5_1_4_BR 07/05/2010 --- GHS3DPLUGIN_version.h.in | 3 ++- Makefile.am | 3 ++- adm_local/Makefile.am | 3 ++- adm_local/unix/Makefile.am | 3 ++- adm_local/unix/config_files/Makefile.am | 3 ++- adm_local/unix/config_files/check_GHS3D.m4 | 3 ++- .../unix/config_files/check_GHS3DPLUGIN.m4 | 3 ++- adm_local/unix/make_common_starter.am | 3 ++- bin/Makefile.am | 3 ++- build_cmake | 5 +---- build_cmake.bat | 20 ++++++++++++++++++- build_configure | 3 ++- clean_configure | 3 ++- configure.ac | 5 +++-- idl/GHS3DPlugin_Algorithm.idl | 3 ++- idl/Makefile.am | 3 ++- resources/GHS3DPlugin.xml | 2 +- resources/Makefile.am | 3 ++- resources/SalomeApp.xml | 2 +- src/GHS3DPlugin_Defs.hxx | 3 ++- src/GHS3DPlugin_GHS3D.cxx | 3 ++- src/GHS3DPlugin_GHS3D.hxx | 3 ++- src/GHS3DPlugin_GHS3D_i.cxx | 3 ++- src/GHS3DPlugin_GHS3D_i.hxx | 3 ++- src/GHS3DPlugin_Hypothesis.cxx | 3 ++- src/GHS3DPlugin_Hypothesis.hxx | 3 ++- src/GHS3DPlugin_Hypothesis_i.cxx | 3 ++- src/GHS3DPlugin_Hypothesis_i.hxx | 3 ++- src/GHS3DPlugin_i.cxx | 3 ++- src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx | 3 ++- src/GUI/GHS3DPluginGUI_HypothesisCreator.h | 3 ++- src/GUI/GHS3DPlugin_images.ts | 2 +- src/GUI/GHS3DPlugin_msg_en.ts | 2 +- src/GUI/Makefile.am | 3 ++- src/Makefile.am | 3 ++- 35 files changed, 83 insertions(+), 39 deletions(-) diff --git a/GHS3DPLUGIN_version.h.in b/GHS3DPLUGIN_version.h.in index a04a008..ac6fa7d 100644 --- a/GHS3DPLUGIN_version.h.in +++ b/GHS3DPLUGIN_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2004-2008 CEA/DEN, EDF R&D +// Copyright (C) 2004-2010 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : GHS3DPLUGIN_version.h // Author : Vadim SANDLER // Module : SALOME diff --git a/Makefile.am b/Makefile.am index 3f76dca..c6b0224 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2008 CEA/DEN, EDF R&D +# Copyright (C) 2004-2010 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Patrick GOLDBRONN (CEA) # Date : 28/06/2001 diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 0c722d0..ce6079f 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2008 CEA/DEN, EDF R&D +# Copyright (C) 2004-2010 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = unix diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index d109e0d..b10b609 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2008 CEA/DEN, EDF R&D +# Copyright (C) 2004-2010 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = config_files diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index ee5c4d8..6ee9ddb 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2008 CEA/DEN, EDF R&D +# Copyright (C) 2004-2010 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + include $(top_srcdir)/adm_local/unix/make_common_starter.am dist_admlocalm4_DATA = \ diff --git a/adm_local/unix/config_files/check_GHS3D.m4 b/adm_local/unix/config_files/check_GHS3D.m4 index 954a828..70e3163 100644 --- a/adm_local/unix/config_files/check_GHS3D.m4 +++ b/adm_local/unix/config_files/check_GHS3D.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2004-2008 CEA/DEN, EDF R&D +dnl Copyright (C) 2004-2010 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + AC_DEFUN([CHECK_GHS3D],[ GHS3D_ok=no diff --git a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 index 5ed3b2d..626be03 100755 --- a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 +++ b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2004-2008 CEA/DEN, EDF R&D +dnl Copyright (C) 2004-2010 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl + # Check availability of GHS3DPLUGIN binary distribution # # Author : Marc Tajchman (CEA, 2002) diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 656184c..29ea7c1 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2008 CEA/DEN, EDF R&D +# Copyright (C) 2004-2010 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -21,6 +21,7 @@ # The following is to avoid PACKAGE_... env variable # redefinition compilation warnings # ============================================================ +# AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h diff --git a/bin/Makefile.am b/bin/Makefile.am index df80d88..7bb738b 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2008 CEA/DEN, EDF R&D +# Copyright (C) 2004-2010 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # -* Makefile *- # Author : Guillaume Boulant (CSSI) # Module : GHS3DPLUGIN diff --git a/build_cmake b/build_cmake index 5fb35c2..84cca18 100755 --- a/build_cmake +++ b/build_cmake @@ -1,8 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2004-2010 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/build_cmake.bat b/build_cmake.bat index 663633d..0040452 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,2 +1,20 @@ - +@REM Copyright (C) 2004-2010 CEA/DEN, EDF R&D +@REM +@REM This library is free software; you can redistribute it and/or +@REM modify it under the terms of the GNU Lesser General Public +@REM License as published by the Free Software Foundation; either +@REM version 2.1 of the License. +@REM +@REM This library is distributed in the hope that it will be useful, +@REM but WITHOUT ANY WARRANTY; without even the implied warranty of +@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +@REM Lesser General Public License for more details. +@REM +@REM You should have received a copy of the GNU Lesser General Public +@REM License along with this library; if not, write to the Free Software +@REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +@REM +@REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +@REM + %PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --ghs3dplugin diff --git a/build_configure b/build_configure index 3a14c3a..f118162 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2004-2008 CEA/DEN, EDF R&D +# Copyright (C) 2004-2010 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,6 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # Tool for updating list of .in file for the SALOME project # and regenerating configure script # Author : Marc Tajchman - CEA diff --git a/clean_configure b/clean_configure index 6728b2e..294e047 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2004-2008 CEA/DEN, EDF R&D +# Copyright (C) 2004-2010 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,6 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + rm -rf autom4te.cache aclocal.m4 configure make_config find . -name "*~" -print -exec rm {} \; find . -name "*.pyc" -print -exec rm {} \; diff --git a/configure.ac b/configure.ac index e95f67c..58f2350 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2008 CEA/DEN, EDF R&D +# Copyright (C) 2004-2010 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # PLEASE DO NOT MODIFY configure.in FILE # ALL CHANGES WILL BE DISCARDED BY THE NEXT # build_configure COMMAND @@ -26,7 +27,7 @@ # Modified by : Marc Tajchman (CEA) # Created from configure.in.base # -AC_INIT([Salome2 Project GHS3DPLUGIN module],[5.1.3], [webmaster.salome@opencascade.com], [SalomeGHS3DPLUGIN]) +AC_INIT([Salome2 Project GHS3DPLUGIN module],[5.1.4], [webmaster.salome@opencascade.com], [SalomeGHS3DPLUGIN]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET diff --git a/idl/GHS3DPlugin_Algorithm.idl b/idl/GHS3DPlugin_Algorithm.idl index 4a8a4ab..20bcf33 100644 --- a/idl/GHS3DPlugin_Algorithm.idl +++ b/idl/GHS3DPlugin_Algorithm.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2004-2008 CEA/DEN, EDF R&D +// Copyright (C) 2004-2010 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : GHS3D_Algorithm.idl // Author : Julia DOROVSKIKH // $Header$ diff --git a/idl/Makefile.am b/idl/Makefile.am index 613df2c..8e265df 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2008 CEA/DEN, EDF R&D +# Copyright (C) 2004-2010 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + # This Makefile is responsible of generating the client and server # implementation of IDL interfaces for both C++ and python usage. # The building process of the C++ files is in charge of each source diff --git a/resources/GHS3DPlugin.xml b/resources/GHS3DPlugin.xml index 404c5bc..8570f1d 100644 --- a/resources/GHS3DPlugin.xml +++ b/resources/GHS3DPlugin.xml @@ -1,7 +1,7 @@