Merge branch 'V7_dev'

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/CMakeLists.txt b/CMakeLists.txt
index df290050435ce9e7145802ce255a274cd4a99d62..ececcec748f4fde7340e600f5a4602e0acafbc57 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -66,7 +66,8 @@ ENDIF()
 ##
 ## From KERNEL:
 ##
-FIND_PACKAGE(SalomePython REQUIRED)
+FIND_PACKAGE(SalomePythonInterp REQUIRED)
+FIND_PACKAGE(SalomePythonLibs REQUIRED)
 FIND_PACKAGE(SalomeOmniORB REQUIRED)
 FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/INSTALL b/INSTALL
deleted file mode 100644 (file)
index 1279d94..0000000
--- a/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-SALOME2 : RANDOMIZER module (sample)

diff --git a/NEWS b/NEWS
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/README b/README
index c6404304826f5720a9bcb102a31f98cf537a67b7..a7372fd94d6a2aa58663977a76785cf6973d80a4 100644 (file)
--- a/README
+++ b/README
@@ -1,9 +1,100 @@
-This module is a Salome example of a module that is interfaced with MED library.
-
-Installation and compilation is like every Salome modules :
- mkdir build_dir 
- mkdir instal_dir
- cd build_dir
- cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=instal_dir ../src_dir
- make
- make install
+******************************
+About SALOME RANDOMIZER sample
+******************************
+
+RANDOMIZER is a simple example of SALOME module written in Python and
+implementing services via CORBA interface. It works in conjunction
+with SALOME SIERPINSKY sample module.
+
+For more information please visit the SALOME platform web site:
+
+  <http://www.salome-platform.org/>
+
+=======
+License
+=======
+
+SALOME platform is distributed under the GNU Lesser General Public License.
+See COPYING file for more details.
+
+Also, additional information can be found at SALOME platform web site:
+
+  <http://www.salome-platform.org/downloads/license/>
+
+============
+Installation
+============
+
+--------------
+Pre-requisites
+--------------
+
+SALOME platform relies on a set of third-party softwares; some of them are needed
+at build time only, while other ones are needed in runtime also.
+
+For more information about the pre-requisites please visit SALOME platform web
+site:
+
+* Check Release Notes and Software Requirements of the latest SALOME release at
+
+  <http://www.salome-platform.org/downloads/current-version/>
+
+* Pre-requisites page at SALOME web site:
+
+  <http://www.salome-platform.org/downloads/license/>
+
+Note: SALOME RANDOMIZER needs SALOME KERNEL as a pre-requisite.
+
+------------------
+Basic Installation
+------------------
+
+The build procedure of the SALOME platform is implemented with CMake.
+In order to build the module you have to do the following actions: 
+
+1. Set up environment for pre-requisites (see "Pre-requisites" section above).
+
+2. Create a build directory:
+
+   % mkdir RANDOMIZER_BUILD
+
+3. Configure the build procedure:
+
+   % cd RANDOMIZER_BUILD
+   % cmake -DCMAKE_BUILD_TYPE=<mode> -DCMAKE_INSTALL_PREFIX=<installation_directory> <path_to_src_dir>
+
+   where
+   - <mode> is either Release or Debug (default: Release);
+   - <installation_directory> is a destination folder to install SALOME RANDOMIZER
+     module (default: /usr); 
+   - <path_to_src_dir> is a path to the SALOME RANDOMIZER sources directory.
+
+   Note: by default (if CMAKE_INSTALL_PREFIX option is not given), SALOME RANDOMIZER
+   module will be configured for installation to the /usr directory that requires
+   root permissions to complete the installation.
+
+4. Build and install:
+
+   % make
+   % make install
+
+   This will install SALOME RANDOMIZER module to the <installation_directory>
+   specified to cmake command on the previous step.
+
+-------------------
+Custom installation
+-------------------
+
+SALOME RANDOMIZER module supports a set of advanced configuration options;
+for more details learn CMakeLists.txt file in the root source directory.
+
+You can also use other options of cmake command to customize your installation.
+Learn more about available options by typing
+
+   % cmake --help
+
+===============
+Troubleshooting
+===============
+
+Please, send a mail to webmaster.salome@opencascade.com.

