From 30b3b16edae8bf91876ef41e19678b4ce00685b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Ribes?= Date: Mon, 14 Nov 2011 18:35:05 +0100 Subject: [PATCH] Installation of daSkeletons --- adm_local/make_common_starter.am | 6 ++- configure.ac | 5 +- examples/Makefile.am | 2 +- .../Makefile.am | 48 +++++++++++++++++++ examples/daSkeletons/Makefile.am | 22 +++++++++ 5 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 examples/daSkeletons/External_data_definition_by_scripts/Makefile.am create mode 100644 examples/daSkeletons/Makefile.am diff --git a/adm_local/make_common_starter.am b/adm_local/make_common_starter.am index 88e1c3b..01ac3a3 100644 --- a/adm_local/make_common_starter.am +++ b/adm_local/make_common_starter.am @@ -37,8 +37,10 @@ testsdasalomedir = $(testsdir)/daSalome testsplateformedir = $(testsdir)/daComposant/Plateforme # Directory for installing examples files -examplesdir = $(prefix)/share/salome/adao_examples -examplesdasalomedir = $(examplesdir)/daSalome +examplesdir = $(prefix)/share/salome/adao_examples +examplesdasalomedir = $(examplesdir)/daSalome +examplesdaskeletonsdir = $(examplesdir)/daSkeletons +externaldatadefinitiondir = $(examplesdaskeletonsdir)/External_data_definition_by_scripts # Directories for installing admin files admlocaldir = $(prefix)/adm_local diff --git a/configure.ac b/configure.ac index 33d7c0b..4b32280 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade dnl dnl Author: André Ribes, andre.ribes@edf.fr, EDF R&D -AC_INIT(ADAO_SRC, [6.3.1]) +AC_INIT(ADAO_SRC, [6.4.0]) AC_CONFIG_AUX_DIR(adm_local) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(adao_config.h) @@ -127,6 +127,9 @@ AC_CONFIG_FILES([ examples/daSalome/test003_ADAO_JDC_using_scripts.comm examples/daSalome/test004_ADAO_JDC_using_scripts.comm examples/daSalome/test005_ADAO_Operators.comm + examples/daSkeletons/Makefile + examples/daSkeletons/External_data_definition_by_scripts/Makefile + examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.comm bin/Makefile bin/qtEficas_adao_study.py doc/Makefile diff --git a/examples/Makefile.am b/examples/Makefile.am index 6cc7fe9..31eb865 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -18,5 +18,5 @@ # # Author: André Ribes, andre.ribes@edf.fr, EDF R&D -SUBDIRS = daSalome +SUBDIRS = daSalome daSkeletons diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Makefile.am b/examples/daSkeletons/External_data_definition_by_scripts/Makefile.am new file mode 100644 index 0000000..2956aad --- /dev/null +++ b/examples/daSkeletons/External_data_definition_by_scripts/Makefile.am @@ -0,0 +1,48 @@ +# Copyright (C) 2010-2011 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 +# +# Author: André Ribes, andre.ribes@edf.fr, EDF R&D + +include $(top_srcdir)/adm_local/make_common_starter.am + +DATA_INST = \ + ADAO_Case.comm \ + Physical_data_and_covariance_matrices.py \ + Script_AlgorithmParameters.py \ + Script_Background_xb.py \ + Script_ObservationOperator_H.py \ + Script_UserPostAnalysis.py \ + Physical_simulation_functions.py \ + Script_BackgroundError_B.py \ + Script_ObservationError_R.py \ + Script_Observation_yo.py + +externaldatadefinition_DATA = ${DATA_INST} + +EXTRA_DIST = \ + ADAO_Case.comm.in \ + Physical_data_and_covariance_matrices.py \ + Script_AlgorithmParameters.py \ + Script_Background_xb.py \ + Script_ObservationOperator_H.py \ + Script_UserPostAnalysis.py \ + Physical_simulation_functions.py \ + Script_BackgroundError_B.py \ + Script_ObservationError_R.py \ + Script_Observation_yo.py + diff --git a/examples/daSkeletons/Makefile.am b/examples/daSkeletons/Makefile.am new file mode 100644 index 0000000..364f227 --- /dev/null +++ b/examples/daSkeletons/Makefile.am @@ -0,0 +1,22 @@ +# Copyright (C) 2010-2011 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 +# +# Author: André Ribes, andre.ribes@edf.fr, EDF R&D + +SUBDIRS = External_data_definition_by_scripts + -- 2.39.2