- Eecutable et detection de Eficas

diff --git a/adm_local/check_eficas.m4 b/adm_local/check_eficas.m4
new file mode 100644 (file)
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 a95e5c265d17160dd8d69be8fbc37dc8d5b759c7..f5d97837f8256435da32890e381e68f510c3c05a 100644 (file)
--- 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/bin/qtEficas_datassim_study.py.in b/bin/qtEficas_datassim_study.py.in
new file mode 100644 (file)
index 0000000..5fcf963
--- /dev/null
+++ b/bin/qtEficas_datassim_study.py.in
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+   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
+from InterfaceQT4 import eficas_go
+eficas_go.lance_eficas(code=prefs.code)

diff --git a/configure.ac b/configure.ac
index e11af4b20bf3225841f3e3c18803d105ed2779c5..17c07236e3e22ea7b3ea4ed8439d1fa95b4dc8b7 100644 (file)
--- 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 72c2d40d5f23e56d9f40e79d9478d0eb74dba534..68364431837ff3581702a410460f128a9996b5b6 100644 (file)
--- 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 (file)
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 (file)
index 0000000..e69de29

diff --git a/src/daEficas/qtEficas_datassim_study.py b/src/daEficas/qtEficas_datassim_study.py
deleted file mode 100755 (executable)
index 729b81f..0000000
--- a/src/daEficas/qtEficas_datassim_study.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-"""
-   Ce module sert à lancer EFICAS pour Datassim
-"""
-# Configuration
-import prefs
-import prefs_DATASSIM
-
-# Modules Eficas
-import sys
-from InterfaceQT4 import eficas_go
-eficas_go.lance_eficas(code=prefs.code)