Commit d51a7e3d authored by Václav Šmilauer's avatar Václav Šmilauer
Browse files

1. Replace includes {lib,pkg}-* with {lib,pkg}/*; compiles (no full compilation tested)

parent ac548173
......@@ -510,9 +510,15 @@ if not env.GetOption('clean'):
#installHeaders() # install to buildDir always
#if 0: # do not install headers
# installHeaders(env.subst('$PREFIX')) # install to $PREFIX if specifically requested: like "scons /usr/local/include"
def mkSymlink(link,target):
if exists(link) and not islink(link): os.remove(link)
if not exists(link):
if lexists(link): os.remove(link) # remove dangling symlink
os.symlink(relpath(link,target),link)
yadeInc=join(buildDir,'include/yade')
if not os.path.exists(yadeInc): os.makedirs(yadeInc)
mkSymlink(yadeInc,'.')
#if not os.path.exists(yadeInc): os.makedirs(yadeInc)
import glob
# old compat paths
#for p in ['core','extra']+glob.glob('lib/*')+glob.glob('pkg/*')+glob.glob('gui'):
......@@ -522,10 +528,6 @@ if not env.GetOption('clean'):
# os.symlink(relpath(link,p),link)
boostDir=buildDir+'/include/boost'
if not exists(boostDir): os.makedirs(boostDir)
def mkSymlink(link,target):
if not exists(link):
if lexists(link): os.remove(link) # remove dangling symlink
os.symlink(relpath(link,target),link)
if not env['haveForeach']:
mkSymlink(boostDir+'/foreach.hpp','extra/foreach.hpp_local')
#mkSymlink(boostDir+'/python','py/3rd-party/boost-python-indexing-suite-v2-noSymlinkHeaders')
......
......@@ -15,9 +15,9 @@
#include"State.hpp"
#include"Material.hpp"
#include<yade/lib-base/Math.hpp>
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib-multimethods/Indexable.hpp>
#include<yade/lib/base/Math.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<yade/lib/multimethods/Indexable.hpp>
class Scene;
......
......@@ -4,7 +4,7 @@
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<boost/foreach.hpp>
#ifndef FOREACH
......
......@@ -7,9 +7,9 @@
*************************************************************************/
#pragma once
#include<yade/lib-base/Math.hpp>
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib-multimethods/Indexable.hpp>
#include<yade/lib/base/Math.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<yade/lib/multimethods/Indexable.hpp>
#include<yade/core/Dispatcher.hpp>
/*! Interface for approximate body locations in space
......
......@@ -14,8 +14,8 @@ The transformation has normal part and rotation/shear part. the shearPt, unshear
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib-base/Math.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<yade/lib/base/Math.hpp>
class Cell: public Serializable{
public:
......
......@@ -13,7 +13,7 @@
#include<yade/core/Engine.hpp>
#include<yade/core/Functor.hpp>
#include<yade/core/Omega.hpp>
#include<yade/lib-multimethods/DynLibDispatcher.hpp>
#include<yade/lib/multimethods/DynLibDispatcher.hpp>
#include<boost/preprocessor/cat.hpp>
......
......@@ -2,8 +2,8 @@
#include<boost/python.hpp>
#include<boost/foreach.hpp>
#include<string>
#include<yade/lib-base/openmp-accu.hpp>
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib/base/openmp-accu.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#ifndef FOREACH
#define FOREACH BOOST_FOREACH
......
......@@ -10,10 +10,10 @@
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<yade/core/Omega.hpp>
#include<yade/core/Timing.hpp>
#include<yade/lib-base/Logging.hpp>
#include<yade/lib/base/Logging.hpp>
#include<stdexcept>
#include<boost/foreach.hpp>
......
......@@ -7,8 +7,8 @@
#include<boost/date_time/posix_time/posix_time.hpp>
#include<yade/core/Omega.hpp>
#include<yade/lib-pyutil/gil.hpp>
#include<yade/lib-serialization/ObjectIO.hpp>
#include<yade/lib/pyutil/gil.hpp>
#include<yade/lib/serialization/ObjectIO.hpp>
#include"FileGenerator.hpp"
......
......@@ -8,8 +8,8 @@
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib-base/Logging.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<yade/lib/base/Logging.hpp>
#include "Scene.hpp"
#include "ThreadWorker.hpp"
......
......@@ -3,7 +3,7 @@
#include<string.h>
#include<vector>
#include<yade/lib-base/Math.hpp>
#include<yade/lib/base/Math.hpp>
// for Body::id_t
#include<yade/core/Body.hpp>
......
......@@ -10,7 +10,7 @@
#include "Omega.hpp"
#include<yade/lib-factory/Factorable.hpp>
#include<yade/lib/factory/Factorable.hpp>
class FrontEnd : public Factorable
{
......
......@@ -10,8 +10,8 @@
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib-multimethods/FunctorWrapper.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<yade/lib/multimethods/FunctorWrapper.hpp>
class TimingDeltas;
class Scene;
......
......@@ -15,7 +15,7 @@
#define YADE_GROUP_RELATION_DATA
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include <iostream>
#include <sstream>
......
......@@ -8,9 +8,9 @@
#pragma once
#include<yade/lib-base/Math.hpp>
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib-multimethods/Indexable.hpp>
#include<yade/lib/base/Math.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<yade/lib/multimethods/Indexable.hpp>
#include<yade/core/Dispatcher.hpp>
class IGeom : public Serializable, public Indexable
......
......@@ -8,9 +8,9 @@
#pragma once
#include<yade/lib-base/Math.hpp>
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib-multimethods/Indexable.hpp>
#include<yade/lib/base/Math.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<yade/lib/multimethods/Indexable.hpp>
#include<yade/core/Dispatcher.hpp>
class IPhys : public Serializable, public Indexable
......
......@@ -2,7 +2,7 @@
// Copyright (C) 2004 by Janek Kozicki <cosurgi@berlios.de>
//
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib/serialization/Serializable.hpp>
// keep those two here, template instantiation & boost::python gets broken otherwise, e.g. https://bugs.launchpad.net/bugs/618766
#include<yade/core/IGeom.hpp>
#include<yade/core/IPhys.hpp>
......
......@@ -4,7 +4,7 @@
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<boost/thread/mutex.hpp>
#ifdef YADE_OPENMP
......
// 2009 © Václav Šmilauer <eudoxos@arcig.cz>
#pragma once
#include<string>
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib-multimethods/Indexable.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<yade/lib/multimethods/Indexable.hpp>
#include<yade/core/State.hpp>
#include<yade/core/Dispatcher.hpp>
......
......@@ -12,9 +12,9 @@
#include"Scene.hpp"
#include"TimeStepper.hpp"
#include"ThreadRunner.hpp"
#include<yade/lib-base/Math.hpp>
#include<yade/lib-multimethods/FunctorWrapper.hpp>
#include<yade/lib-multimethods/Indexable.hpp>
#include<yade/lib/base/Math.hpp>
#include<yade/lib/multimethods/FunctorWrapper.hpp>
#include<yade/lib/multimethods/Indexable.hpp>
#include<cstdlib>
#include<boost/filesystem/operations.hpp>
#include<boost/filesystem/convenience.hpp>
......@@ -24,7 +24,7 @@
#include<boost/version.hpp>
#include<boost/python.hpp>
#include<yade/lib-serialization/ObjectIO.hpp>
#include<yade/lib/serialization/ObjectIO.hpp>
#include<cxxabi.h>
......
......@@ -33,10 +33,10 @@
#include <boost/thread/thread.hpp>
#include <iostream>
#include<yade/lib-base/Math.hpp>
#include<yade/lib-factory/ClassFactory.hpp>
#include<yade/lib/base/Math.hpp>
#include<yade/lib/factory/ClassFactory.hpp>
#include<yade/lib-base/Singleton.hpp>
#include<yade/lib/base/Singleton.hpp>
#include "SimulationFlow.hpp"
......
......@@ -13,7 +13,7 @@
#include<yade/core/Timing.hpp>
#include<yade/core/TimeStepper.hpp>
#include<yade/lib-base/Math.hpp>
#include<yade/lib/base/Math.hpp>
#include<boost/foreach.hpp>
#include<boost/date_time/posix_time/posix_time.hpp>
#include<boost/algorithm/string.hpp>
......
......@@ -8,8 +8,8 @@
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib-multimethods/Indexable.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<yade/lib/multimethods/Indexable.hpp>
#include<yade/core/Dispatcher.hpp>
#define BV_FUNCTOR_CACHE
......
// 2009 © Václav Šmilauer <eudoxos@arcig.cz>
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib-multimethods/Indexable.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<yade/lib/multimethods/Indexable.hpp>
#include<yade/core/Dispatcher.hpp>
/*! State (internal & spatial variables) of a body.
......
#include<yade/lib-factory/ClassFactory.hpp>
#include<yade/lib/factory/ClassFactory.hpp>
// make core classes known to the class factory
#include<yade/core/Body.hpp>
#include<yade/core/BodyContainer.hpp>
......
#include<yade/core/Omega.hpp>
#include<yade/lib-base/Logging.hpp>
#include<yade/lib/base/Logging.hpp>
#include<signal.h>
#include<cstdlib>
......
......@@ -11,7 +11,7 @@
#include"GLViewer.hpp"
#include"OpenGLManager.hpp"
#include<yade/lib-opengl/OpenGLWrapper.hpp>
#include<yade/lib/opengl/OpenGLWrapper.hpp>
#include<yade/core/Body.hpp>
#include<yade/core/Scene.hpp>
#include<yade/core/Interaction.hpp>
......@@ -23,7 +23,7 @@
#include<sstream>
#include<iomanip>
#include<boost/algorithm/string/case_conv.hpp>
#include<yade/lib-serialization/ObjectIO.hpp>
#include<yade/lib/serialization/ObjectIO.hpp>
#include<QtGui/qevent.h>
......
......@@ -3,7 +3,7 @@
#pragma once
#include<yade/core/Omega.hpp>
#include<yade/pkg-common/OpenGLRenderer.hpp>
#include<yade/pkg/common/OpenGLRenderer.hpp>
#include<QGLViewer/qglviewer.h>
#include<QGLViewer/constraint.h>
......@@ -11,7 +11,7 @@
#include<boost/date_time/posix_time/posix_time.hpp>
#include<set>
#include<yade/pkg-common/PeriodicEngines.hpp>
#include<yade/pkg/common/PeriodicEngines.hpp>
/*****************************************************************************
*********************************** SnapshotEngine ***************************
......
#include"GLViewer.hpp"
#include"OpenGLManager.hpp"
#include<boost/python.hpp>
#include<yade/pkg-common/OpenGLRenderer.hpp>
#include<yade/lib-pyutil/doc_opts.hpp>
#include<yade/pkg/common/OpenGLRenderer.hpp>
#include<yade/lib/pyutil/doc_opts.hpp>
#include<QApplication>
#include<QCloseEvent>
......
#include<yade/lib-base/Math.hpp>
#include<yade/lib/base/Math.hpp>
template<> const Real Math<Real>::EPSILON = DBL_EPSILON;
template<> const Real Math<Real>::ZERO_TOLERANCE = 1e-20;
template<> const Real Math<Real>::MAX_REAL = DBL_MAX;
......
......@@ -2,7 +2,7 @@
#pragma once
// for ZeroInitializer template
#include<yade/lib-base/Math.hpp>
#include<yade/lib/base/Math.hpp>
#include<boost/serialization/split_free.hpp>
#include<boost/lexical_cast.hpp>
......
......@@ -11,7 +11,7 @@
#include "ClassFactory.hpp"
#include<boost/algorithm/string/regex.hpp>
#include<yade/lib-base/Logging.hpp>
#include<yade/lib/base/Logging.hpp>
CREATE_LOGGER(ClassFactory);
SINGLETON_SELF(ClassFactory);
......
......@@ -26,7 +26,7 @@
#endif
#include<yade/lib-base/Singleton.hpp>
#include<yade/lib/base/Singleton.hpp>
#include<boost/preprocessor.hpp>
......
......@@ -16,7 +16,7 @@
#include <map>
#include <vector>
#include<yade/lib-base/Logging.hpp>
#include<yade/lib/base/Logging.hpp>
using namespace std;
......
......@@ -12,8 +12,8 @@
#include "Indexable.hpp"
#include<yade/lib-factory/ClassFactory.hpp>
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib/factory/ClassFactory.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<loki/Functor.h>
#include<loki/Typelist.h>
......
......@@ -9,7 +9,7 @@
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib/serialization/Serializable.hpp>
#include<loki/Typelist.h>
#include<loki/Functor.h>
......
......@@ -4,7 +4,7 @@
//
#pragma once
#include<yade/lib-opengl/OpenGLWrapper.hpp>
#include<yade/lib/opengl/OpenGLWrapper.hpp>
#include<boost/lexical_cast.hpp>
#include<sstream>
#include<iomanip>
......
......@@ -12,7 +12,7 @@
#error "This build doesn't support openGL. Therefore, this header must not be used."
#endif
#include<yade/lib-base/Math.hpp>
#include<yade/lib/base/Math.hpp>
// disable temporarily
......
#include<yade/lib-pyutil/gil.hpp>
#include<yade/lib/pyutil/gil.hpp>
void pyRunString(const std::string& cmd){
gilLock lock; PyRun_SimpleString(cmd.c_str());
};
......
......@@ -30,11 +30,11 @@
#include<string>
#include<vector>
#include<iostream>
#include<yade/lib-factory/Factorable.hpp>
#include<yade/lib-pyutil/raw_constructor.hpp>
#include<yade/lib-pyutil/doc_opts.hpp>
#include<yade/lib/factory/Factorable.hpp>
#include<yade/lib/pyutil/raw_constructor.hpp>
#include<yade/lib/pyutil/doc_opts.hpp>
#include<yade/lib-base/Math.hpp>
#include<yade/lib/base/Math.hpp>
using namespace boost;
using namespace std;
......
......@@ -30,7 +30,7 @@
using namespace std;
using namespace boost;
#include<yade/lib-base/Math.hpp>
#include<yade/lib/base/Math.hpp>
template<typename T>
......
......@@ -7,8 +7,8 @@
*************************************************************************/
#include "Bo1_Box_Aabb.hpp"
#include<yade/pkg-common/Box.hpp>
#include<yade/pkg-common/Aabb.hpp>
#include<yade/pkg/common/Box.hpp>
#include<yade/pkg/common/Aabb.hpp>
void Bo1_Box_Aabb::go( const shared_ptr<Shape>& cm,
......
......@@ -9,7 +9,7 @@
#pragma once
#include<yade/pkg-common/Dispatching.hpp>
#include<yade/pkg/common/Dispatching.hpp>
class Bo1_Box_Aabb : public BoundFunctor{
......
......@@ -7,8 +7,8 @@
*************************************************************************/
#include "Bo1_Sphere_Aabb.hpp"
#include<yade/pkg-common/Sphere.hpp>
#include<yade/pkg-common/Aabb.hpp>
#include<yade/pkg/common/Sphere.hpp>
#include<yade/pkg/common/Aabb.hpp>
void Bo1_Sphere_Aabb::go(const shared_ptr<Shape>& cm, shared_ptr<Bound>& bv, const Se3r& se3, const Body* b){
Sphere* sphere = static_cast<Sphere*>(cm.get());
......
......@@ -8,7 +8,7 @@
#pragma once
#include<yade/pkg-common/Dispatching.hpp>
#include<yade/pkg/common/Dispatching.hpp>
class Bo1_Sphere_Aabb : public BoundFunctor
{
......
#include<yade/pkg-common/BoundaryController.hpp>
#include<yade/pkg/common/BoundaryController.hpp>
#include<stdexcept>
void BoundaryController::action(){ throw std::runtime_error("BoundaryController must not be used in simulations directly (BoundaryController::action called)."); }
YADE_PLUGIN((BoundaryController));
#include<yade/pkg-common/Callbacks.hpp>
#include<yade/pkg/common/Callbacks.hpp>
BodyCallback::~BodyCallback(){};
IntrCallback::~IntrCallback(){};
YADE_PLUGIN((IntrCallback)(BodyCallback));
......@@ -2,7 +2,7 @@
#pragma once
#include<stdexcept>
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib/serialization/Serializable.hpp>
class Interaction;
class Body;
......
......@@ -6,7 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#include<yade/pkg-common/Collider.hpp>
#include<yade/pkg/common/Collider.hpp>
YADE_PLUGIN((Collider));
......
......@@ -12,7 +12,7 @@
#include<yade/core/Interaction.hpp>
#include<yade/core/GlobalEngine.hpp>
#include<yade/pkg-common/Dispatching.hpp>
#include<yade/pkg/common/Dispatching.hpp>
class Collider: public GlobalEngine {
public:
......
#include "Cylinder.hpp"
#include<yade/pkg-common/Sphere.hpp>
#include<yade/pkg/common/Sphere.hpp>
#ifdef YADE_OPENGL
#include<yade/lib-opengl/OpenGLWrapper.hpp>
#include<yade/lib/opengl/OpenGLWrapper.hpp>
#endif
#include<yade/pkg-common/Aabb.hpp>
#include<yade/pkg/common/Aabb.hpp>
Cylinder::~Cylinder(){}
ChainedCylinder::~ChainedCylinder(){}
......
......@@ -2,12 +2,12 @@
#include<yade/core/Shape.hpp>
#include<yade/core/State.hpp>
#include<yade/core/Body.hpp>