diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 688d85e..9231efb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,18 @@ Changelog for package rfsm ^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2021-01-19) +------------------ +* Revert "Readded manifest.xml file to not break rFSM for fuerte and earlier" + This reverts commit 26d0477053597690ab1d941f26041492ddfced9b. +* Merge pull request `#13 `_ from Intermodalics/bugfix/rfsm-viz_output_location + Fixing rfsm-viz output location bug invalid escape sequence near '\.' +* Merge pull request `#11 `_ from ledvinap/fix-arg + Fix deprecated unpack(arg) +* Merge pull request `#7 `_ from meyerj/added-print-fcn-argument-to-gen_dbgcolor + Added optional print_fcn argument to rfsmpp.gen_dbgcolor +* Contributors: Dominick Vanthienen, Johannes Meyer, Markus Klotzbuecher, Petr Ledvina + 1.0.1 (2017-05-02) ------------------ * Merge pull request `#1 `_ from meyerj/added-print-fcn-argument-to-gen_dbgcolor diff --git a/CMakeLists.txt b/CMakeLists.txt index bc9f728..9496075 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.3) project(rfsm) -find_package(catkin REQUIRED) -catkin_package() -catkin_add_env_hooks(10.rfsm SHELLS sh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks) +find_package(ament_cmake REQUIRED) +ament_environment_hooks(env-hooks/rfsm.sh.in) +ament_package() ############# ## Install ## @@ -15,16 +15,22 @@ catkin_add_env_hooks(10.rfsm SHELLS sh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env file(GLOB LUA_FILES "*.lua") install( FILES ${LUA_FILES} - DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/lua/5.1/rfsm/ + DESTINATION share/lua/5.1/rfsm/ ) +file(GLOB GV_FILES "graphiviz-lib/*") +install( + FILES ${GV_FILES} + DESTINATION share/lua/5.1/graphviz/ +) + install( PROGRAMS tools/rfsm-sim tools/rfsm-viz tools/rfsm2json - DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} + DESTINATION lib/${PROJECT_NAME} ) install( FILES tools/rfsm-sim.lua - DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} + DESTINATION lib/${PROJECT_NAME} ) diff --git a/env-hooks/10.rfsm.sh.develspace.in b/env-hooks/10.rfsm.sh.develspace.in deleted file mode 100644 index 4311605..0000000 --- a/env-hooks/10.rfsm.sh.develspace.in +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -if [ "x$LUA_PATH" = "x" ]; then - LUA_PATH=";" -fi -export LUA_PATH="$LUA_PATH;@CMAKE_CURRENT_SOURCE_DIR@/?.lua" diff --git a/env-hooks/10.rfsm.sh.installspace.in b/env-hooks/10.rfsm.sh.installspace.in deleted file mode 100644 index d1bcae3..0000000 --- a/env-hooks/10.rfsm.sh.installspace.in +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -if [ "x$LUA_PATH" = "x" ]; then - LUA_PATH=";" -fi -export LUA_PATH="$LUA_PATH;@CMAKE_INSTALL_PREFIX@/share/lua/5.1/rfsm/?.lua" diff --git a/env-hooks/rfsm.sh.in b/env-hooks/rfsm.sh.in new file mode 100644 index 0000000..0eba440 --- /dev/null +++ b/env-hooks/rfsm.sh.in @@ -0,0 +1,12 @@ +#!/bin/sh +if [ "x$LUA_PATH" = "x" ]; then + LUA_PATH=";" +fi +export LUA_PATH="$LUA_PATH;@CMAKE_CURRENT_SOURCE_DIR@/?.lua" + +if [ "x$LUA_CPATH" = "x" ]; then + LUA_CPATH=";" +fi +export LUA_CPATH="$LUA_CPATH;@CMAKE_INSTALL_PREFIX@/share/lua/5.1/graphviz/?.so" + + diff --git a/graphiviz-lib/gv.so b/graphiviz-lib/gv.so new file mode 120000 index 0000000..f439183 --- /dev/null +++ b/graphiviz-lib/gv.so @@ -0,0 +1 @@ +libgv_lua.so \ No newline at end of file diff --git a/graphiviz-lib/libgv_lua.la b/graphiviz-lib/libgv_lua.la new file mode 100755 index 0000000..baf639f --- /dev/null +++ b/graphiviz-lib/libgv_lua.la @@ -0,0 +1,41 @@ +# libgv_lua.la - a libtool library file +# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-14 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='libgv_lua.so' + +# Names of this library. +library_names='libgv_lua.so libgv_lua.so libgv_lua.so' + +# The name of the static archive. +old_library='' + +# Linker flags that cannot go in dependency_libs. +inherited_linker_flags='' + +# Libraries that this one depends upon. +dependency_libs=' -L/usr/local/lib /usr/local/lib/libgvc.la /usr/lib/x86_64-linux-gnu/libltdl.la -ldl /usr/local/lib/libxdot.la /usr/local/lib/libpathplan.la -L/usr/lib64 -lexpat -lz /usr/local/lib/libcgraph.la /usr/local/lib/libcdt.la -llua5.1' + +# Names of additional weak libraries provided by this library +weak_library_names='' + +# Version information for libgv_lua. +current=0 +age=0 +revision=0 + +# Is this an already installed library? +installed=yes + +# Should we warn about portability when linking against -modules? +shouldnotlink=yes + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/usr/local/lib/graphviz/lua' diff --git a/graphiviz-lib/libgv_lua.so b/graphiviz-lib/libgv_lua.so new file mode 100755 index 0000000..0ebe632 Binary files /dev/null and b/graphiviz-lib/libgv_lua.so differ diff --git a/manifest.xml b/manifest.xml deleted file mode 100644 index 3817f85..0000000 --- a/manifest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - This package contains the rFSM flavor of Statecharts. - - Markus Klotzbuecher, mk@mkio.de - https://github.com/kmarkus/rFSM - BSD-3-Clause - - diff --git a/package.xml b/package.xml index 76dc9f1..89bd9e4 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ rfsm - 1.0.1 + 1.0.2 This package contains the rFSM flavor of Statecharts. @@ -19,6 +19,9 @@ - catkin + ament_cmake + + ament_cmake + diff --git a/rfsm_timeevent.lua b/rfsm_timeevent.lua index 4b19be6..b7b237f 100644 --- a/rfsm_timeevent.lua +++ b/rfsm_timeevent.lua @@ -45,8 +45,8 @@ local type = type local tonumber = tonumber local math = math local string = string -local rfsm = rfsm -local time = time +local rfsm = require("rfsm") +local time = require("time") local ts2str = time.ts2str module 'rfsm_timeevent'