Don't generate OpenTURNS prefs files (didn't work properly anyway)

Conflicts:
	Openturns_Study/prefs_OPENTURNS_STUDY.py
	Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py

diff --git a/Openturns_Study/CMakeLists.txt b/Openturns_Study/CMakeLists.txt
index 20e84a39cfdad2c091b130548163d294fdef2772..4c0c9ab9347a2820e5615cac382ce6cded160b0e 100644 (file)
--- a/Openturns_Study/CMakeLists.txt
+++ b/Openturns_Study/CMakeLists.txt
@@ -21,10 +21,6 @@
 
 # Question : Que faire des fichiers sdistOTqt.py et style.py
 
-configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/prefs_OPENTURNS_STUDY.py.in
-                 ${CMAKE_CURRENT_SOURCE_DIR}/prefs_OPENTURNS_STUDY.py
-                @ONLY )
-
 install ( FILES qtEficas_openturns_study.py
                 ${CMAKE_CURRENT_SOURCE_DIR}/prefs_OPENTURNS_STUDY.py
                prefs.py

diff --git a/Openturns_Study/prefs_OPENTURNS_STUDY.py b/Openturns_Study/prefs_OPENTURNS_STUDY.py
index f6821cfa6afa4cfee8035f0f8c5a0ef3994cab2d..f686f516ed5ca36a29b240018465ce7fc87c0dd2 100644 (file)
--- a/Openturns_Study/prefs_OPENTURNS_STUDY.py
+++ b/Openturns_Study/prefs_OPENTURNS_STUDY.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2012   EDF R&D
+# Copyright (C) 2007-2015   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/Openturns_Study/prefs_OPENTURNS_STUDY.py.in b/Openturns_Study/prefs_OPENTURNS_STUDY.py.in
deleted file mode 100644 (file)
index ac847d2..0000000
--- a/Openturns_Study/prefs_OPENTURNS_STUDY.py.in
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2012   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
-# 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.
-#
-# 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
-#
-
-import os, sys
-# Les variables pouvant positionnees sont :
-print "import des prefs de OPENTURNS"
-
-# repIni sert a localiser le fichier 
-# initialdir sert comme directory initial des QFileDialog
-# positionnee a repin au debut mise a jour dans configuration
-repIni=os.path.dirname(os.path.abspath(__file__))
-INSTALLDIR=os.path.join(repIni,'..')
-sys.path[:0]=[INSTALLDIR]
-
-
-# Codage des strings qui accepte les accents (en remplacement de 'ascii')
-# lang indique la langue utilisée pour les chaines d'aide : fr ou ang
-lang='fr'
-encoding='iso-8859-1'
-
-# Acces a la documentation
-path_doc        = os.path.join(INSTALLDIR,'Doc')
-exec_acrobat    = "/usr/bin/xpdf"
-savedir         = os.environ['HOME']
-
-
-# OpenTURNS Python module
-OpenTURNS_path="@OpenTURNS_PYTHON_MODULE_DIR@"
-if len(OpenTURNS_path) > 0: sys.path[:0]=[OpenTURNS_path]
-
-# Choix des catalogues
-from Editeur.catadesc import CatalogDescription
-
-catalogues = (
-    CatalogDescription(identifier = "OPENTURNS_STUDY_V8",
-                       cata_file_path = os.path.join(os.path.abspath(repIni), 'OpenTURNS_Cata_Study_V8.py'),
-                       file_format = "openturns_study"),
-)
-

diff --git a/Openturns_Wrapper/CMakeLists.txt b/Openturns_Wrapper/CMakeLists.txt
index 3dafe481729d925d12bfa0e01558f6df52ee7d8a..570b3ca9d73570db9d7468c3e48976053fdb454e 100644 (file)
--- a/Openturns_Wrapper/CMakeLists.txt
+++ b/Openturns_Wrapper/CMakeLists.txt
@@ -21,10 +21,6 @@
 
 # Question : Que faire des fichiers sdistOTqt.py et style.py
 
-configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/prefs_OPENTURNS_WRAPPER.py.in
-                 ${CMAKE_CURRENT_SOURCE_DIR}/prefs_OPENTURNS_WRAPPER.py
-                @ONLY )
-
 install ( FILES qtEficas_openturns_wrapper.py
                 ${CMAKE_CURRENT_SOURCE_DIR}/prefs_OPENTURNS_WRAPPER.py
                prefs.py

diff --git a/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py b/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py
index f2ccfacd5c8b2eb586265d2c7f2fb0f37825411e..b60be59609fbacfbd063f8f9e0f6d55e7e8adda6 100644 (file)
--- a/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py
+++ b/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2012   EDF R&D
+# Copyright (C) 2007-2015   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/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py.in b/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py.in
deleted file mode 100644 (file)
index e62fe50..0000000
--- a/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py.in
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2012   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
-# 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.
-#
-# 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
-#
-import os, sys
-# Les variables pouvant positionnees sont :
-print "import des prefs de OPENTURNS"
-
-# repIni sert a localiser le fichier 
-# initialdir sert comme directory initial des QFileDialog
-# positionnee a repin au debut mise a jour dans configuration
-repIni=os.path.dirname(os.path.abspath(__file__))
-INSTALLDIR=os.path.join(repIni,'..')
-sys.path[:0]=[INSTALLDIR]
-
-
-# Codage des strings qui accepte les accents (en remplacement de 'ascii')
-# lang indique la langue utilisée pour les chaines d'aide : fr ou ang
-lang='fr'
-encoding='iso-8859-1'
-
-# Acces a la documentation
-path_doc        = os.path.join(INSTALLDIR,'Doc')
-exec_acrobat    = "/usr/bin/xpdf"
-savedir         = os.environ['HOME']
-
-
-# OpenTURNS Python module
-OpenTURNS_path="@OpenTURNS_PYTHON_MODULE_DIR@"
-if len(OpenTURNS_path) > 0: sys.path[:0]=[OpenTURNS_path]
-
-# Choix des catalogues
-from Editeur.catadesc import CatalogDescription
-
-catalogues = (
-    CatalogDescription(identifier = "OPENTURNS_WRAPPER_V4",
-                       cata_file_path = os.path.join(os.path.abspath(repIni), 'OpenTURNS_Cata_Wrapper_V4.py'),
-                       file_format = "openturns_wrapper"),
-)
-