Merge branch 'V9_2_2_BR'

diff --git a/ATOMIC_version.h.in b/ATOMIC_version.h.in
index b5a0926c1cc49ba365262c53610d00400497f6af..4cee94077d41e9d6ba566d51e95ece7bb1af93ef 100644 (file)
--- a/ATOMIC_version.h.in
+++ b/ATOMIC_version.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/CMakeLists.txt b/CMakeLists.txt
index 9af60396b3295ee1c491ba77f17a93b9baacdb5a..0322417ee0bccdf63f661ca0b556b0206ab92c46 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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
@@ -35,7 +35,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 2)
 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)
 
 # Common CMake macros
 # ===================
@@ -66,7 +66,7 @@ INCLUDE(SalomeSetupPlatform)   # From KERNEL
 # Always build libraries as shared objects:
 SET(BUILD_SHARED_LIBS TRUE)
 # Local macros:
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
+LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 # User options 
 # ============
@@ -120,17 +120,9 @@ SET(SALOME_INSTALL_SCRIPT_DATA "${SALOME_INSTALL_SCRIPT_DATA}" CACHE PATH
    "Install path: SALOME script data")
 SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH 
    "Install path: SALOME Python scripts")
-SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "${SALOME_INSTALL_APPLISKEL_SCRIPTS}" CACHE PATH 
-   "Install path: SALOME application skeleton - scripts")
-SET(SALOME_INSTALL_APPLISKEL_PYTHON "${SALOME_INSTALL_APPLISKEL_PYTHON}" CACHE PATH 
-   "Install path: SALOME application skeleton - Python")
 SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "Install path: SALOME Python stuff")
-SET(SALOME_INSTALL_PYTHON_SHARED "${SALOME_INSTALL_PYTHON_SHARED}" CACHE PATH 
-   "Install path: SALOME Python shared modules")
 SET(SALOME_INSTALL_CMAKE_LOCAL "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH 
     "Install path: local SALOME CMake files") 
-SET(SALOME_INSTALL_AMCONFIG_LOCAL "${SALOME_INSTALL_AMCONFIG_LOCAL}" CACHE PATH
-  "Install path: local SALOME config files (obsolete, to be removed)")
 SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME resources")
 SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation")
 
@@ -139,10 +131,8 @@ SET(SALOME_ATOMIC_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/atomic" CACHE PATH "In
 
 MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_HEADERS)
 MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON)
-MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS  SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES)
-MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED)
-MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC)
-MARK_AS_ADVANCED(SALOME_ATOMIC_INSTALL_RES_DATA)
+MARK_AS_ADVANCED(SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES SALOME_INSTALL_PYTHON)
+MARK_AS_ADVANCED(SALOME_INSTALL_DOC SALOME_ATOMIC_INSTALL_RES_DATA)
 
 # Accumulate environment variables for ATOMIC module
 SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS})
@@ -151,7 +141,7 @@ SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${
 # Sources 
 # ========
 
-ADD_SUBDIRECTORY(adm_local)
+ADD_SUBDIRECTORY(cmake)
 ADD_SUBDIRECTORY(resources)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(bin)

diff --git a/README b/README
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/SalomeATOMICConfig.cmake.in b/SalomeATOMICConfig.cmake.in
index 3b30ef3df7ab9f63a5211c992c3af9ff203a5613..0b349182d18bff5afda49d6acff7ae6c7cd8dc0f 100644 (file)
--- a/SalomeATOMICConfig.cmake.in
+++ b/SalomeATOMICConfig.cmake.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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
@@ -92,14 +92,10 @@ SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@")
 SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@")
 SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@")
 SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@")
-SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@")
-SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") 
 SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@")
 SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@")
-SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@")
 SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@")
 SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@")
-SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@")
 
 # Include GUI targets if they were not already loaded:
 IF(NOT (TARGET Event))

diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt
deleted file mode 100755 (executable)
index 2341538..0000000
--- a/adm_local/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2013-2016  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
-# 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 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
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-ADD_SUBDIRECTORY(unix)
-ADD_SUBDIRECTORY(cmake_files)

diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
deleted file mode 100755 (executable)
index 0c5fafa..0000000
--- a/adm_local/cmake_files/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2013-2016  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
-# 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 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
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# ===============================================================
-# Files to be installed
-# ===============================================================
-
-# These files are data, module or lib files
-SET(_adm_data
-  FindSalomeATOMIC.cmake
-)
-INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL})

