Commit 1e920da1 authored by Mathias Goldau's avatar Mathias Goldau
Browse files

[MERGE]

parents e31dd1fb e4b94ed4
......@@ -163,6 +163,8 @@ void WMTemplate::connectors()
new WModuleInputData< WDataSetSingle >( shared_from_this(),
"in", "The dataset to display" )
);
// Lazy Programmer's Alternative:
// m_input = WModuleInputData< WDataSetSingle >::createAndAdd( shared_from_this(), "in", "The dataset to display" );
// This creates an input connector which can receive WDataSetSingle. It will never be able to connect to output connectors providing just a
// WDataSet (which is the father class of WDataSetSingle), but it will be able to be connected to an output connector with a type derived
......
......@@ -184,6 +184,16 @@ chroot_setup_suite()
chroot_do add-apt-repository ppa:gaschler/rl/eigen3
# multiverse and universe needed for several packs
echo "deb http://de.archive.ubuntu.com/ubuntu natty restricted universe multiverse" > ./$CHROOTDIR/etc/apt/sources.list.d/universeMultiverse.sources.list
# This is very important: the pinning prohibits an update to some new boost version which is NOT available in
# neurodeb or ubunut now, but at ppa:gaschler
echo "Package: *
Pin: origin ppa.launchpad.net
Pin-Priority: -1
Package: libeigen3-dev
Pin: origin ppa.launchpad.net
Pin-Priority: 1000" > ./$CHROOTDIR/etc/apt/preferences.d/noBoostFromGaschler
chroot_do apt-get update
;;
*)
......@@ -301,6 +311,8 @@ chroot_build()
fi
# finalize before archiving
# ubuntu hack: kill this xapian-index stuff.
chroot_do killall update-apt-xapian-index
echo " * Stopping chroot environment \"./$CHROOTDIR\""
chroot_umount
if [ $? -ne 0 ]; then
......
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