diff --git a/SalomeRANDOMIZERConfig.cmake.in b/SalomeRANDOMIZERConfig.cmake.in
index 1495d92dd99acbb9282dd85f1bfafdc09eca1498..0b64ff95cb4d4bfdcaab0a1ce7bf7c5dd21c0855 100644 (file)
--- a/SalomeRANDOMIZERConfig.cmake.in
+++ b/SalomeRANDOMIZERConfig.cmake.in
@@ -5,7 +5,7 @@
 #
 
 ###############################################################
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  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/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt
index 6e8e91cd1b9925b4d7e446c7dd95851bc5666b99..b01f446d8f3a42e34c7b4f0a50f57a279a857113 100755 (executable)
--- a/adm_local/CMakeLists.txt
+++ b/adm_local/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  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/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
index 85cf0ca9dca3effa532d4cb764ea1fec875fb1dc..9548e8a270835b620f5de930a2e205e61d02cc0d 100755 (executable)
--- a/adm_local/cmake_files/CMakeLists.txt
+++ b/adm_local/cmake_files/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  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/adm_local/cmake_files/FindSalomeRANDOMIZER.cmake b/adm_local/cmake_files/FindSalomeRANDOMIZER.cmake
index c76bb6e7ba9ab2d2de0127a753bf4229ebe96fbf..c897fa15c295e8146604f7acbb5183dcb98e8a46 100644 (file)
--- a/adm_local/cmake_files/FindSalomeRANDOMIZER.cmake
+++ b/adm_local/cmake_files/FindSalomeRANDOMIZER.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  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/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt
index 800c376f7a696c39348708878c0fd1c927aa820e..cdd76ebbc08f3ecd44d6800c470fe4e6663849fb 100755 (executable)
--- a/adm_local/unix/CMakeLists.txt
+++ b/adm_local/unix/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  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/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt
index 56492c66a519a1290fabfd61e381497f7b6fd065..9fe925959cc79374752353cec58aff0275773806 100755 (executable)
--- a/adm_local/unix/config_files/CMakeLists.txt
+++ b/adm_local/unix/config_files/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  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/adm_local/unix/config_files/check_RANDOMIZER.m4 b/adm_local/unix/config_files/check_RANDOMIZER.m4
index c981787793bb8c5a12e3ab4f7ed89d14a7df545d..99a85332b7accd6f50ad150d7a31b9406a006dfc 100755 (executable)
--- a/adm_local/unix/config_files/check_RANDOMIZER.m4
+++ b/adm_local/unix/config_files/check_RANDOMIZER.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2005-2015  OPEN CASCADE
+dnl Copyright (C) 2005-2016  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

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 5d4b3912dfec093a2f11e5197cb9e6f3ba1e09a1..c6576c81dc8d053a581c98e90e2fcc2e10d97711 100644 (file)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  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/CMakeLists.txt b/idl/CMakeLists.txt
index 46e87025d62296abef377a4301719b2190a7659a..13b323582d1c687fe35e3e8d8091b2bcf1792698 100755 (executable)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  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/Randomizer.idl b/idl/Randomizer.idl
index db153efad5778acdbb545dea52c78620320958f3..aa2cedb27fb54f99f2ff231777523fdce7307ea1 100644 (file)
--- a/idl/Randomizer.idl
+++ b/idl/Randomizer.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2015  OPEN CASCADE
+// Copyright (C) 2005-2016  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/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 0144eb9a8b4dc5a2bfbce8834040fa2e5fde5d9f..70a4f67c82d767190d82e7286710becc875a3abf 100755 (executable)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  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/resources/RANDOMIZERCatalog.xml.in b/resources/RANDOMIZERCatalog.xml.in
index 4a262e41e905045c40c54760a9d113c44aa590c4..781ec90944a6bbcbf2c86db18b49fabb2b17ef85 100644 (file)
--- a/resources/RANDOMIZERCatalog.xml.in
+++ b/resources/RANDOMIZERCatalog.xml.in
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='us-ascii' ?>
 <!--
-  Copyright (C) 2005-2015  OPEN CASCADE
+  Copyright (C) 2005-2016  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/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 0b28f7f3d91a0c0c4ae0ebd9a346a98981f949b2..af6b6be414a8f85d001e73a94d3136f70c4132fa 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2005-2015  OPEN CASCADE
+  Copyright (C) 2005-2016  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/src/CMakeLists.txt b/src/CMakeLists.txt
index 9b51ac83920a4af22a1e7a063d5288dd50b33f1b..d48dbe8e5a9811ebc89da068278f28244bee6f68 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  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/src/Randomizer/CMakeLists.txt b/src/Randomizer/CMakeLists.txt
index b2cd23ce537eebdb40a43f9d6796f055801e2a2d..9f403241cb87ad759488cca55bf15645edf939d0 100644 (file)
--- a/src/Randomizer/CMakeLists.txt
+++ b/src/Randomizer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  OPEN CASCADE
+# Copyright (C) 2013-2016  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/src/Randomizer/RANDOMIZER.py b/src/Randomizer/RANDOMIZER.py
index 3de99c593796d7c8aa62e6c06503ffb8a3c7526e..f134c48da06e839051a4cbd6bb2d77bc7acbb0b0 100644 (file)
--- a/src/Randomizer/RANDOMIZER.py
+++ b/src/Randomizer/RANDOMIZER.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2015  OPEN CASCADE
+# Copyright (C) 2005-2016  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public