diff --git a/adm_local/cmake_files/FindSalomeATOMIC.cmake b/adm_local/cmake_files/FindSalomeATOMIC.cmake
deleted file mode 100644 (file)
index 8f34388..0000000
--- a/adm_local/cmake_files/FindSalomeATOMIC.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2007-2016  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
-# 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 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
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-IF(NOT SalomeATOMIC_FIND_QUIETLY)
-  MESSAGE(STATUS "Looking for Salome ATOMIC ...")
-ENDIF()
-
-SET(CMAKE_PREFIX_PATH "${ATOMIC_ROOT_DIR}")
-
-SALOME_FIND_PACKAGE(SalomeATOMIC SalomeATOMIC CONFIG)
-
-IF(NOT SalomeATOMIC_FIND_QUIETLY)
-  MESSAGE(STATUS "Found Salome ATOMIC: ${ATOMIC_ROOT_DIR}")
-ENDIF()
-
-FOREACH(_res ${SalomeATOMIC_EXTRA_ENV})
-  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeATOMIC_EXTRA_ENV_${_res}}")
-ENDFOREACH()
\ No newline at end of file

diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt
deleted file mode 100755 (executable)
index 758e103..0000000
--- a/adm_local/unix/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2013-2016  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
-# 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 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
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-ADD_SUBDIRECTORY(config_files)

diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt
deleted file mode 100755 (executable)
index add18d0..0000000
--- a/adm_local/unix/config_files/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2013-2016  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
-# 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 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
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-SET(_m4_data
-  check_ATOMIC.m4
-)
-            
-INSTALL(FILES ${_m4_data} DESTINATION ${SALOME_INSTALL_AMCONFIG_LOCAL}/config_files)

diff --git a/adm_local/unix/config_files/check_ATOMIC.m4 b/adm_local/unix/config_files/check_ATOMIC.m4
deleted file mode 100755 (executable)
index 5d494c6..0000000
--- a/adm_local/unix/config_files/check_ATOMIC.m4
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (C) 2007-2016  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
-# 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 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
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-AC_DEFUN([CHECK_ATOMIC],[
-
-AC_CHECKING(for ATOMIC)
-
-ATOMIC_ok=no
-
-AC_ARG_WITH(atomic,
-           [  --with-atomic=DIR root directory path of ATOMIC module installation ],
-           ATOMIC_DIR="$withval",ATOMIC_DIR="")
-
-if test "x$ATOMIC_DIR" == "x" ; then
-   # no --with-atomic-dir option used
-   if test "x$ATOMIC_ROOT_DIR" != "x" ; then
-      # ATOMIC_ROOT_DIR environment variable defined
-      ATOMIC_DIR=$ATOMIC_ROOT_DIR
-   fi
-fi
-
-if test -f ${ATOMIC_DIR}/lib/salome/libATOMIC.so ; then
-   ATOMIC_ok=yes
-   AC_MSG_RESULT(Using ATOMIC module distribution in ${ATOMIC_DIR})
-
-   if test "x$ATOMIC_ROOT_DIR" == "x" ; then
-      ATOMIC_ROOT_DIR=${ATOMIC_DIR}
-   fi
-  
-   ATOMIC_LDFLAGS=-L${ATOMIC_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-   ATOMIC_CXXFLAGS=-I${ATOMIC_DIR}/include/salome
-else
-   AC_MSG_WARN("Cannot find valid ATOMIC module installation)
-fi
-  
-AC_MSG_RESULT(for ATOMIC: $ATOMIC_ok)
-
-AC_SUBST(ATOMIC_ROOT_DIR)
-AC_SUBST(ATOMIC_LDFLAGS)
-AC_SUBST(ATOMIC_CXXFLAGS)
- 
-])dnl
- 

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 19d4473..991e4dd
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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/bin/VERSION.in b/bin/VERSION.in
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
new file mode 100644 (file)
index 0000000..3331a6b
--- /dev/null
+++ b/cmake/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Copyright (C) 2013-2019  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
+# 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 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
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+# ===============================================================
+# Files to be installed
+# ===============================================================
+
+# These files are data, module or lib files
+SET(_adm_data
+  FindSalomeATOMIC.cmake
+)
+INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL})

