Merge pull request #2221 from drdanz/lua_swig

portmonitor: Update and autogenerate the lua-swig runtime
robotology · Mar 4, 2020 · 467c6eb · 467c6eb
2 parents 3ae0da7 + 9f18763
commit 467c6eb
Show file tree

Hide file tree

Showing 8 changed files with 2,717 additions and 1,680 deletions.
diff --git a/COPYING b/COPYING
@@ -128,16 +128,17 @@ The list of committers in the YARP repository (ordered by number of commit) is:
   Jonas Ruesch
   Lorenzo Rapetti
   Michael Bucko
+  Prashanth Ramadoss
   Massimo Regoli
   Alessio Rocchi
   Mirko Ferrati
-  Prashanth Ramadoss
   Stefano Dafarra
   Aiko Dinale
   Andrea Ruzzenenti
   Bertrand Higy
   David-Estevez
   Francesco Giovannini
+  Giulio Romualdi
   Arren Glover
   Bruno Nery
   Davide Pollarolo
@@ -160,7 +161,6 @@ The list of committers in the YARP repository (ordered by number of commit) is:
   Enrico Mingo
   Francesca Stramandinoli
   Giovanni Saponaro
-  Giulio Romualdi
   GiulioRomualdi
   Jason Chevrie
   Marco Monforte
@@ -174,7 +174,7 @@ The list of committers in the YARP repository (ordered by number of commit) is:
 
 The list of copyright holders for YARP is:
   Copyright (C) 1995, 2000, 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020
-    Istituto Italiano di Tecnologia (IIT) (2207 files)
+    Istituto Italiano di Tecnologia (IIT) (2262 files)
     RobotCub Consortium (733 files)
     Daniel Krieg <krieg@fias.uni-frankfurt.de> (16 files)
     David Miller <miller@oxygen-icons.org> (13 files)

diff --git a/scripts/admin/update-license b/scripts/admin/update-license
@@ -23,7 +23,7 @@ for f in `cd license_check; find . -type f -iname "*.cpp" \
                                        -or -name "CMakeLists.txt" \
                 | grep -v "/extern" \
                 | grep -v "/qtquick2applicationviewer/" \
-                | grep -v "src/carriers/portmonitor_carrier/lua/lua_swig.h" \
+                | grep -v "/src_gen/" \
 `; do
     ./scripts/admin/update-license-single $f
 done

diff --git a/src/carriers/portmonitor_carrier/CMakeLists.txt b/src/carriers/portmonitor_carrier/CMakeLists.txt
@@ -25,6 +25,18 @@ if (NOT SKIP_portmonitor)
   if(YARP_HAS_Lua)
     target_sources(yarp_portmonitor PRIVATE lua/MonitorLua.cpp
                                             lua/MonitorLua.h)
+    if(YARP_HAS_SWIG AND NOT CMAKE_CROSSCOMPILING)
+      include(${SWIG_USE_FILE})
+      add_custom_command(
+        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/lua/src_gen/swigluarun.h"
+        COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/lua/src_gen/"
+        COMMAND "${SWIG_EXECUTABLE}" -c++ -lua -external-runtime "${CMAKE_CURRENT_BINARY_DIR}/lua/src_gen/swigluarun.h"
+        COMMENT "Generating swig-lua runtime")
+      target_include_directories(yarp_portmonitor PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/lua/src_gen")
+      target_sources(yarp_portmonitor PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/lua/src_gen/swigluarun.h")
+    else()
+      target_include_directories(yarp_portmonitor PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/lua/src_gen")
+    endif()
   endif()
 
   target_include_directories(yarp_portmonitor PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/src/carriers/portmonitor_carrier/lua/MonitorLua.h b/src/carriers/portmonitor_carrier/lua/MonitorLua.h
@@ -13,7 +13,7 @@
 #include <string>
 #include <yarp/os/PeriodicThread.h>
 #include "MonitorBinding.h"
-#include "lua_swig.h"
+#include "swigluarun.h"
 #include <mutex>
 
 class MonitorTrigger;