Commit d6fa4c63 authored by Alexander Wiebel's avatar Alexander Wiebel
Browse files

[MERGE]

parents 871b41c9 c5d2e472
......@@ -2,17 +2,20 @@
# get path of this script
BINDIR=`dirname "$0"`
cd "$BINDIR/.."
# strip "bin" to get base directory
BASEDIR=`dirname "$BINDIR"`
LIBDIR=$BASEDIR/lib
# We want to avoid that multiple system installations of OpenWalnut cause some weird loading of libs. We want ours (relative to our executable) to be loaded:
Libs="libopenwalnut_biosig.so.1 libopenwalnut_eep.so.1 libopenwalnut_niftiio.so.1 libopenwalnut_niftiznz.so.1"
# Well, this one needs to be there! If not, your installation is wrong.
Preloads="lib/libopenwalnut.so.1"
Preloads="$LIBDIR/libopenwalnut.so.1"
# We need to ensure the libs are there. If not, do not add them to the preloads variable
for lib in $Libs
do
if [ -e "lib/$lib" ]; then
Preloads=$Preloads:lib/$lib
libfile=$LIBDIR/$lib
if [ -e "$libfile" ]; then
Preloads=$Preloads:$libfile
fi
done
# Finally, export it
......@@ -22,5 +25,4 @@ export LD_PRELOAD=$Preloads
export LC_ALL=C
# Run OpenWalnut
bin/openwalnut-qt4 $@
$BINDIR/openwalnut-qt4 $@
//---------------------------------------------------------------------------
//
// Project: OpenWalnut ( http://www.openwalnut.org )
//
// Copyright 2009 OpenWalnut Community, BSV@Uni-Leipzig and CNCF@MPI-CBS
// For more information see http://www.openwalnut.org/copying
//
// This file is part of OpenWalnut.
//
// OpenWalnut 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 3 of the License, or
// (at your option) any later version.
//
// OpenWalnut 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 OpenWalnut. If not, see <http://www.gnu.org/licenses/>.
//
//---------------------------------------------------------------------------
#ifndef WROIBOX_TEST_H
#define WROIBOX_TEST_H
#include <cxxtest/TestSuite.h>
#include "../WROIBox.h"
/**
* Test for WROIBox
*/
class WROIBoxTest : public CxxTest::TestSuite
{
public:
/**
* I would like to test instantiation here, but WROIBox needs nearly a complete
* running GUI and GE with the "Main View" viewer. This seemed to much effort for
* this small test to me.
*/
void testInstantiation( void )
{
// WPosition maxPos;
// WPosition minPos;
// WLogger logger;
// boost::shared_ptr< WGUI > gui = boost::shared_ptr< WGUI >( new WQt4Gui( 0, 0 ) );
// boost::shared_ptr< WGraphicsEngine > ge = boost::shared_ptr< WGraphicsEngine >( new WGraphicsEngine );
// TS_ASSERT_THROWS_NOTHING( WROIBox( minPos, maxPos ) );
}
};
#endif // WROIBOX_TEST_H
......@@ -25,9 +25,7 @@
#ifndef WMISOSURFACE_H
#define WMISOSURFACE_H
#include <map>
#include <string>
#include <vector>
#include <osg/Node>
#include <osg/Geode>
......
......@@ -4,23 +4,22 @@ PARAM_FILENAME="/tmp/walnut-gdb.script."$(date +%s)
echo $PARAM_FILENAME
echo run $@ > $PARAM_FILENAME
# assume that this script is in the bin dir
# go there to ensure walnuts working directory is set correctly
cd "$BINDIR"
# get path of this script
BINDIR=`dirname "$0"`
cd "$BINDIR/.."
# strip "bin" to get base directory
BASEDIR=`dirname "$BINDIR"`
LIBDIR=$BASEDIR/lib
# We want to avoid that multiple system installations of OpenWalnut cause some weird loading of libs. We want ours (relative to our executable) to be loaded:
Libs="libopenwalnut_biosig.so.1 libopenwalnut_eep.so.1 libopenwalnut_niftiio.so.1 libopenwalnut_niftiznz.so.1"
# Well, this one needs to be there! If not, your installation is wrong.
Preloads="lib/libopenwalnut.so.1"
Preloads="$LIBDIR/libopenwalnut.so.1"
# We need to ensure the libs are there. If not, do not add them to the preloads variable
for lib in $Libs
do
if [ -e "lib/$lib" ]; then
Preloads=$Preloads:lib/$lib
libfile=$LIBDIR/$lib
if [ -e "$libfile" ]; then
Preloads=$Preloads:$libfile
fi
done
# Finally, export it
......@@ -30,7 +29,7 @@ export LD_PRELOAD=$Preloads
export LC_ALL=C
# run walnut
gdb bin/openwalnut-qt4 -command=$PARAM_FILENAME
gdb $BINDIR/openwalnut-qt4 -command=$PARAM_FILENAME
rm $PARAM_FILENAME
cd $PWD
#!/bin/sh
# get path of this script
BINDIR=`dirname "$0"`
cd "$BINDIR/.."
# strip "bin" to get base directory
BASEDIR=`dirname "$BINDIR"`
LIBDIR=$BASEDIR/lib
# We want to avoid that multiple system installations of OpenWalnut cause some weird loading of libs. We want ours (relative to our executable) to be loaded:
Libs="libopenwalnut_biosig.so.1 libopenwalnut_eep.so.1 libopenwalnut_niftiio.so.1 libopenwalnut_niftiznz.so.1"
# We want to avoid that multiple system installations of OpenWalnut cause some weird loading of libs. We want ours (relative to our executable) to be loaded:
Libs="libopenwalnut_biosig.so.1 libopenwalnut_eep.so.1 libopenwalnut_niftiio.so.1 libopenwalnut_niftiznz.so.1"
# Well, this one needs to be there! If not, your installation is wrong.
Preloads="lib/libopenwalnut.so.1"
# We need to ensure the libs are there. If not, do not add them to the preloads variable
Preloads="$LIBDIR/libopenwalnut.so.1"
# We need to ensure the libs are there. If not, do not add them to the preloads variable
for lib in $Libs
do
if [ -e "lib/$lib" ]; then
Preloads=$Preloads:lib/$lib
libfile=$LIBDIR/$lib
if [ -e "$libfile" ]; then
Preloads=$Preloads:$libfile
fi
done
# Finally, export it
export LD_PRELOAD=$Preloads
# Force C locale. This fixes an issue with newer boost versions. See ticket #130.
# Force C locale. This fixes an issue with newer boost versions. See ticket #130.
export LC_ALL=C
PARAMS="$*"
echo "Parameters: $PARAMS"
# run walnut
kdbg -a "$PARAMS" bin/openwalnut-qt4
kdbg -a "$PARAMS" $BINDIR/openwalnut-qt4
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