diff --git a/cmake/FindSalomeATOMIC.cmake b/cmake/FindSalomeATOMIC.cmake
new file mode 100644 (file)
index 0000000..5ad365a
--- /dev/null
+++ b/cmake/FindSalomeATOMIC.cmake
@@ -0,0 +1,34 @@
+# Copyright (C) 2007-2019  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
+# 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 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
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+IF(NOT SalomeATOMIC_FIND_QUIETLY)
+  MESSAGE(STATUS "Looking for Salome ATOMIC ...")
+ENDIF()
+
+SET(CMAKE_PREFIX_PATH "${ATOMIC_ROOT_DIR}")
+
+SALOME_FIND_PACKAGE(SalomeATOMIC SalomeATOMIC CONFIG)
+
+IF(NOT SalomeATOMIC_FIND_QUIETLY)
+  MESSAGE(STATUS "Found Salome ATOMIC: ${ATOMIC_ROOT_DIR}")
+ENDIF()
+
+FOREACH(_res ${SalomeATOMIC_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeATOMIC_EXTRA_ENV_${_res}}")
+ENDFOREACH()
\ No newline at end of file

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 1c17086..8b4ed97
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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
@@ -23,12 +23,9 @@ SET(ATOMIC_RESOURCES_FILES
   atom_rename.png
   atom.png
   ATOMIC.png
-  LightApp.xml
   sample.xml
+  SalomeApp.xml
 )
 
 INSTALL(FILES ${ATOMIC_RESOURCES_FILES} DESTINATION ${SALOME_ATOMIC_INSTALL_RES_DATA})
-
-MESSAGE(STATUS "Creation of ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml")
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml DESTINATION ${SALOME_ATOMIC_INSTALL_RES_DATA})
\ No newline at end of file
+SALOME_CONFIGURE_FILE(LightApp.xml.in LightApp.xml INSTALL ${SALOME_ATOMIC_INSTALL_RES_DATA})

