Merge branch V7_3_1_BR

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99b8717e3019f0357a82d58a26a4e0b8ab898268..2461be6808339116873df0776988f33bdbc03c41 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  OPEN CASCADE
 #
 # 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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -32,7 +32,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Find KERNEL
 # ===========
@@ -41,14 +41,11 @@ IF(EXISTS ${KERNEL_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
   INCLUDE(SalomeMacros)
   FIND_PACKAGE(SalomeKERNEL REQUIRED)
+  KERNEL_WITH_CORBA() # check whether KERNEL builded with CORBA
 ELSE(EXISTS ${KERNEL_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR")
 ENDIF(EXISTS ${KERNEL_ROOT_DIR})
 
-IF(SALOME_LIGHT_ONLY)
-  MESSAGE(FATAL_ERROR "RANDOMIZER module can't be built in Light mode (without CORBA)")
-ENDIF()
-
 # Platform setup
 # ==============
 INCLUDE(SalomeSetupPlatform)   # From KERNEL

diff --git a/SalomeRANDOMIZERConfig.cmake.in b/SalomeRANDOMIZERConfig.cmake.in
index 92ebef3f030291bf0471d81a93845c666acc1548..63c784b085c570c89fab438c4bb2904df21fc7ca 100644 (file)
--- a/SalomeRANDOMIZERConfig.cmake.in
+++ b/SalomeRANDOMIZERConfig.cmake.in
@@ -5,28 +5,24 @@
 #
 
 ###############################################################
-#  Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  OPEN CASCADE
 #
-#  Copyright (C) 2003-2007  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, or (at your option) any later version.
 #
-#  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.
 #
-#  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
 #
-#  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/ or email : webmaster.salome@opencascade.com
 #
-#  See http://www.salome-platform.org/ or
-#  email : webmaster.salome@opencascade.com
-###############################################################
 
 ### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE:
 @PACKAGE_INIT@

diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt
index 84d97c22e5014fa450423e11fb3931dd15cccf26..df7258764bc9224b6731f8e7759800109df81220 100755 (executable)
--- a/adm_local/CMakeLists.txt
+++ b/adm_local/CMakeLists.txt
@@ -1,12 +1,9 @@
-# Copyright (C) 2007-2013  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) 2013-2014  OPEN CASCADE
 #
 # 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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
index 0bfe4d2dffded0c3a2fc9357c5e2ebcea522d6a7..dcf75bd76e36d78357d1720902340df0b9307e12 100755 (executable)
--- a/adm_local/cmake_files/CMakeLists.txt
+++ b/adm_local/cmake_files/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  OPEN CASCADE
 #
 # 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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/adm_local/cmake_files/FindSalomeRANDOMIZER.cmake b/adm_local/cmake_files/FindSalomeRANDOMIZER.cmake
index 2cb88d73c1f2e4852a1bb53437f3917a7e8b2e99..1010117c3893d4bf50cc2aeb5b5e1bf19630f3d8 100644 (file)
--- a/adm_local/cmake_files/FindSalomeRANDOMIZER.cmake
+++ b/adm_local/cmake_files/FindSalomeRANDOMIZER.cmake
@@ -1,9 +1,9 @@
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  OPEN CASCADE
 #
 # 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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,7 +16,6 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-#
 
 IF(NOT SalomeRANDOMIZER_FIND_QUIETLY)
   MESSAGE(STATUS "Looking for Salome RANDOMIZER ...")

diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt
index 2f895ae4bc65192d67fe49837c7fbdaa8b7fd4a5..4ce9e720c71a43021f3a0150a01756001be2fd32 100755 (executable)
--- a/adm_local/unix/CMakeLists.txt
+++ b/adm_local/unix/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  OPEN CASCADE
 #
 # 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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt
index 7302cbe55df83678691c7db5bbda5260b74c7c02..36942fe2dd33a760d8e090cc4580b86dcb73e925 100755 (executable)
--- a/adm_local/unix/config_files/CMakeLists.txt
+++ b/adm_local/unix/config_files/CMakeLists.txt
@@ -1,12 +1,9 @@
-# Copyright (C) 2007-2013  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) 2013-2014  OPEN CASCADE
 #
 # 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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/adm_local/unix/config_files/check_RANDOMIZER.m4 b/adm_local/unix/config_files/check_RANDOMIZER.m4
index ca7e5f3ebcdba6b12dc6a14afa1464b93d732fa8..23ec2bef74120181407d206e781363072cfb78c0 100755 (executable)
--- a/adm_local/unix/config_files/check_RANDOMIZER.m4
+++ b/adm_local/unix/config_files/check_RANDOMIZER.m4
@@ -1,9 +1,9 @@
-dnl Copyright (C) 2005-2013  OPEN CASCADE
+dnl Copyright (C) 2005-2014  OPEN CASCADE
 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
 dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License.
+dnl version 2.1 of the License, or (at your option) any later version.
 dnl
 dnl This library is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 9c35c792fc252089168794d46296d835de617e07..94c6bf19919243daae1e3dc27c9fe93640e1442f 100644 (file)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2013-2014  OPEN CASCADE
 #
 # 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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index a535739cb6c7346e64da420e6e6a42261ede573d..e5e712cf628c7b2fd513a94aa841b4dc170b5bb5 100755 (executable)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  OPEN CASCADE
 #
 # 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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/idl/Randomizer.idl b/idl/Randomizer.idl
index dded28848c52657dc776ebcc249c1ef44c2c81de..8bc1f91e0202238f2c953a328cb8b99f5a1d287b 100644 (file)
--- a/idl/Randomizer.idl
+++ b/idl/Randomizer.idl
@@ -1,9 +1,9 @@
-// Copyright (C) 2005-2013  OPEN CASCADE
+// Copyright (C) 2005-2014  OPEN CASCADE
 //
 // 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.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index ccc0f478076f98963a444464c6d6d4272d69a0bd..e8a78860e40538faf8bdf5802c5e2dc3af7633ff 100755 (executable)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -1,12 +1,9 @@
-# Copyright (C) 2007-2013  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) 2013-2014  OPEN CASCADE
 #
 # 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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/resources/RANDOMIZERCatalog.xml.in b/resources/RANDOMIZERCatalog.xml.in
index 79900ea64663353626169cf267ea7d06fdde1971..51e1e923c3aa7702963bb43170fac966330cd585 100644 (file)
--- a/resources/RANDOMIZERCatalog.xml.in
+++ b/resources/RANDOMIZERCatalog.xml.in
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='us-ascii' ?>
 <!--
-  Copyright (C) 2005-2013  OPEN CASCADE
+  Copyright (C) 2005-2014  OPEN CASCADE
 
   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.
+  version 2.1 of the License, or (at your option) any later version.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index eb27cb216849170c94fda9c8ea2ace68be9003f2..f8b7c64a2547c1ed0ff00d1fb1d741d371372d30 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -1,10 +1,10 @@
 <!--
-  Copyright (C) 2005-2013  OPEN CASCADE
+  Copyright (C) 2005-2014  OPEN CASCADE
 
   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.
+  version 2.1 of the License, or (at your option) any later version.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b146419e330997c604511e53e89889abf85d8621..9560587578c1c081d64186c4c69066ce0e678431 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  OPEN CASCADE
 #
 # 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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/Randomizer/CMakeLists.txt b/src/Randomizer/CMakeLists.txt
index 219ec393c044529347a8e03437a91031c0e45d37..b190353249fe97d4f4877466e8c7af9f84433a33 100644 (file)
--- a/src/Randomizer/CMakeLists.txt
+++ b/src/Randomizer/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  OPEN CASCADE
 #
 # 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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/Randomizer/RANDOMIZER.py b/src/Randomizer/RANDOMIZER.py
index d10687e194aaccf3a1e2fdee338dd6fca6de9ecc..b62a3fc25fd281e52e9e3733679638cd21b6eff2 100644 (file)
--- a/src/Randomizer/RANDOMIZER.py
+++ b/src/Randomizer/RANDOMIZER.py
@@ -1,9 +1,9 @@
-# Copyright (C) 2005-2013  OPEN CASCADE
+# Copyright (C) 2005-2014  OPEN CASCADE
 #
 # 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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of