Skip to content

Commit 3c7460d

Browse files
proyanproyan
authored
Merge pull request #20 from stack-of-tasks/devel
Move Master to v3
2 parents a2473cd + 11c3bd4 commit 3c7460d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+480
-80
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
_build*
2+
*~

‎.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "jrl-cmakemodules"]
2-
path = jrl-cmakemodules
3-
url = git://github.com/jrl-umi3218/jrl-cmakemodules.git
2+
path = jrl-cmakemodules
3+
url = git://github.com/jrl-umi3218/jrl-cmakemodules.git
44
[submodule "cmake"]
55
path = cmake
66
url = git://github.com/jrl-umi3218/jrl-cmakemodules.git

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
language: cpp
2+
sudo: required
23
compiler:
34
- gcc
45
- clang

‎.version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0.0

‎CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
1717

1818
INCLUDE(cmake/base.cmake)
1919
INCLUDE(cmake/boost.cmake)
20+
INCLUDE(cmake/eigen.cmake)
2021
INCLUDE(cmake/pthread.cmake)
2122
INCLUDE(cmake/cpack.cmake)
2223

@@ -31,9 +32,6 @@ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
3132

3233
SETUP_PROJECT()
3334

34-
# Trigger dependency to jrl-mal
35-
ADD_REQUIRED_DEPENDENCY("jrl-mal >= 1.8.0")
36-
3735
# Add configuration headers for plug-ins.
3836
GENERATE_CONFIGURATION_HEADER(
3937
${HEADER_DIR} config-tracer.hh DG_TRACER tracer_EXPORTS)
@@ -62,6 +60,9 @@ PKG_CONFIG_APPEND_LIBS("dynamic-graph")
6260
SEARCH_FOR_BOOST()
6361
SEARCH_FOR_PTHREAD()
6462

63+
# Search for Boost.
64+
SEARCH_FOR_EIGEN()
65+
6566
ADD_SUBDIRECTORY(src)
6667
ADD_SUBDIRECTORY(include)
6768
ADD_SUBDIRECTORY(doc)

‎ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ CHANGELOG
33

44
[Current]
55

6+
[v3.0.0]
7+
* Replace jrl-mal with eigen
8+
* Add ostream and isteram operators for Eigen Classes
9+
10+
611
[v2.5.5]
712
* Improve Travis support
813

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ have to be available on your machine.
5858

5959
- Libraries:
6060
- [Boost][] (>= 1.40)
61-
Its detection is controled by the `BOOST_ROOT` variable, see next section
61+
Its detection is controlled by the `BOOST_ROOT` variable, see next section
6262
for more information.
6363
- [Lapack][] library
6464
Use the generic purpose `CMAKE_CXX_FLAGS` and `CMAKE_EXE_LINKER_FLAGS`

‎debian/changelog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dynamic-graph (3.0.0-1) unstable; urgency=low
2+
3+
* Initial release (Closes: #822608)
4+
5+
-- Rohan Budhiraja <budhiraja.rohan@gmail.com> Fri, 01 Jul 2016 12:30:14 +0200

‎debian/compat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9

‎debian/control

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
Source: dynamic-graph
2+
Section: libs
3+
Priority: extra
4+
Maintainer: Rohan Budhiraja <budhiraja.rohan@gmail.com>
5+
Build-Depends: debhelper (>= 9.0.0),
6+
cmake (>= 2.6),
7+
doxygen (>=1.6.3),
8+
pkg-config (>=0.22),
9+
perl (>=5.10.1),
10+
libboost-dev (>=1.46),
11+
libboost-filesystem-dev (>=1.46),
12+
libboost-system-dev (>=1.46),
13+
libboost-test-dev (>=1.46),
14+
libboost-thread-dev (>=1.46),
15+
libboost-program-options-dev (>=1.46),
16+
libpthread-stubs0-dev (>=0.3),
17+
libeigen3-dev (>=3.0.5)
18+
Standards-Version: 3.9.8
19+
Homepage: http://stack-of-tasks.github.io
20+
Vcs-Git: https://github.com/proyan/dynamic-graph.git
21+
22+
Package: libdynamic-graph-dev
23+
Section: libdevel
24+
Architecture: any
25+
Depends: libdynamic-graph3.0.0 (= ${binary:Version}),
26+
${misc:Depends}
27+
Suggests: libdynamic-graph-doc
28+
Description: Dynamic graph C++ library development package
29+
The dynamic graph library allows the representation of data-flow in C++.
30+
It provides fast graph evaluation and a simple script language to manipulate
31+
the graph actions.
32+
.
33+
This package contains development files (headers and pkg-config file).
34+
35+
Package: libdynamic-graph3.0.0
36+
Architecture: any
37+
Depends: ${shlibs:Depends}, ${misc:Depends}
38+
Description: Dynamic graph C++ library
39+
The dynamic graph library allows the representation of data-flow in C++.
40+
It provides fast graph evaluation and a simple script language to manipulate
41+
the graph actions.
42+
43+
44+
Package: libdynamic-graph-doc
45+
Section: doc
46+
Architecture: all
47+
Depends: ${misc:Depends}
48+
Description: documentation for the dynamic graph C++ library
49+
The dynamic graph library allows the representation of data-flow in C++.
50+
It provides fast graph evaluation and a simple script language to manipulate
51+
the graph actions.
52+
.
53+
This package contains the Doxygen documentation.

0 commit comments

Comments
 (0)