diff --git a/resources/LightApp.xml b/resources/LightApp.xml
deleted file mode 100644 (file)
index 9e7d313..0000000
--- a/resources/LightApp.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE document>
-<!--
-  Copyright (C) 2007-2016  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
-  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 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
-
-  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
--->
-<document>
- <section name="launch" >
-  <parameter name="modules" value="ATOMIC" />
- </section>
- <section name="ATOMIC" >
-  <parameter name="name" value="Atomic" />
-  <parameter name="icon" value="ATOMIC.png" />
- </section>
- <section name="resources" >
-  <parameter name="ATOMIC" value="${ATOMIC_ROOT_DIR}/share/salome/resources/atomic" />
- </section>
- <section name="windows_geometry">
-  <parameter name="ATOMIC" value="#00 #00 #00 #FF #00 #00 #00 #00 #FD #00 #00 #00 #02 #00 #00 #00 #00 #00 #00 #01 #00 #00 #00 #02 #6B #FC #02 #00 #00 #00 #01 #FB #00 #00 #00 #22 #00 #6F #00 #62 #00 #6A #00 #65 #00 #63 #00 #74 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #59 #00 #00 #02 #6B #00 #00 #00 #53 #00 #FF #FF #FF #00 #00 #00 #03 #00 #00 #05 #40 #00 #00 #00 #53 #FC #01 #00 #00 #00 #01 #FB #00 #00 #00 #22 #00 #70 #00 #79 #00 #74 #00 #68 #00 #6F #00 #6E #00 #43 #00 #6F #00 #6E #00 #73 #00 #6F #00 #6C #00 #65 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #00 #00 #00 #05 #40 #00 #00 #00 #46 #00 #FF #FF #FF #00 #00 #04 #38 #00 #00 #02 #6B #00 #00 #00 #04 #00 #00 #00 #04 #00 #00 #00 #08 #00 #00 #00 #08 #FC #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #1C #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #1A #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #CE #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #01 #00 #00 #00 #0C #00 #41 #00 #74 #00 #6F #00 #6D #00 #69 #00 #63 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00"/>
- </section>
- <section name="windows_visibility">
-  <parameter name="ATOMIC" value="#00 #00 #00 #00 #03 #00 #00 #00 #0C #00 #41 #00 #74 #00 #6F #00 #6D #00 #69 #00 #63 #01 #00 #00 #00 #1A #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #1C #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #01 #00 #00 #00 #02 #00 #00 #00 #22 #00 #6F #00 #62 #00 #6A #00 #65 #00 #63 #00 #74 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #22 #00 #70 #00 #79 #00 #74 #00 #68 #00 #6F #00 #6E #00 #43 #00 #6F #00 #6E #00 #73 #00 #6F #00 #6C #00 #65 #00 #44 #00 #6F #00 #63 #00 #6B #01"/>
- </section>
-</document>

diff --git a/resources/LightApp.xml.in b/resources/LightApp.xml.in
new file mode 100644 (file)
index 0000000..25ddfa5
--- /dev/null
+++ b/resources/LightApp.xml.in
@@ -0,0 +1,17 @@
+<!DOCTYPE document>
+<document>
+  <section name="ATOMIC" >
+    <parameter name="name" value="Atomic" />
+    <parameter name="icon" value="ATOMIC.png" />
+    <parameter name="version" value="@SALOMEATOMIC_VERSION@" />
+  </section>
+  <section name="resources" >
+    <parameter name="ATOMIC" value="${ATOMIC_ROOT_DIR}/share/salome/resources/atomic" />
+  </section>
+  <section name="windows_geometry">
+    <parameter name="ATOMIC" value="#00 #00 #00 #FF #00 #00 #00 #00 #FD #00 #00 #00 #02 #00 #00 #00 #00 #00 #00 #01 #00 #00 #00 #02 #6B #FC #02 #00 #00 #00 #01 #FB #00 #00 #00 #22 #00 #6F #00 #62 #00 #6A #00 #65 #00 #63 #00 #74 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #59 #00 #00 #02 #6B #00 #00 #00 #53 #00 #FF #FF #FF #00 #00 #00 #03 #00 #00 #05 #40 #00 #00 #00 #53 #FC #01 #00 #00 #00 #01 #FB #00 #00 #00 #22 #00 #70 #00 #79 #00 #74 #00 #68 #00 #6F #00 #6E #00 #43 #00 #6F #00 #6E #00 #73 #00 #6F #00 #6C #00 #65 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #00 #00 #00 #05 #40 #00 #00 #00 #46 #00 #FF #FF #FF #00 #00 #04 #38 #00 #00 #02 #6B #00 #00 #00 #04 #00 #00 #00 #04 #00 #00 #00 #08 #00 #00 #00 #08 #FC #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #1C #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #1A #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #CE #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #01 #00 #00 #00 #0C #00 #41 #00 #74 #00 #6F #00 #6D #00 #69 #00 #63 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00"/>
+  </section>
+  <section name="windows_visibility">
+    <parameter name="ATOMIC" value="#00 #00 #00 #00 #03 #00 #00 #00 #0C #00 #41 #00 #74 #00 #6F #00 #6D #00 #69 #00 #63 #01 #00 #00 #00 #1A #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #1C #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #01 #00 #00 #00 #02 #00 #00 #00 #22 #00 #6F #00 #62 #00 #6A #00 #65 #00 #63 #00 #74 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #22 #00 #70 #00 #79 #00 #74 #00 #68 #00 #6F #00 #6E #00 #43 #00 #6F #00 #6E #00 #73 #00 #6F #00 #6C #00 #65 #00 #44 #00 #6F #00 #63 #00 #6B #01"/>
+  </section>
+</document>

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
new file mode 100644 (file)
index 0000000..276f164
--- /dev/null
+++ b/resources/SalomeApp.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE document>
+<document>
+  <import name="LightApp"/>
+</document>

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
deleted file mode 100644 (file)
index 669a5cb..0000000
--- a/resources/SalomeApp.xml.in
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE document>
-<!--
-  Copyright (C) 2007-2016  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
-  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 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
-
-  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
--->
-<document>
- <section name="launch" >
-  <parameter name="modules" value="ATOMIC" />
- </section>
- <section name="ATOMIC" >
-  <parameter name="name" value="Atomic" />
-  <parameter name="icon" value="ATOMIC.png" />
-  <parameter name="version" value="@SALOMEATOMIC_VERSION@" />
- </section>
- <section name="resources" >
-  <parameter name="ATOMIC" value="%ATOMIC_ROOT_DIR%/share/salome/resources/atomic" />
- </section>
-</document>

