From fd4f0ab228a3ab0a99d57a8a5c44f11656148f6e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Ribes?= Date: Wed, 25 May 2011 14:51:33 +0200 Subject: [PATCH] Ajout des exemples pour la V6_3 --- Makefile.am | 2 +- adm_local/make_common_starter.am | 4 ++++ configure.ac | 11 ++++------- doc/conf.py | 2 ++ samples/Makefile.am | 2 ++ samples/daSalome/Makefile.am | 19 +++++++++++++++++++ .../test001_ADAO_JDC_using_strings.comm | 0 .../test002_ADAO_JDC_using_strings.comm | 0 .../test003_ADAO_JDC_using_scripts.comm.in | 2 +- .../daSalome/test003_ADAO_scripts_for_JDC.py | 0 .../test004_ADAO_JDC_using_scripts.comm.in | 2 +- .../daSalome/test004_ADAO_scripts_for_JDC.py | 0 src/Makefile.am | 2 +- 13 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 samples/Makefile.am create mode 100644 samples/daSalome/Makefile.am rename {src/examples => samples}/daSalome/test001_ADAO_JDC_using_strings.comm (100%) rename {src/examples => samples}/daSalome/test002_ADAO_JDC_using_strings.comm (100%) rename {src/examples => samples}/daSalome/test003_ADAO_JDC_using_scripts.comm.in (93%) rename {src/examples => samples}/daSalome/test003_ADAO_scripts_for_JDC.py (100%) rename {src/examples => samples}/daSalome/test004_ADAO_JDC_using_scripts.comm.in (94%) rename {src/examples => samples}/daSalome/test004_ADAO_scripts_for_JDC.py (100%) diff --git a/Makefile.am b/Makefile.am index e3f2ab9..5ddf8d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ endif SUBDIRS += src if SALOME_MODULE -SUBDIRS += resources bin +SUBDIRS += resources bin samples endif if SPHINX_IS_OK diff --git a/adm_local/make_common_starter.am b/adm_local/make_common_starter.am index f09fedf..7120e40 100644 --- a/adm_local/make_common_starter.am +++ b/adm_local/make_common_starter.am @@ -17,6 +17,10 @@ testsdir = $(prefix)/tests testsdasalomedir = $(testsdir)/daSalome testsplateformedir = $(testsdir)/daComposant/Plateforme +# Directory for installing samples files +samplesdir = $(prefix)/share/salome/adao_samples +samplesdasalomedir = $(samplesdir)/daSalome + # Directories for installing admin files admlocaldir = $(prefix)/adm_local admlocalunixdir = $(admlocaldir)/unix diff --git a/configure.ac b/configure.ac index b7c5314..2d00208 100644 --- a/configure.ac +++ b/configure.ac @@ -118,13 +118,10 @@ AC_CONFIG_FILES([ src/daSalome/daGUI/daUtils/Makefile src/daSalome/daGUI/daGuiImpl/Makefile src/daSalome/daGUI/daEficasWrapper/Makefile - src/tests/Makefile - src/tests/daSalome/Makefile - src/tests/daSalome/test000_Blue_AnalysisFile.py - src/tests/daSalome/test017.comm - src/tests/daSalome/test_aster_zzzz159a_init_parameters.py - src/tests/daSalome/test_aster_zzzz159a_LBFGSB.comm - src/tests/daSalome/zzzz159a.export.esclave + samples/Makefile + samples/daSalome/Makefile + samples/daSalome/test003_ADAO_JDC_using_scripts.comm + samples/daSalome/test004_ADAO_JDC_using_scripts.comm bin/Makefile bin/qtEficas_adao_study.py doc/Makefile diff --git a/doc/conf.py b/doc/conf.py index f5e458b..02c6389 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -192,3 +192,5 @@ latex_documents = [ # If false, no module index is generated. #latex_use_modindex = True + +source_encoding = 'iso-8859-15' diff --git a/samples/Makefile.am b/samples/Makefile.am new file mode 100644 index 0000000..54b6585 --- /dev/null +++ b/samples/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS = daSalome + diff --git a/samples/daSalome/Makefile.am b/samples/daSalome/Makefile.am new file mode 100644 index 0000000..d40dd24 --- /dev/null +++ b/samples/daSalome/Makefile.am @@ -0,0 +1,19 @@ +include $(top_srcdir)/adm_local/make_common_starter.am + +DATA_INST = \ + test001_ADAO_JDC_using_strings.comm \ + test002_ADAO_JDC_using_strings.comm \ + test003_ADAO_JDC_using_scripts.comm \ + test003_ADAO_scripts_for_JDC.py \ + test004_ADAO_JDC_using_scripts.comm \ + test004_ADAO_scripts_for_JDC.py + +samplesdasalome_DATA = ${DATA_INST} + +EXTRA_DIST = \ + test001_ADAO_JDC_using_strings.comm \ + test002_ADAO_JDC_using_strings.comm \ + test003_ADAO_JDC_using_scripts.comm.in \ + test003_ADAO_scripts_for_JDC.py \ + test004_ADAO_JDC_using_scripts.comm.in \ + test004_ADAO_scripts_for_JDC.py diff --git a/src/examples/daSalome/test001_ADAO_JDC_using_strings.comm b/samples/daSalome/test001_ADAO_JDC_using_strings.comm similarity index 100% rename from src/examples/daSalome/test001_ADAO_JDC_using_strings.comm rename to samples/daSalome/test001_ADAO_JDC_using_strings.comm diff --git a/src/examples/daSalome/test002_ADAO_JDC_using_strings.comm b/samples/daSalome/test002_ADAO_JDC_using_strings.comm similarity index 100% rename from src/examples/daSalome/test002_ADAO_JDC_using_strings.comm rename to samples/daSalome/test002_ADAO_JDC_using_strings.comm diff --git a/src/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in b/samples/daSalome/test003_ADAO_JDC_using_scripts.comm.in similarity index 93% rename from src/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in rename to samples/daSalome/test003_ADAO_JDC_using_scripts.comm.in index 5b26a32..c015723 100644 --- a/src/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in +++ b/samples/daSalome/test003_ADAO_JDC_using_scripts.comm.in @@ -1,6 +1,6 @@ ASSIMILATION_STUDY(Study_name='Test', - Study_repertory='@prefix@/examples/daSalome', + Study_repertory='@prefix@/share/salome/adao_samples/daSalome', Debug=0, Algorithm='3DVAR', Background=_F(INPUT_TYPE='Vector', diff --git a/src/examples/daSalome/test003_ADAO_scripts_for_JDC.py b/samples/daSalome/test003_ADAO_scripts_for_JDC.py similarity index 100% rename from src/examples/daSalome/test003_ADAO_scripts_for_JDC.py rename to samples/daSalome/test003_ADAO_scripts_for_JDC.py diff --git a/src/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in b/samples/daSalome/test004_ADAO_JDC_using_scripts.comm.in similarity index 94% rename from src/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in rename to samples/daSalome/test004_ADAO_JDC_using_scripts.comm.in index 9ad99eb..a497a90 100644 --- a/src/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in +++ b/samples/daSalome/test004_ADAO_JDC_using_scripts.comm.in @@ -1,6 +1,6 @@ ASSIMILATION_STUDY(Study_name='Test', - Study_repertory='@prefix@/examples/daSalome', + Study_repertory='@prefix@/share/salome/adao_samples/daSalome', Debug=0, Algorithm='Blue', Background=_F(INPUT_TYPE='Vector', diff --git a/src/examples/daSalome/test004_ADAO_scripts_for_JDC.py b/samples/daSalome/test004_ADAO_scripts_for_JDC.py similarity index 100% rename from src/examples/daSalome/test004_ADAO_scripts_for_JDC.py rename to samples/daSalome/test004_ADAO_scripts_for_JDC.py diff --git a/src/Makefile.am b/src/Makefile.am index 7212bbe..e1d8628 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = daComposant tests +SUBDIRS = daComposant if SALOME_MODULE SUBDIRS += daSalome daEficas -- 2.39.2