Commit e5913ba5 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum

[MERGE]

parents af722891 8d829cfc
......@@ -64,7 +64,7 @@ WColor OWCOMMON_EXPORT inverseColor( const WColor& other );
*/
namespace defaultColor
{
// \cond Supress_Doxygen
// \cond Suppress_Doxygen
static const WColor GREEN( 0.0, 1.0, 0.0, 1.0 ); //!< Default for green
static const WColor RED( 1.0, 0.0, 0.0, 1.0 ); //!< Default for red
static const WColor BLUE( 0.0, 0.0, 1.0, 1.0 ); //!< Default for blue
......
......@@ -191,7 +191,7 @@ namespace wlog
template< typename T > WStreamedLogger operator<<( const T& loggable );
// Doxygen should ignore the TypeDef below which are just an alias for std::endl etc.
// \cond Supress_Doxygen
// \cond Suppress_Doxygen
typedef std::basic_ostream< char, std::char_traits< char > > OutStreamType;
typedef OutStreamType& ( *StreamManipulatorFunctor )( OutStreamType& );
// \endcond
......
......@@ -146,7 +146,7 @@ public:
m_second = normalize( m_second );
}
// \cond Supress_Doxygen
// \cond Suppress_Doxygen
// /**
// * Computes sample points on that plane.
// *
......
......@@ -41,7 +41,7 @@ template< typename T > class WValue
template< typename S > friend class WValue; //!< All WValues are friends of each other.
// We exclude this from doxygen since they are documented already as functions and I don't want to duplicate that documentation
// \cond Supress_Doxygen
// \cond Suppress_Doxygen
template< typename U > friend std::ostream& operator<<( std::ostream& os, const WValue< U > &rhs );
template< typename U > friend std::istream& operator>>( std::istream& in, WValue< U >& rhs );
// \endcond
......
......@@ -33,7 +33,7 @@
#include "../WMixinVector.h"
#include "WMixinVectorTraits.h"
// \cond Supress_Doxygen
// \cond Suppress_Doxygen
// This is just a dummy class to test if the default constructor is called when
// not specified by WMixinVector instanziation.
class A {public: A(){m_x = 3.1415;} bool operator==(double x){return m_x == x;} double m_x; }; // NOLINT
......
......@@ -39,7 +39,7 @@
// information. Since we don't have the possibility of multiple
// InputConnectors we must agglomerate those into one object. Please remove this.
// initializes the variable and provides a linker reference
// \cond Supress_Doxygen
// \cond Suppress_Doxygen
boost::shared_ptr< WPrototyped > WFiberCluster::m_prototype = boost::shared_ptr< WPrototyped >();
// \endcond
......@@ -100,7 +100,7 @@ void WFiberCluster::merge( WFiberCluster& other ) // NOLINT
}
// NODOXYGEN
// \cond Supress_Doxygen
// \cond Suppress_Doxygen
void WFiberCluster::setDataSetReference( boost::shared_ptr< const WDataSetFiberVector > fibs )
{
m_fibs = fibs;
......
......@@ -192,7 +192,7 @@ public:
// dataset is, we need it in the WMVoxelizer module as well as the clustering
// information. Since we don't have the possibility of multiple
// InputConnectors we must agglomerate those into one object. Please remove this.
// \cond Supress_Doxygen
// \cond Suppress_Doxygen
void setDataSetReference( boost::shared_ptr< const WDataSetFiberVector > fibs );
boost::shared_ptr< const WDataSetFiberVector > getDataSetReference() const;
static boost::shared_ptr< WPrototyped > getPrototype();
......@@ -227,7 +227,7 @@ protected:
// dataset is, we need it in the WMVoxelizer module as well as the clustering
// information. Since we don't have the possibility of multiple
// InputConnectors we must agglomerate those into one object. Please remove this.
// \cond Supress_Doxygen
// \cond Suppress_Doxygen
static boost::shared_ptr< WPrototyped > m_prototype;
// \endcond
......
......@@ -621,7 +621,7 @@ bool WMWriteTracts::savePOVRay( boost::shared_ptr< const WDataSetFibers > fibers
"}" << std::endl << std::endl;
}
dataFileScene << "// Enable Phong lighting for all th egeometry" << std::endl <<
dataFileScene << "// Enable Phong lighting for all the geometry" << std::endl <<
dataFileScene << "#default{" << std::endl <<
" finish{" << std::endl <<
" ambient 0" << std::endl <<
......
......@@ -2,10 +2,10 @@ OpenWalnut Packaging - README
*****************************
This directory contains several helpers and configurations for building
OpenWalnut source and binary pckages. These scripts/configs ease the release-
OpenWalnut source and binary packages. These scripts/configs ease the release-
management and reduce the manual overhead.
Basicall, there are three important scripts for _automatically_ building and
Basically, there are three important scripts for _automatically_ building and
packaging OpenWalnut. Here is an overview:
1. owpack - wrapping the build and packaging process. This script does
......@@ -18,8 +18,8 @@ packaging OpenWalnut. Here is an overview:
we can build packages for different distributions by utilizing a chroot
environment containing the target distribution (and architecture). We can
ensure that OpenWalnut builds on these distributions properly and are able to
ensure, that our listed reqirements are sufficient, since the build-chroot is
a minimal system which only contains the needed packages.
ensure, that our listed requirements are sufficient, since the build-chroot
is a minimal system which only contains the needed packages.
3. owuberbuild - automates building and packaging for multiple distributions and
architectures using owpack and owbuildchroot. This basically calls
......
......@@ -128,7 +128,7 @@ chroot_check()
{
echo "* Checking \"$CHROOTDIR\"."
if [ ! -d $CHROOTDIR ]; then
echo " * The chroot envirnoment does not exist."
echo " * The chroot environment does not exist."
exit 1
fi
......
......@@ -150,10 +150,10 @@ Builder_DEB()
source $CONFIG_FILE
# set some debian specifics
# The directory upstream-name names. This is important as some builder need
# The directory upstream-name names. This is important as some builders need
# this and have special requirements on them (like debuild)
BUILDER_DEB_UPSTREAM_SRC_DIR=OpenWalnut-$VERSION
# Debuild reqires a different upstream tar name ...
# Debuild requires a different upstream tar name ...
BUILDER_DEB_UPSTREAM_SRC_TAR=openwalnut_$VERSION.orig.tar.gz
# create some place to work in
......
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