diff --git a/src/ATOMICGUI/ATOMICGUI.cxx b/src/ATOMICGUI/ATOMICGUI.cxx
index e8e74ec2b0f898b729f9a983956cc8d4b7f8553c..86d29df12d4be599bef2c2f69448f0a69e442c7e 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI.cxx
+++ b/src/ATOMICGUI/ATOMICGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI.h b/src/ATOMICGUI/ATOMICGUI.h
index 1d183809a82692ff2449216eb044336487bbe40b..75ee974555d42dfadfa5ce30b7b173884f976eb4 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI.h
+++ b/src/ATOMICGUI/ATOMICGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_ATOMICGUI.hxx b/src/ATOMICGUI/ATOMICGUI_ATOMICGUI.hxx
old mode 100755 (executable)
new mode 100644 (file)
index 63c2d48..9bdb07f
--- a/src/ATOMICGUI/ATOMICGUI_ATOMICGUI.hxx
+++ b/src/ATOMICGUI/ATOMICGUI_ATOMICGUI.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2013-2019  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/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.cxx b/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.cxx
index 88dffbe69f36ec0e3813f263f5e98a5f211b3734..909f112e0b5224464528a4e423b54c5fdf5059c5 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.cxx
+++ b/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.h b/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.h
index d6c18f8d3fec30c2427934e04cfabe49a6668e48..b4ff2fe0ab1038c64370f3ced1b9ae4a73791861 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.h
+++ b/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_AddAtomOp.cxx b/src/ATOMICGUI/ATOMICGUI_AddAtomOp.cxx
index 48b1b120a5eff775e41aee9365dc1b3536ac69c6..cb79bd7debb32060f3bba58ea03270b435bd31c1 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_AddAtomOp.cxx
+++ b/src/ATOMICGUI/ATOMICGUI_AddAtomOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_AddAtomOp.h b/src/ATOMICGUI/ATOMICGUI_AddAtomOp.h
index a0c8fbc1d9dada7d5c81bf618aeaed0eb139cb9e..b005166a11ac20de2a6cd2b2453379e8a6fe1214 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_AddAtomOp.h
+++ b/src/ATOMICGUI/ATOMICGUI_AddAtomOp.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_CreateMolOp.cxx b/src/ATOMICGUI/ATOMICGUI_CreateMolOp.cxx
index 627a8fddc191b047bca6392de407c8c8422aae02..39ca1312fede15b83383cc3667776479495555cb 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_CreateMolOp.cxx
+++ b/src/ATOMICGUI/ATOMICGUI_CreateMolOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_CreateMolOp.h b/src/ATOMICGUI/ATOMICGUI_CreateMolOp.h
index 20f8a41f7c1b7d57068a8cf8195fc5a70ae7251a..581eef4b5b93b999512ceb18694d00c08b86ce6a 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_CreateMolOp.h
+++ b/src/ATOMICGUI/ATOMICGUI_CreateMolOp.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_Data.cxx b/src/ATOMICGUI/ATOMICGUI_Data.cxx
index 301625dcf4df784b2ce535f38d10f38f2d915338..505d7af3ce25eebda2b15e9f7b42dce0942d3952 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_Data.cxx
+++ b/src/ATOMICGUI/ATOMICGUI_Data.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_Data.h b/src/ATOMICGUI/ATOMICGUI_Data.h
index 1d66c0bf06e2478dbedccad2aaedd47321b2bd02..206f2aaadd2685944b333654c10f9cf7f082d438 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_Data.h
+++ b/src/ATOMICGUI/ATOMICGUI_Data.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_DataModel.cxx b/src/ATOMICGUI/ATOMICGUI_DataModel.cxx
index 1b9278f1d7882be2e477fbe747580d8216ead60f..ca58b970e69352670fffb32ff188d1c757a1b93b 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_DataModel.cxx
+++ b/src/ATOMICGUI/ATOMICGUI_DataModel.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_DataModel.h b/src/ATOMICGUI/ATOMICGUI_DataModel.h
index 3c61aa6123b5d6e28cf3add8ee124bb5162af99f..32466094b22087289711ab25a5ac0ab902d95cb9 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_DataModel.h
+++ b/src/ATOMICGUI/ATOMICGUI_DataModel.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_DataObject.cxx b/src/ATOMICGUI/ATOMICGUI_DataObject.cxx
index 02470842d205feefdec09f2b76462d0154885bb2..e227dcd5e12382fa868da4d8c2286b45c8563e37 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_DataObject.cxx
+++ b/src/ATOMICGUI/ATOMICGUI_DataObject.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_DataObject.h b/src/ATOMICGUI/ATOMICGUI_DataObject.h
index 10635428d002a8560f478cfa45051a252e2d13c6..cf20bee687b3f01defe602f0c217ad6358569305 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_DataObject.h
+++ b/src/ATOMICGUI/ATOMICGUI_DataObject.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_DeleteOp.cxx b/src/ATOMICGUI/ATOMICGUI_DeleteOp.cxx
index 66a5acc5440ddb91e8e9f8414f0867db13ac19eb..65daeada369d2f73edef787e7d1c483cbc61b013 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_DeleteOp.cxx
+++ b/src/ATOMICGUI/ATOMICGUI_DeleteOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_DeleteOp.h b/src/ATOMICGUI/ATOMICGUI_DeleteOp.h
index 00c901aca20683cb1098937d70bf8510f94be58c..e86c9386de0a12919a00289c45c6bf7dbb1a3303 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_DeleteOp.h
+++ b/src/ATOMICGUI/ATOMICGUI_DeleteOp.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_ImportExportOp.cxx b/src/ATOMICGUI/ATOMICGUI_ImportExportOp.cxx
index 778db0a27384d422b1cc38389b4488e1b46a42ac..5a99fa1dd187d4071ad0c82742e1addeadfff5ec 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_ImportExportOp.cxx
+++ b/src/ATOMICGUI/ATOMICGUI_ImportExportOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_ImportExportOp.h b/src/ATOMICGUI/ATOMICGUI_ImportExportOp.h
index 3981e384166fd1a474b0965fc124e8ae50d6f33e..ec528b8f71ef27615be8fe0913bc9ac7a28ad313 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_ImportExportOp.h
+++ b/src/ATOMICGUI/ATOMICGUI_ImportExportOp.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_Operation.cxx b/src/ATOMICGUI/ATOMICGUI_Operation.cxx
index 2ce5db4e667d30ea137e08033ac501a645f98893..ecd976be255db488deb5d90509f52fc0409163d4 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_Operation.cxx
+++ b/src/ATOMICGUI/ATOMICGUI_Operation.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_Operation.h b/src/ATOMICGUI/ATOMICGUI_Operation.h
index 546e88f1a4657ff16821fd51cd7a1cbdadaaea1b..08c5723a116d676f5c3d498f5a0f17f71baa9183 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_Operation.h
+++ b/src/ATOMICGUI/ATOMICGUI_Operation.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_RenameOp.cxx b/src/ATOMICGUI/ATOMICGUI_RenameOp.cxx
index 71ffdfb8d53d2e5a9ff81de6996b40d03a5f0c3f..5ff2480aed99c137dbc6035a140a6139316c0a37 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_RenameOp.cxx
+++ b/src/ATOMICGUI/ATOMICGUI_RenameOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_RenameOp.h b/src/ATOMICGUI/ATOMICGUI_RenameOp.h
index a06fc4d9e61808fbffc2b8d9294ea93ee712b72c..77d0b27b0542c292867f753ae7a52d67763a3762 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_RenameOp.h
+++ b/src/ATOMICGUI/ATOMICGUI_RenameOp.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_Selection.cxx b/src/ATOMICGUI/ATOMICGUI_Selection.cxx
index e9a6329f567a31058298e475ed1d35a5e0ea9474..37034a73ed82482e7b3047f8e37e2b442f9a321d 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_Selection.cxx
+++ b/src/ATOMICGUI/ATOMICGUI_Selection.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/ATOMICGUI_Selection.h b/src/ATOMICGUI/ATOMICGUI_Selection.h
index bf5ed591aaa5b453e10fea06917b43d8b3210738..12d620f3474b951e6c99149b5e36d77d3cc34f6b 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_Selection.h
+++ b/src/ATOMICGUI/ATOMICGUI_Selection.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/ATOMICGUI/CMakeLists.txt b/src/ATOMICGUI/CMakeLists.txt
index 0ad561091f38f2d1099ebe3e480fd4addaca8491..c87e8095a781eef7c287d7582da0f8a2f7ee202f 100644 (file)
--- a/src/ATOMICGUI/CMakeLists.txt
+++ b/src/ATOMICGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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/src/AtomicPy/AtomicPy.cxx b/src/AtomicPy/AtomicPy.cxx
index 6c30424a8b0959bfb3e74059b1cbaa2509fdb242..8e09d915d4ea0d1d07b524ff317dcb82c4f158cb 100644 (file)
--- a/src/AtomicPy/AtomicPy.cxx
+++ b/src/AtomicPy/AtomicPy.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/AtomicPy/AtomicPy.h b/src/AtomicPy/AtomicPy.h
index e8dcfd04571f44778dbb7f8a7d65214f82d42a98..860fb95b4b1ce3fc0790445a6b85dc3be9261b1a 100644 (file)
--- a/src/AtomicPy/AtomicPy.h
+++ b/src/AtomicPy/AtomicPy.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/src/AtomicPy/AtomicPy.sip b/src/AtomicPy/AtomicPy.sip
index e7a94b2f595c12f120f35e9fad481ca47248825e..bfb2b1c8d79df57c57ea4b7b12b9f76599cbcb7a 100644 (file)
--- a/src/AtomicPy/AtomicPy.sip
+++ b/src/AtomicPy/AtomicPy.sip
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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
@@ -16,10 +16,10 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+ 
 // File   : AtomicPy.sip
 // Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com)
-//
- 
+
 %Module AtomicPy
 
 %Import QtGui/QtGuimod.sip

diff --git a/src/AtomicPy/CMakeLists.txt b/src/AtomicPy/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index a132640..cabf1b8
--- a/src/AtomicPy/CMakeLists.txt
+++ b/src/AtomicPy/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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/src/CMakeLists.txt b/src/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 01ecfd9..63c58ab
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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