Commit 919899ce authored by Thomas Witkowski's avatar Thomas Witkowski

And deleted some files from autotool-chain.

parent e2d688fc
#!/bin/sh
echo "--> Running aclocal"
aclocal
if test "$?" != "0" ; then
echo "*** aclocal failed"
exit 1
fi
if test "`grep AC_CONFIG_HEADER configure.ac`" != "" -o \
"`grep AM_CONFIG_HEADER configure.ac`" != "" ; then
# if we use CONFIG_HEADER, then make sure to run autoheader
echo "--> Running autoheader"
autoheader
if test "$?" != "0" ; then
echo "*** autoheader failed"
exit 1
fi
else
echo "--> autoheader not needed"
fi
echo "--> Running autoconf"
autoconf
if test "$?" != "0" ; then
echo "*** autoconf failed"
exit 1
fi
echo "--> Running libtoolize"
libtoolize --automake --copy
if test "$?" != "0" ; then
echo "*** libtoolize failed"
exit 1
fi
echo "--> Running automake"
automake -a --copy --include-deps
if test "$?" != "0" ; then
echo "*** automake failed"
exit 1
fi
echo;
echo "Running ./configure $@"
echo;
./configure $@
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
if test -e ./AMDiS ; then
echo "there is already an AMDiS directory. I will abort. "
exit 1
fi
ERROR=""
DOWNLOAD="OK"
svn --username studentiwr co https://gforge.zih.tu-dresden.de/svn/amdis/trunk amdis
if test $? -ne 0 ; then
DOWNLOAD="NOT OK"
ERROR="DOWNLOAD"
fi
if test "$1" ; then
prefix="$1"
else
prefix=$(pwd)/amdis_installed
fi
echo "prefix: ${prefix}"
if test ! -d ${prefix} ; then
mkdir --parents ${prefix}
fi
if test ! -d amdis_build ; then
mkdir amdis_build
fi
cd amdis_build
CONFIGURING="OK"
cmake -DCMAKE_INSTALL_PREFIX=${prefix} ../AMDiS
if test $? -ne 0; then
CONFIGURING="NOT OK"
ERROR="${ERROR} CONFIGURE"
fi
COMPILE="OK"
make
if test $? -ne 0; then
COMPILE="NOT OK"
ERROR="${ERROR} COMPILE"
fi
INSTALLING="OK"
make install
if test $? -ne 0; then
INSTALLING="NOT OK"
ERROR="${ERROR} INSTALL"
fi
if test -z "${ERROR}"; then
echo "amdis was successfully downloaded, configured and installed to ${prefix}"
echo "you can use this installation in cmake with the AMDIS_DIR ${prefix}/share/amdis"
else
echo "something went wrong: "
echo "download: ${DOWNLOAD}"
echo "configure: ${CONFIGURING}"
echo "compile: ${COMPILE}"
echo "install: ${INSTALLING}"
fi
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2005-05-14.22
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license.
#
# Copyright (C) 1994 X Consortium
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to
# deal in the Software without restriction, including without limitation the
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
# sell copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the X Consortium shall not
# be used in advertising or otherwise to promote the sale, use or other deal-
# ings in this Software without prior written authorization from the X Consor-
# tium.
#
#
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch. It can only install one file at a time, a restriction
# shared with many OS's install programs.
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
chownprog="${CHOWNPROG-chown}"
chgrpprog="${CHGRPPROG-chgrp}"
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
chmodcmd="$chmodprog 0755"
chowncmd=
chgrpcmd=
stripcmd=
rmcmd="$rmprog -f"
mvcmd="$mvprog"
src=
dst=
dir_arg=
dstarg=
no_target_directory=
usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
In the 1st form, copy SRCFILE to DSTFILE.
In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES.
Options:
-c (ignored)
-d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE.
-o USER $chownprog installed files to USER.
-s $stripprog installed files.
-t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory.
--help display this help and exit.
--version display version info and exit.
Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
"
while test -n "$1"; do
case $1 in
-c) shift
continue;;
-d) dir_arg=true
shift
continue;;
-g) chgrpcmd="$chgrpprog $2"
shift
shift
continue;;
--help) echo "$usage"; exit $?;;
-m) chmodcmd="$chmodprog $2"
shift
shift
continue;;
-o) chowncmd="$chownprog $2"
shift
shift
continue;;
-s) stripcmd=$stripprog
shift
continue;;
-t) dstarg=$2
shift
shift
continue;;
-T) no_target_directory=true
shift
continue;;
--version) echo "$0 $scriptversion"; exit $?;;
*) # When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
test -n "$dir_arg$dstarg" && break
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
if test -n "$dstarg"; then
# $@ is not empty: it contains at least $arg.
set fnord "$@" "$dstarg"
shift # fnord
fi
shift # arg
dstarg=$arg
done
break;;
esac
done
if test -z "$1"; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
fi
# It's OK to call `install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
for src
do
# Protect names starting with `-'.
case $src in
-*) src=./$src ;;
esac
if test -n "$dir_arg"; then
dst=$src
src=
if test -d "$dst"; then
mkdircmd=:
chmodcmd=
else
mkdircmd=$mkdirprog
fi
else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if test ! -f "$src" && test ! -d "$src"; then
echo "$0: $src does not exist." >&2
exit 1
fi
if test -z "$dstarg"; then
echo "$0: no destination specified." >&2
exit 1
fi
dst=$dstarg
# Protect names starting with `-'.
case $dst in
-*) dst=./$dst ;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
echo "$0: $dstarg: Is a directory" >&2
exit 1
fi
dst=$dst/`basename "$src"`
fi
fi
# This sed command emulates the dirname command.
dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
# Make sure that the destination directory exists.
# Skip lots of stat calls in the usual case.
if test ! -d "$dstdir"; then
defaultIFS='
'
IFS="${IFS-$defaultIFS}"
oIFS=$IFS
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
shift
IFS=$oIFS
pathcomp=
while test $# -ne 0 ; do
pathcomp=$pathcomp$1
shift
if test ! -d "$pathcomp"; then
$mkdirprog "$pathcomp"
# mkdir can fail with a `File exist' error in case several
# install-sh are creating the directory concurrently. This
# is OK.
test -d "$pathcomp" || exit
fi
pathcomp=$pathcomp/
done
fi
if test -n "$dir_arg"; then
$doit $mkdircmd "$dst" \
&& { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
&& { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
else
dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
rmtmp=$dstdir/_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name.
$doit $cpprog "$src" "$dsttmp" &&
# and set any options; do chmod last to preserve setuid bits.
#
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
&& { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
# Now rename the file to the real destination.
{ $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
|| {
# The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not
# support -f.
# Now remove or move aside any old file at destination location.
# We try this two ways since rm can't unlink itself on some
# systems and the destination file might be busy for other
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
if test -f "$dstdir/$dstfile"; then
$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
|| $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|| {
echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
(exit 1); exit 1
}
else
:
fi
} &&
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
}
}
fi || { (exit 1); exit 1; }
done
# The final little trick to "correctly" pass the exit status to the exit trap.
{
(exit 0); exit 0
}
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
#!/bin/sh
if test "$1" = "upgrade" ; then
exit 0
fi
NEWDIRS_SEMI="@deb_add_dirs@"
NEWDIRS=`echo ${NEWDIRS_SEMI} | sed 's/;/ /g'`
BASEDIR=@CPACK_INSTALL_PREFIX@
#echo "will create the remove directories:"
for d in ${NEWDIRS}; do
# echo "${BASEDIR}${d}"
rm -r ${BASEDIR}${d} > /dev/null 2> /dev/null
done
exit 0
#!/bin/sh
NEWDIRS_SEMI="@deb_add_dirs@"
NEWDIRS=`echo ${NEWDIRS_SEMI} | sed 's/;/ /g'`
BASEDIR=@CPACK_INSTALL_PREFIX@
#echo "will create the following directories:"
for d in ${NEWDIRS}; do
# echo "${BASEDIR}${d}"
mkdir --parents ${BASEDIR}${d}
done
......@@ -40,7 +40,7 @@ namespace AMDiS {
: ParallelProblemStatBase(nameStr, problemIteration)
{
string name("");
GET_PARAMETER(0, "parallel->solver", &name);
Parameters::get("parallel->solver", name);
if (name == "petsc-schur") {
#ifdef HAVE_PETSC_DEV
......
......@@ -41,7 +41,7 @@ namespace AMDiS {
lastMeshNnz(0),
zeroStartVector(false)
{
GET_PARAMETER(0, "parallel->use zero start vector", "%d", &zeroStartVector);
Parameters::get("parallel->use zero start vector", zeroStartVector);
}
void fillPetscMatrix(Matrix<DOFMatrix*> *mat, SystemVector *vec);
......
......@@ -97,7 +97,7 @@ public:
// ===== Traverse mesh and initialize boundary elements. =====
const int nBasFcts = feSpace->getBasisFcts()->getNumber();
DegreeOfFreedom *locInd = GET_MEMORY(DegreeOfFreedom, nBasFcts);
DegreeOfFreedom *locInd = new DegreeOfFreedom[nBasFcts];
ElInfo *elInfo = stack.traverseFirst(feSpace->getMesh(),
-1,
......@@ -200,7 +200,7 @@ public:
int *values_q3 = new int [numNodes];
int *values_q4 = new int [numNodes];
GET_PARAMETER(0,"SignedDist->count updates", "%d", &count_updates);
Parameters::get("SignedDist->count updates", count_updates);
time1 = clock();
traverseListElement();
......@@ -264,7 +264,7 @@ public:
{
if(!smiAdapter)
{
smiAdapter = NEW SMIAdapter(1,1,const_cast<FiniteElemSpace*>(feSpace),1,-1);
smiAdapter = new SMIAdapter(1,1,const_cast<FiniteElemSpace*>(feSpace),1,-1);
}
// cout << "\n\n\tSMI-Adapter angelegt !\n\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment