From 99ea4a5b7fbfdcdb033ec034c7f235e204814078 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9?= Date: Tue, 27 Apr 2010 14:49:21 +0200 Subject: [PATCH] - Eecutable et detection de Eficas --- adm_local/check_eficas.m4 | 33 +++++++++++++++++++ bin/Makefile.am | 4 +-- .../qtEficas_datassim_study.py.in | 9 ++++- configure.ac | 11 +++---- src/Makefile.am | 2 +- src/daEficas/Makefile.am | 31 +++++++++++++++++ src/daEficas/__init__.py | 0 7 files changed, 79 insertions(+), 11 deletions(-) create mode 100644 adm_local/check_eficas.m4 rename src/daEficas/qtEficas_datassim_study.py => bin/qtEficas_datassim_study.py.in (58%) mode change 100755 => 100644 create mode 100644 src/daEficas/Makefile.am create mode 100644 src/daEficas/__init__.py diff --git a/adm_local/check_eficas.m4 b/adm_local/check_eficas.m4 new file mode 100644 index 0000000..667c27b --- /dev/null +++ b/adm_local/check_eficas.m4 @@ -0,0 +1,33 @@ +AC_DEFUN([CHECK_EFICAS],[ + +AC_CHECKING(for Eficas) + +eficas_ok=no + +AC_ARG_WITH(eficas, + [ --with-eficas=DIR root directory path of Eficas installation], + EFICAS_DIR=$withval,EFICAS_DIR="") + +if test "x$EFICAS_DIR" = "x" ; then + + # no --with-eficas option used + + if test "x$EFICAS_ROOT_DIR" != "x" ; then + + #EFICAS_ROOT_DIR environment variable defined + EFICAS_DIR=$EFICAS_ROOT_DIR + + else + AC_MSG_WARN("EFICAS_ROOT_DIR is not defined") + fi +fi + +if test "x$EFICAS_DIR" != "x" ; then + eficas_ok=yes + AC_SUBST(EFICAS_DIR) +fi + +AC_MSG_RESULT(for Eficas: $eficas_ok) + +])dnl + diff --git a/bin/Makefile.am b/bin/Makefile.am index a95e5c2..f5d9783 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/adm_local/make_common_starter.am -bin_SCRIPTS = DatassimYacsSchemaCreator.py +bin_SCRIPTS = DatassimYacsSchemaCreator.py qtEficas_datassim_study.py -EXTRA_DIST = DatassimYacsSchemaCreator.py +EXTRA_DIST = DatassimYacsSchemaCreator.py qtEficas_datassim_study.py.in diff --git a/src/daEficas/qtEficas_datassim_study.py b/bin/qtEficas_datassim_study.py.in old mode 100755 new mode 100644 similarity index 58% rename from src/daEficas/qtEficas_datassim_study.py rename to bin/qtEficas_datassim_study.py.in index 729b81f..5fcf963 --- a/src/daEficas/qtEficas_datassim_study.py +++ b/bin/qtEficas_datassim_study.py.in @@ -4,11 +4,18 @@ """ Ce module sert à lancer EFICAS pour Datassim """ + +import sys +# Configuration de l'installation +INSTALLDIR = "@EFICAS_DIR@" +sys.path[:0]=[INSTALLDIR] +DATASSIM_INSTALL_DIR = "@PYTHON_SITE@/salome/daEficas" +sys.path[:0]=[DATASSIM_INSTALL_DIR] + # Configuration import prefs import prefs_DATASSIM # Modules Eficas -import sys from InterfaceQT4 import eficas_go eficas_go.lance_eficas(code=prefs.code) diff --git a/configure.ac b/configure.ac index e11af4b..17c0723 100644 --- a/configure.ac +++ b/configure.ac @@ -18,14 +18,11 @@ AC_PROG_CXX CHECK_F77 CHECK_BOOST CHECK_OMNIORB -CHECK_PACO -CHECK_MPI +CHECK_EFICAS MODULE_NAME=datassim AC_SUBST(MODULE_NAME) -AC_CHECK_ASTER - echo echo echo @@ -42,9 +39,7 @@ echo " OmniOrbpy (CORBA) ...... : $omniORBpy_ok" echo " Python ................. : $python_ok" echo " Boost ................. : $boost_ok" echo " SALOME KERNEL .......... : $Kernel_ok" -echo " PaCO++ ................. : $PaCO_ok" -echo " MPI .................... : $mpi_ok" -echo " Code Aster ............. : $Aster_ok" +echo " Eficas ................. : $eficas_ok" echo echo "------------------------------------------------------------------------" echo @@ -72,9 +67,11 @@ AC_CONFIG_FILES([ resources/Makefile src/Makefile src/daComposant/Makefile + src/daEficas/Makefile src/daSalome/Makefile src/daSalome/daGUI/Makefile src/daSalome/daGUI/daGuiImpl/Makefile bin/Makefile + bin/qtEficas_datassim_study.py ]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 72c2d40..6836443 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1 +1 @@ -SUBDIRS= daComposant daSalome +SUBDIRS = daComposant daSalome daEficas diff --git a/src/daEficas/Makefile.am b/src/daEficas/Makefile.am new file mode 100644 index 0000000..1ae2f05 --- /dev/null +++ b/src/daEficas/Makefile.am @@ -0,0 +1,31 @@ +# Copyright (C) 2010 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 +# + +include $(top_srcdir)/adm_local/make_common_starter.am + +mypkgpythondir =$(salomepythondir)/daEficas + +mypkgpython_PYTHON = \ + configuration_DATASSIM.py \ + convert_datassim.py \ + DATASSIM_Cata_V0.py \ + generator_datassim.py \ + __init__.py \ + prefs_DATASSIM.py \ + prefs.py diff --git a/src/daEficas/__init__.py b/src/daEficas/__init__.py new file mode 100644 index 0000000..e69de29 -- 2.39.2