remove padderexe (padder is an external program) and add testdata to keep test med files

src/Tools/padder/resources/Makefile.am

@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-SUBDIRS = appligen padderexe
+SUBDIRS = appligen testdata
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

src/Tools/padder/resources/padderexe/Makefile.am

@@ -1,42 +0,0 @@
-# Copyright (C) 2011-2012  CEA/DEN, 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/unix/make_common_starter.am
-
-mysalomeresdir=$(salomeresdir)/padderexe
-
-version=med3
-notinstall_version=med2
-
-# We install the padder.exe program and the files required for testing
-# the execution from within the installation directory
-dist_mysalomeres_SCRIPTS =    \
-	$(version)/padder.exe \
-	padder.sh
-
-nodist_mysalomeres_SCRIPTS =         \
-	envPadder.sh
-
-dist_mysalomeres_DATA =         \
-	$(version)/data.txt     \
-	$(version)/concrete.med \
-	$(version)/ferraill.med
-
-NOT_USED_FILES = buildparticules.py particules.png
-EXTRA_DIST += $(notinstall_version) $(NOT_USED_FILES)

src/Tools/padder/resources/padderexe/med2/data.txt

@@ -1,5 +0,0 @@
-concrete.med concrete
-nbSteelFiles 2
-ferrtran.med ferrtran
-ferraill.med ferraill
-output.med

src/Tools/padder/resources/padderexe/med3/data.txt

@@ -1,4 +0,0 @@
-concrete.med concrete
-nbSteelbarMesh= 1
-ferraill.med ferraill
-FinalEDMesh.med

src/Tools/padder/resources/padderexe/padder.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2011-2012  CEA/DEN, 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
-#
-
-# This script emulates the launcher script that will be generated by
-# the padder SALOME component and give as the "job file" to the SALOME
-# launcher to execute the padder job.
-# The script is supposed to be executed where the data are located.
-
-here=$(dirname $0)
-
-# >>> This part should be written by the component
-binpath=$here/padder.exe
-envpath=$here/envPadder.sh
-# <<<
-
-. $envpath
-$binpath $here/data.txt

src/Tools/padder/resources/testdata/Makefile.am

@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright (C) 2011-2012  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
@@ -18,10 +17,13 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-# This script defines the shell extension required for executing the
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
-# padder executable program on the localhost (for test purposes)
 
-MED_ROOT="@MED3HOME@"
+mysalomeresdir=$(salomeresdir)/padderdata
-HDF_ROOT="@HDF5HOME@"
+
-CGAL_ROOT="@CGALHOME@"
+dist_mysalomeres_DATA =  \
-export LD_LIBRARY_PATH="$MED_ROOT/lib:$HDF_ROOT/lib:$CGAL_ROOT/lib:$LD_LIBRARY_PATH"
+	concrete.med     \
+	ferraill.med
+
+NOT_USED_FILES = buildparticules.py particules.png
+EXTRA_DIST += $(NOT_USED_FILES)