From c5d7e9358b979d3612687213af287769c959e40e Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Apr 2013 13:28:39 +0000 Subject: [PATCH] Merge from V6_main 01/04/2013 --- AUTHORS | 2 +- ChangeLog | 2 +- HexoticPLUGIN_version.h.in | 2 +- INSTALL | 2 +- Makefile.am | 2 +- NEWS | 2 +- adm_local/Makefile.am | 2 +- adm_local/unix/Makefile.am | 2 +- adm_local/unix/config_files/Makefile.am | 2 +- adm_local/unix/config_files/check_BLSURFPLUGIN.m4 | 2 +- adm_local/unix/config_files/check_Hexotic.m4 | 2 +- adm_local/unix/config_files/check_HexoticPLUGIN.m4 | 2 +- adm_local/unix/make_common_starter.am | 10 ++++++++-- bin/Makefile.am | 2 +- build_cmake | 2 +- build_cmake.bat | 2 +- build_configure | 2 +- clean_configure | 2 +- configure.ac | 4 ++-- doc/Makefile.am | 2 +- doc/salome/Makefile.am | 2 +- doc/salome/gui/HexoticPLUGIN/CMakeLists.txt | 2 +- doc/salome/gui/HexoticPLUGIN/Makefile.am | 2 +- doc/salome/gui/HexoticPLUGIN/doxyfile.in | 2 +- doc/salome/gui/HexoticPLUGIN/doxyfile_py.in | 2 +- doc/salome/gui/HexoticPLUGIN/static/footer.html | 4 +--- doc/salome/gui/Makefile.am | 2 +- idl/HexoticPlugin_Algorithm.idl | 2 +- idl/Makefile.am | 2 +- resources/HexoticPLUGIN.xml | 2 +- resources/Makefile.am | 2 +- resources/SalomeApp.xml | 2 +- src/GUI/HexoticPluginGUI.cxx | 2 +- src/GUI/HexoticPluginGUI.h | 2 +- src/GUI/HexoticPluginGUI_Dlg.h | 2 +- src/GUI/HexoticPluginGUI_HypothesisCreator.cxx | 2 +- src/GUI/HexoticPluginGUI_HypothesisCreator.h | 2 +- src/GUI/HexoticPluginGUI_StdWidget.cxx | 2 +- src/GUI/Makefile.am | 2 +- src/GUI/resources/Makefile.am | 2 +- src/HexoticPlugin/HexoticPLUGINDC.py | 2 +- src/HexoticPlugin/HexoticPlugin_Defs.hxx | 2 +- src/HexoticPlugin/HexoticPlugin_Hexotic.cxx | 2 +- src/HexoticPlugin/HexoticPlugin_Hexotic.hxx | 2 +- src/HexoticPlugin/HexoticPlugin_Hexotic_i.cxx | 2 +- src/HexoticPlugin/HexoticPlugin_Hexotic_i.hxx | 2 +- src/HexoticPlugin/HexoticPlugin_Hypothesis.cxx | 2 +- src/HexoticPlugin/HexoticPlugin_Hypothesis.hxx | 2 +- src/HexoticPlugin/HexoticPlugin_Hypothesis_i.cxx | 2 +- src/HexoticPlugin/HexoticPlugin_Hypothesis_i.hxx | 2 +- src/HexoticPlugin/HexoticPlugin_i.cxx | 2 +- src/HexoticPlugin/Makefile.am | 2 +- src/Makefile.am | 2 +- 53 files changed, 61 insertions(+), 57 deletions(-) diff --git a/AUTHORS b/AUTHORS index cc18fd6..3abac42 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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/ChangeLog b/ChangeLog index 403e657..d1f0774 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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/HexoticPLUGIN_version.h.in b/HexoticPLUGIN_version.h.in index c6eae56..0e71a61 100644 --- a/HexoticPLUGIN_version.h.in +++ b/HexoticPLUGIN_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D +// Copyright (C) 2007-2013 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/INSTALL b/INSTALL index a477b88..4a2b6b8 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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/Makefile.am b/Makefile.am index f13ae52..de92f3b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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/NEWS b/NEWS index d22503a..d53b4c6 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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/adm_local/Makefile.am b/adm_local/Makefile.am index 4e47880..75b948f 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index 55a47ce..dd764d0 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index 8c85193..4e79a82 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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/adm_local/unix/config_files/check_BLSURFPLUGIN.m4 b/adm_local/unix/config_files/check_BLSURFPLUGIN.m4 index 1f963bc..b5d1bd3 100644 --- a/adm_local/unix/config_files/check_BLSURFPLUGIN.m4 +++ b/adm_local/unix/config_files/check_BLSURFPLUGIN.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D +dnl Copyright (C) 2007-2013 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 diff --git a/adm_local/unix/config_files/check_Hexotic.m4 b/adm_local/unix/config_files/check_Hexotic.m4 index 43876cc..e60c1ca 100755 --- a/adm_local/unix/config_files/check_Hexotic.m4 +++ b/adm_local/unix/config_files/check_Hexotic.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D +dnl Copyright (C) 2007-2013 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 diff --git a/adm_local/unix/config_files/check_HexoticPLUGIN.m4 b/adm_local/unix/config_files/check_HexoticPLUGIN.m4 index 6d66388..d2e9f6c 100644 --- a/adm_local/unix/config_files/check_HexoticPLUGIN.m4 +++ b/adm_local/unix/config_files/check_HexoticPLUGIN.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D +dnl Copyright (C) 2007-2013 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 diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 623dfe5..6a073bf 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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 @@ -62,6 +62,11 @@ docdir = $(datadir)/doc/salome # common rules +# ============================================================ +# Cmake files wildcard (to add then to the distribution) +# ============================================================ +CMAKEFILES = $(notdir $(wildcard $(srcdir)/CMakeLists.txt)) + # meta object implementation files generation (moc) %_moc.cxx: %.h $(MOC) $< -o $@ @@ -80,7 +85,8 @@ ui_%.h: %.ui # extra distributed files EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ - $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) + $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) \ + $(CMAKEFILES) # customize clean operation mostlyclean-local: diff --git a/bin/Makefile.am b/bin/Makefile.am index 24e249a..51604d5 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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 b/build_cmake index aea1b59..01af0c2 100755 --- a/build_cmake +++ b/build_cmake @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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 aee9960..aa2cbc3 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,4 +1,4 @@ -@REM Copyright (C) 2007-2012 CEA/DEN, EDF R&D +@REM Copyright (C) 2007-2013 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 diff --git a/build_configure b/build_configure index 5f2a133..88c46bd 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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/clean_configure b/clean_configure index 9997669..11b4ef1 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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/configure.ac b/configure.ac index a060212..d65f17f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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 @@ -23,7 +23,7 @@ # Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # --- # -AC_INIT([Salome2 Project HexoticPLUGIN module], [7.1.0], [webmaster.salome@opencascade.com], [SalomeHexoticPLUGIN]) +AC_INIT([Salome2 Project HexoticPLUGIN module], [6.6.0], [webmaster.salome@opencascade.com], [SalomeHexoticPLUGIN]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET diff --git a/doc/Makefile.am b/doc/Makefile.am index 570ccb2..40f4a8a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # 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/doc/salome/Makefile.am b/doc/salome/Makefile.am index 9ded0be..dc7adde 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # 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/doc/salome/gui/HexoticPLUGIN/CMakeLists.txt b/doc/salome/gui/HexoticPLUGIN/CMakeLists.txt index 5576137..126d90c 100755 --- a/doc/salome/gui/HexoticPLUGIN/CMakeLists.txt +++ b/doc/salome/gui/HexoticPLUGIN/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # 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/doc/salome/gui/HexoticPLUGIN/Makefile.am b/doc/salome/gui/HexoticPLUGIN/Makefile.am index dd1a988..a78d464 100755 --- a/doc/salome/gui/HexoticPLUGIN/Makefile.am +++ b/doc/salome/gui/HexoticPLUGIN/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # 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/doc/salome/gui/HexoticPLUGIN/doxyfile.in b/doc/salome/gui/HexoticPLUGIN/doxyfile.in index cb13c4b..23a50cc 100755 --- a/doc/salome/gui/HexoticPLUGIN/doxyfile.in +++ b/doc/salome/gui/HexoticPLUGIN/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # 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/doc/salome/gui/HexoticPLUGIN/doxyfile_py.in b/doc/salome/gui/HexoticPLUGIN/doxyfile_py.in index 40dffc8..8983011 100755 --- a/doc/salome/gui/HexoticPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/HexoticPLUGIN/doxyfile_py.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # 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/doc/salome/gui/HexoticPLUGIN/static/footer.html b/doc/salome/gui/HexoticPLUGIN/static/footer.html index 4c89a2b..f89cfbb 100755 --- a/doc/salome/gui/HexoticPLUGIN/static/footer.html +++ b/doc/salome/gui/HexoticPLUGIN/static/footer.html @@ -3,10 +3,8 @@
- Copyright © 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
- Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+ Copyright © 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
- \ No newline at end of file diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index 9f88ae0..34663d9 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # 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/idl/HexoticPlugin_Algorithm.idl b/idl/HexoticPlugin_Algorithm.idl index 31a9f90..b119686 100644 --- a/idl/HexoticPlugin_Algorithm.idl +++ b/idl/HexoticPlugin_Algorithm.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D +// Copyright (C) 2007-2013 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/idl/Makefile.am b/idl/Makefile.am index cea2378..f851009 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 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/resources/HexoticPLUGIN.xml b/resources/HexoticPLUGIN.xml index cd4d251..5365eb1 100644 --- a/resources/HexoticPLUGIN.xml +++ b/resources/HexoticPLUGIN.xml @@ -1,7 +1,7 @@