Skip to content
Snippets Groups Projects
Commit 4f7f1daa authored by Arnaud Degroote's avatar Arnaud Degroote
Browse files

[wip/hyper] Upgrade to 0.12

Important changes since 0.11
-----------------------------
   - test program has been improved, allowing to pass complex constraint to
   the tested agents
   - doc improvements including new tutorials and more advanced documentation
   - compiler extensions interface has been extended, with more control points

At the package level, use PLIST_DYNAMIC_DIRS in the doc case
parent 51d8f00f
No related branches found
No related tags found
No related merge requests found
......@@ -3,8 +3,7 @@
#
DISTNAME= hyper-${VERSION}
VERSION= 0.11
PKGREVISION= 2
VERSION= 0.12
CATEGORIES= supervision
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=hyper/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}hyper
......@@ -19,6 +18,7 @@ MAKE_JOBS_SAFE= no # because gcc eats up to 1GB for some files...
CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
CMAKE_ARGS+= -DBOOST_LIBDIR=${PREFIX.boost-libs}/include
# doc option
PKG_SUPPORTED_OPTIONS+= doc
PKG_OPTION_DESCR.doc?= Install ${PKGBASE} documentation
......@@ -26,6 +26,7 @@ PKG_OPTION_DESCR.doc?= Install ${PKGBASE} documentation
define PKG_OPTION_SET.doc
CMAKE_ARGS+= -DBUILD_DOC=ON
CMAKE_ARGS+= -DSPHINX_BUILD=${PREFIX.py-sphinx}/bin/sphinx-build
DYNAMIC_PLIST_DIRS+= share/doc/hyper
include ../../mk/sysdep/py-sphinx.mk
endef
define PKG_OPTION_UNSET.doc
......
......@@ -108,34 +108,6 @@ lib/libhyper_compiler.so
lib/libhyper_logic.so
lib/libhyper_model.so
lib/libhyper_network.so
${PLIST.doc}share/doc/morse/html/_static/ajax-loader.gif
${PLIST.doc}share/doc/morse/html/_static/basic.css
${PLIST.doc}share/doc/morse/html/_static/comment-bright.png
${PLIST.doc}share/doc/morse/html/_static/comment-close.png
${PLIST.doc}share/doc/morse/html/_static/comment.png
${PLIST.doc}share/doc/morse/html/_static/default.css
${PLIST.doc}share/doc/morse/html/_static/doctools.js
${PLIST.doc}share/doc/morse/html/_static/down-pressed.png
${PLIST.doc}share/doc/morse/html/_static/down.png
${PLIST.doc}share/doc/morse/html/_static/file.png
${PLIST.doc}share/doc/morse/html/_static/jquery.js
${PLIST.doc}share/doc/morse/html/_static/minus.png
${PLIST.doc}share/doc/morse/html/_static/plus.png
${PLIST.doc}share/doc/morse/html/_static/pygments.css
${PLIST.doc}share/doc/morse/html/_static/searchtools.js
${PLIST.doc}share/doc/morse/html/_static/sidebar.js
${PLIST.doc}share/doc/morse/html/_static/underscore.js
${PLIST.doc}share/doc/morse/html/_static/up-pressed.png
${PLIST.doc}share/doc/morse/html/_static/up.png
${PLIST.doc}share/doc/morse/html/_static/websupport.js
${PLIST.doc}share/doc/morse/html/first_agent.html
${PLIST.doc}share/doc/morse/html/genindex.html
${PLIST.doc}share/doc/morse/html/hyper.html
${PLIST.doc}share/doc/morse/html/installation.html
${PLIST.doc}share/doc/morse/html/more_realist_first_agent.html
${PLIST.doc}share/doc/morse/html/search.html
${PLIST.doc}share/doc/morse/html/searchindex.js
${PLIST.doc}share/doc/morse/html/what_is_hyper.html
share/hyper/FindBoost.cmake
share/hyper/HyperConfig.cmake
share/hyper/HyperNode.cmake
......
......@@ -14,7 +14,7 @@ PREFER.hyper?= robotpkg
DEPEND_USE+= hyper
DEPEND_ABI.hyper?= hyper>=0.9
DEPEND_ABI.hyper?= hyper>=0.12
DEPEND_DIR.hyper?= ../../wip/hyper
SYSTEM_SEARCH.hyper=\
......
SHA1 (hyper-0.11.tar.gz) = 0de38d9d5849ffa0ad997f98d8c6fd290be7b679
RMD160 (hyper-0.11.tar.gz) = 5db0ade5387e34307eb36956fdd6f6683ae1814f
Size (hyper-0.11.tar.gz) = 192438 bytes
SHA1 (patch-aa) = 316d11c666d9d3f8ed288a52b99c0299382014df
SHA1 (hyper-0.12.tar.gz) = 4b6e7009e6c40957e119ee067046eb4aa162525f
RMD160 (hyper-0.12.tar.gz) = fe01256fa881adc7d31683063cf110d60fa3aac1
Size (hyper-0.12.tar.gz) = 204234 bytes
[compiler] Accept negative int in atom grammar
diff --git a/include/compiler/base_parser.hh b/include/compiler/base_parser.hh
index 23a45c6..8d9af79 100644
--- include/compiler/base_parser.hh
+++ include/compiler/base_parser.hh
@@ -163,7 +163,7 @@ namespace hyper {
| cst_bool
);
- cst_int = qi::uint_;
+ cst_int = qi::int_;
cst_double = strict_double;
cst_string = constant_string;
cst_bool = qi::bool_;
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