Skip to content
Snippets Groups Projects
Commit 3c7460d5 authored by Rohan Budhiraja's avatar Rohan Budhiraja Committed by GitHub
Browse files

Merge pull request #20 from stack-of-tasks/devel

Move Master to v3
parents a2473cde 11c3bd44
No related branches found
No related tags found
No related merge requests found
Showing with 147 additions and 6 deletions
_build*
*~
\ No newline at end of file
[submodule "jrl-cmakemodules"] [submodule "jrl-cmakemodules"]
path = jrl-cmakemodules path = jrl-cmakemodules
url = git://github.com/jrl-umi3218/jrl-cmakemodules.git url = git://github.com/jrl-umi3218/jrl-cmakemodules.git
[submodule "cmake"] [submodule "cmake"]
path = cmake path = cmake
url = git://github.com/jrl-umi3218/jrl-cmakemodules.git url = git://github.com/jrl-umi3218/jrl-cmakemodules.git
......
language: cpp language: cpp
sudo: required
compiler: compiler:
- gcc - gcc
- clang - clang
......
3.0.0
\ No newline at end of file
...@@ -17,6 +17,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ...@@ -17,6 +17,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
INCLUDE(cmake/base.cmake) INCLUDE(cmake/base.cmake)
INCLUDE(cmake/boost.cmake) INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/eigen.cmake)
INCLUDE(cmake/pthread.cmake) INCLUDE(cmake/pthread.cmake)
INCLUDE(cmake/cpack.cmake) INCLUDE(cmake/cpack.cmake)
...@@ -31,9 +32,6 @@ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) ...@@ -31,9 +32,6 @@ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
SETUP_PROJECT() SETUP_PROJECT()
# Trigger dependency to jrl-mal
ADD_REQUIRED_DEPENDENCY("jrl-mal >= 1.8.0")
# Add configuration headers for plug-ins. # Add configuration headers for plug-ins.
GENERATE_CONFIGURATION_HEADER( GENERATE_CONFIGURATION_HEADER(
${HEADER_DIR} config-tracer.hh DG_TRACER tracer_EXPORTS) ${HEADER_DIR} config-tracer.hh DG_TRACER tracer_EXPORTS)
...@@ -62,6 +60,9 @@ PKG_CONFIG_APPEND_LIBS("dynamic-graph") ...@@ -62,6 +60,9 @@ PKG_CONFIG_APPEND_LIBS("dynamic-graph")
SEARCH_FOR_BOOST() SEARCH_FOR_BOOST()
SEARCH_FOR_PTHREAD() SEARCH_FOR_PTHREAD()
# Search for Boost.
SEARCH_FOR_EIGEN()
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(doc) ADD_SUBDIRECTORY(doc)
......
...@@ -3,6 +3,11 @@ CHANGELOG ...@@ -3,6 +3,11 @@ CHANGELOG
[Current] [Current]
[v3.0.0]
* Replace jrl-mal with eigen
* Add ostream and isteram operators for Eigen Classes
[v2.5.5] [v2.5.5]
* Improve Travis support * Improve Travis support
......
...@@ -58,7 +58,7 @@ have to be available on your machine. ...@@ -58,7 +58,7 @@ have to be available on your machine.
- Libraries: - Libraries:
- [Boost][] (>= 1.40) - [Boost][] (>= 1.40)
Its detection is controled by the `BOOST_ROOT` variable, see next section Its detection is controlled by the `BOOST_ROOT` variable, see next section
for more information. for more information.
- [Lapack][] library - [Lapack][] library
Use the generic purpose `CMAKE_CXX_FLAGS` and `CMAKE_EXE_LINKER_FLAGS` Use the generic purpose `CMAKE_CXX_FLAGS` and `CMAKE_EXE_LINKER_FLAGS`
......
dynamic-graph (3.0.0-1) unstable; urgency=low
* Initial release (Closes: #822608)
-- Rohan Budhiraja <budhiraja.rohan@gmail.com> Fri, 01 Jul 2016 12:30:14 +0200
9
Source: dynamic-graph
Section: libs
Priority: extra
Maintainer: Rohan Budhiraja <budhiraja.rohan@gmail.com>
Build-Depends: debhelper (>= 9.0.0),
cmake (>= 2.6),
doxygen (>=1.6.3),
pkg-config (>=0.22),
perl (>=5.10.1),
libboost-dev (>=1.46),
libboost-filesystem-dev (>=1.46),
libboost-system-dev (>=1.46),
libboost-test-dev (>=1.46),
libboost-thread-dev (>=1.46),
libboost-program-options-dev (>=1.46),
libpthread-stubs0-dev (>=0.3),
libeigen3-dev (>=3.0.5)
Standards-Version: 3.9.8
Homepage: http://stack-of-tasks.github.io
Vcs-Git: https://github.com/proyan/dynamic-graph.git
Package: libdynamic-graph-dev
Section: libdevel
Architecture: any
Depends: libdynamic-graph3.0.0 (= ${binary:Version}),
${misc:Depends}
Suggests: libdynamic-graph-doc
Description: Dynamic graph C++ library development package
The dynamic graph library allows the representation of data-flow in C++.
It provides fast graph evaluation and a simple script language to manipulate
the graph actions.
.
This package contains development files (headers and pkg-config file).
Package: libdynamic-graph3.0.0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Dynamic graph C++ library
The dynamic graph library allows the representation of data-flow in C++.
It provides fast graph evaluation and a simple script language to manipulate
the graph actions.
Package: libdynamic-graph-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
Description: documentation for the dynamic graph C++ library
The dynamic graph library allows the representation of data-flow in C++.
It provides fast graph evaluation and a simple script language to manipulate
the graph actions.
.
This package contains the Doxygen documentation.
\ No newline at end of file
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: dynamic-graph
Upstream-Contact: HPP mailing list <hpp@laas.fr>
Source: https://github.com/proyan/dynamic-graph
Files: *
Copyright: 2010-2016 JRL, CNRS/AIST.
License: LGPL-3
Files: debian/*
Copyright: 2016 Rohan Budhiraja
License: LGPL-3
License: LGPL-3
See `/usr/share/common-licenses/LGPL-3'.
\ No newline at end of file
AUTHORS
NEWS
README.md
usr/include/*
usr/lib/lib*.so
usr/lib/pkgconfig/*
\ No newline at end of file
Document: dynamic-graph
Title: Debian dynamic-graph Manual
Author: Thomas Moulard <thomas.moulard@gmail.com>
Abstract: Doxygen documentation of dynamic-graph.
Section: Programming
Format: HTML
Index: /usr/share/doc/dynamic-graph/doxygen-html/index.html
Files: /usr/share/doc/dynamic-graph/doxygen-html/*.html
\ No newline at end of file
usr/share/doc/dynamic-graph/*
\ No newline at end of file
#Suppresses the embedded javascript warning produced by doxygen embed of jquery.
#See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=736360
libdynamic-graph-doc binary: embedded-javascript-library usr/share/doc/dynamic-graph/doxygen-html/jquery.js
\ No newline at end of file
usr/lib/*.so.*
usr/lib/plugin/*.so
usr/share/man/*
usr/share/dynamic-graph/*
\ No newline at end of file
activate-noawait ldconfig
\ No newline at end of file
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
CFLAGS+=$(CPPFLAGS)
CXXFLAGS+=$(CPPFLAGS)
override_dh_auto_configure:
dh_auto_configure -- -DGENERATE_DOC=ON
override_dh_makeshlibs:
dh_makeshlibs --exclude=lib/plugin --noscripts
override_dh_shlibdeps:
dh_shlibdeps --exclude=lib/plugin
override_dh_installchangelogs:
dh_installchangelogs changelog
%:
dh $@
3.0 (quilt)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment