llsf: move the LLSF items to a separate folder

This commit separates the referee box core infrastructure from the LLSF-specific implementations, such as messages, tools or visualization. As a result, the core infrastructure can be re-used more easily for other competitions.
industrial-robotics · Aug 28, 2014 · 485a74d · 485a74d
1 parent 8e09fc3
commit 485a74d
Show file tree

Hide file tree

Showing 77 changed files with 56 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@
 
 BASEDIR = .
 
-SUBDIRS = src
+SUBDIRS = src llsf
 
 include $(BASEDIR)/etc/buildsys/config.mk
 include $(BUILDSYSDIR)/rules.mk

diff --git a/cfg/config.yaml b/cfg/config.yaml
@@ -24,7 +24,7 @@ llsfrb:
     test-lights: true
 
   clips:
-    dir: "@BASEDIR@/src/refbox/clips"
+    dir: "@BASEDIR@/llsf/clips"
     # Timer interval, in milliseconds
     timer-interval: 40
 
@@ -41,7 +41,7 @@ llsfrb:
                     net-send-VersionInfo]
 
   comm:
-    protobuf-dirs: ["@BASEDIR@/src/msgs"]
+    protobuf-dirs: ["@BASEDIR@/llsf/msgs"]
 
     server-port: !tcp-port 4444
 

diff --git a/llsf/Makefile b/llsf/Makefile
@@ -0,0 +1,27 @@
+#*****************************************************************************
+#                      Makefile Build System for Fawkes
+#                            -------------------
+#   Created on Wed Jan 16 16:55:21 2013
+#   Copyright (C) 2006-2011 by Tim Niemueller, Carologistics RoboCup Team
+#
+#*****************************************************************************
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#*****************************************************************************
+
+BASEDIR = ..
+
+include $(BASEDIR)/etc/buildsys/config.mk
+
+SUBDIRS = msgs shell tools
+
+# Explicit dependencies, this is needed to have make bail out if there is any
+# error. This is also necessary for working parallel build (i.e. for dual core)
+tools shell: msgs
+
+
+include $(BUILDSYSDIR)/base.mk
diff --git a/src/refbox/clips/challenges.clp → llsf/clips/challenges.clp b/src/refbox/clips/challenges.clp → llsf/clips/challenges.clp
diff --git a/src/refbox/clips/config.clp → llsf/clips/config.clp b/src/refbox/clips/config.clp → llsf/clips/config.clp
diff --git a/src/refbox/clips/exploration.clp → llsf/clips/exploration.clp b/src/refbox/clips/exploration.clp → llsf/clips/exploration.clp
diff --git a/src/refbox/clips/facts.clp → llsf/clips/facts.clp b/src/refbox/clips/facts.clp → llsf/clips/facts.clp
diff --git a/src/refbox/clips/game.clp → llsf/clips/game.clp b/src/refbox/clips/game.clp → llsf/clips/game.clp
diff --git a/src/refbox/clips/globals.clp → llsf/clips/globals.clp b/src/refbox/clips/globals.clp → llsf/clips/globals.clp
diff --git a/src/refbox/clips/init.clp → llsf/clips/init.clp b/src/refbox/clips/init.clp → llsf/clips/init.clp
diff --git a/src/refbox/clips/machines.clp → llsf/clips/machines.clp b/src/refbox/clips/machines.clp → llsf/clips/machines.clp
diff --git a/src/refbox/clips/mongodb.clp → llsf/clips/mongodb.clp b/src/refbox/clips/mongodb.clp → llsf/clips/mongodb.clp
diff --git a/src/refbox/clips/net.clp → llsf/clips/net.clp b/src/refbox/clips/net.clp → llsf/clips/net.clp
diff --git a/src/refbox/clips/orders.clp → llsf/clips/orders.clp b/src/refbox/clips/orders.clp → llsf/clips/orders.clp
diff --git a/src/refbox/clips/priorities.clp → llsf/clips/priorities.clp b/src/refbox/clips/priorities.clp → llsf/clips/priorities.clp
diff --git a/src/refbox/clips/production.clp → llsf/clips/production.clp b/src/refbox/clips/production.clp → llsf/clips/production.clp
diff --git a/src/refbox/clips/protobuf.clp → llsf/clips/protobuf.clp b/src/refbox/clips/protobuf.clp → llsf/clips/protobuf.clp
diff --git a/src/refbox/clips/refbox.clp → llsf/clips/refbox.clp b/src/refbox/clips/refbox.clp → llsf/clips/refbox.clp
diff --git a/src/refbox/clips/robots.clp → llsf/clips/robots.clp b/src/refbox/clips/robots.clp → llsf/clips/robots.clp
diff --git a/src/refbox/clips/setup.clp → llsf/clips/setup.clp b/src/refbox/clips/setup.clp → llsf/clips/setup.clp
diff --git a/src/refbox/clips/simulation.clp → llsf/clips/simulation.clp b/src/refbox/clips/simulation.clp → llsf/clips/simulation.clp
diff --git a/src/refbox/clips/time.clp → llsf/clips/time.clp b/src/refbox/clips/time.clp → llsf/clips/time.clp
diff --git a/src/refbox/clips/utils.clp → llsf/clips/utils.clp b/src/refbox/clips/utils.clp → llsf/clips/utils.clp
diff --git a/src/examples/Makefile → llsf/examples/Makefile b/src/examples/Makefile → llsf/examples/Makefile
@@ -18,6 +18,7 @@ BASEDIR = ../..
 include $(BASEDIR)/etc/buildsys/config.mk
 include $(BUILDSYSDIR)/protobuf.mk
 include $(BUILDSYSDIR)/boost.mk
+include $(BASEDIR)/llsf/llsf.mk
 
 CFLAGS += $(CFLAGS_CPP11)
 

diff --git a/src/examples/client.cpp → llsf/examples/client.cpp b/src/examples/client.cpp → llsf/examples/client.cpp
diff --git a/src/examples/peer.cpp → llsf/examples/peer.cpp b/src/examples/peer.cpp → llsf/examples/peer.cpp
diff --git a/llsf/llsf.mk b/llsf/llsf.mk
@@ -0,0 +1,20 @@
+#*****************************************************************************
+#                      Makefile Build System for Fawkes
+#                            -------------------
+#   Created on Sun Sep 03 14:14:14 2006
+#   Copyright (C) 2006-2007 by Tim Niemueller, AllemaniACs RoboCup Team
+#
+#*****************************************************************************
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#*****************************************************************************
+
+ifndef __buildsys_config_mk_
+$(error config.mk must be included before base.mk)
+endif
+
+CFLAGS += -I$(BASEDIR)/llsf
diff --git a/src/llsfvis/Machine.h → llsf/llsfvis/Machine.h b/src/llsfvis/Machine.h → llsf/llsfvis/Machine.h
diff --git a/src/llsfvis/MainWindow.cpp → llsf/llsfvis/MainWindow.cpp b/src/llsfvis/MainWindow.cpp → llsf/llsfvis/MainWindow.cpp
diff --git a/src/llsfvis/MainWindow.h → llsf/llsfvis/MainWindow.h b/src/llsfvis/MainWindow.h → llsf/llsfvis/MainWindow.h
diff --git a/src/llsfvis/Makefile → llsf/llsfvis/Makefile b/src/llsfvis/Makefile → llsf/llsfvis/Makefile
@@ -18,6 +18,7 @@ BASEDIR = ../..
 include $(BASEDIR)/etc/buildsys/config.mk
 include $(BUILDSYSDIR)/protobuf.mk
 include $(BUILDSYSDIR)/gui.mk
+include $(BASEDIR)/llsf/llsf.mk
 
 
 CFLAGS  += $(CFLAGS_GUI)

diff --git a/src/llsfvis/PlayField.cpp → llsf/llsfvis/PlayField.cpp b/src/llsfvis/PlayField.cpp → llsf/llsfvis/PlayField.cpp
diff --git a/src/llsfvis/PlayField.h → llsf/llsfvis/PlayField.h b/src/llsfvis/PlayField.h → llsf/llsfvis/PlayField.h
diff --git a/src/llsfvis/Puck.h → llsf/llsfvis/Puck.h b/src/llsfvis/Puck.h → llsf/llsfvis/Puck.h
diff --git a/src/llsfvis/llsfvis.cpp → llsf/llsfvis/llsfvis.cpp b/src/llsfvis/llsfvis.cpp → llsf/llsfvis/llsfvis.cpp
diff --git a/src/msgs/AttentionMessage.proto → llsf/msgs/AttentionMessage.proto b/src/msgs/AttentionMessage.proto → llsf/msgs/AttentionMessage.proto
diff --git a/src/msgs/BeaconSignal.proto → llsf/msgs/BeaconSignal.proto b/src/msgs/BeaconSignal.proto → llsf/msgs/BeaconSignal.proto
diff --git a/src/msgs/ExplorationInfo.proto → llsf/msgs/ExplorationInfo.proto b/src/msgs/ExplorationInfo.proto → llsf/msgs/ExplorationInfo.proto
diff --git a/src/msgs/GameInfo.proto → llsf/msgs/GameInfo.proto b/src/msgs/GameInfo.proto → llsf/msgs/GameInfo.proto
diff --git a/src/msgs/GameState.proto → llsf/msgs/GameState.proto b/src/msgs/GameState.proto → llsf/msgs/GameState.proto
diff --git a/src/msgs/MachineCommands.proto → llsf/msgs/MachineCommands.proto b/src/msgs/MachineCommands.proto → llsf/msgs/MachineCommands.proto
diff --git a/src/msgs/MachineInfo.proto → llsf/msgs/MachineInfo.proto b/src/msgs/MachineInfo.proto → llsf/msgs/MachineInfo.proto
diff --git a/src/msgs/MachineReport.proto → llsf/msgs/MachineReport.proto b/src/msgs/MachineReport.proto → llsf/msgs/MachineReport.proto
diff --git a/src/msgs/Makefile → llsf/msgs/Makefile b/src/msgs/Makefile → llsf/msgs/Makefile
diff --git a/src/msgs/OrderInfo.proto → llsf/msgs/OrderInfo.proto b/src/msgs/OrderInfo.proto → llsf/msgs/OrderInfo.proto
diff --git a/src/msgs/Pose2D.proto → llsf/msgs/Pose2D.proto b/src/msgs/Pose2D.proto → llsf/msgs/Pose2D.proto
diff --git a/src/msgs/PuckInfo.proto → llsf/msgs/PuckInfo.proto b/src/msgs/PuckInfo.proto → llsf/msgs/PuckInfo.proto
diff --git a/src/msgs/RobotCommands.proto → llsf/msgs/RobotCommands.proto b/src/msgs/RobotCommands.proto → llsf/msgs/RobotCommands.proto
diff --git a/src/msgs/RobotInfo.proto → llsf/msgs/RobotInfo.proto b/src/msgs/RobotInfo.proto → llsf/msgs/RobotInfo.proto
diff --git a/src/msgs/SimTimeSync.proto → llsf/msgs/SimTimeSync.proto b/src/msgs/SimTimeSync.proto → llsf/msgs/SimTimeSync.proto
diff --git a/src/msgs/Team.proto → llsf/msgs/Team.proto b/src/msgs/Team.proto → llsf/msgs/Team.proto
diff --git a/src/msgs/Time.proto → llsf/msgs/Time.proto b/src/msgs/Time.proto → llsf/msgs/Time.proto
diff --git a/src/msgs/VersionInfo.proto → llsf/msgs/VersionInfo.proto b/src/msgs/VersionInfo.proto → llsf/msgs/VersionInfo.proto
diff --git a/src/shell/Makefile → llsf/shell/Makefile b/src/shell/Makefile → llsf/shell/Makefile
@@ -18,6 +18,7 @@ BASEDIR = ../..
 include $(BASEDIR)/etc/buildsys/config.mk
 include $(BUILDSYSDIR)/protobuf.mk
 include $(BUILDSYSDIR)/boost.mk
+include $(BASEDIR)/llsf/llsf.mk
 
 CFLAGS += $(CFLAGS_CPP11)
 

diff --git a/src/shell/colors.cpp → llsf/shell/colors.cpp b/src/shell/colors.cpp → llsf/shell/colors.cpp
diff --git a/src/shell/colors.h → llsf/shell/colors.h b/src/shell/colors.h → llsf/shell/colors.h
diff --git a/src/shell/machine.cpp → llsf/shell/machine.cpp b/src/shell/machine.cpp → llsf/shell/machine.cpp
diff --git a/src/shell/machine.h → llsf/shell/machine.h b/src/shell/machine.h → llsf/shell/machine.h
diff --git a/src/shell/main.cpp → llsf/shell/main.cpp b/src/shell/main.cpp → llsf/shell/main.cpp
diff --git a/src/shell/menus.cpp → llsf/shell/menus.cpp b/src/shell/menus.cpp → llsf/shell/menus.cpp
diff --git a/src/shell/menus.h → llsf/shell/menus.h b/src/shell/menus.h → llsf/shell/menus.h
diff --git a/src/shell/order.cpp → llsf/shell/order.cpp b/src/shell/order.cpp → llsf/shell/order.cpp
diff --git a/src/shell/order.h → llsf/shell/order.h b/src/shell/order.h → llsf/shell/order.h
diff --git a/src/shell/puck.cpp → llsf/shell/puck.cpp b/src/shell/puck.cpp → llsf/shell/puck.cpp
diff --git a/src/shell/puck.h → llsf/shell/puck.h b/src/shell/puck.h → llsf/shell/puck.h
diff --git a/src/shell/robot.cpp → llsf/shell/robot.cpp b/src/shell/robot.cpp → llsf/shell/robot.cpp
diff --git a/src/shell/robot.h → llsf/shell/robot.h b/src/shell/robot.h → llsf/shell/robot.h
diff --git a/src/shell/shell.cpp → llsf/shell/shell.cpp b/src/shell/shell.cpp → llsf/shell/shell.cpp
diff --git a/src/shell/shell.h → llsf/shell/shell.h b/src/shell/shell.h → llsf/shell/shell.h
diff --git a/src/shell/team.h → llsf/shell/team.h b/src/shell/team.h → llsf/shell/team.h
diff --git a/src/tools/Makefile → llsf/tools/Makefile b/src/tools/Makefile → llsf/tools/Makefile
@@ -20,6 +20,7 @@ include $(BUILDSYSDIR)/protobuf.mk
 include $(BUILDSYSDIR)/clips.mk
 include $(BUILDSYSDIR)/boost.mk
 include $(BUILDCONFDIR)/llsf_sps/llsf_sps.mk
+include $(BASEDIR)/llsf/llsf.mk
 
 CFLAGS += $(CFLAGS_CPP11)
 

diff --git a/src/tools/llsf-fake-robot.cpp → llsf/tools/llsf-fake-robot.cpp b/src/tools/llsf-fake-robot.cpp → llsf/tools/llsf-fake-robot.cpp
diff --git a/src/tools/llsf-puck.cpp → llsf/tools/llsf-puck.cpp b/src/tools/llsf-puck.cpp → llsf/tools/llsf-puck.cpp
diff --git a/src/tools/llsf-report-machine.cpp → llsf/tools/llsf-report-machine.cpp b/src/tools/llsf-report-machine.cpp → llsf/tools/llsf-report-machine.cpp
diff --git a/src/tools/llsf-show-peers.cpp → llsf/tools/llsf-show-peers.cpp b/src/tools/llsf-show-peers.cpp → llsf/tools/llsf-show-peers.cpp
diff --git a/src/tools/llsf-signal-ctrl.cpp → llsf/tools/llsf-signal-ctrl.cpp b/src/tools/llsf-signal-ctrl.cpp → llsf/tools/llsf-signal-ctrl.cpp
diff --git a/src/Makefile b/src/Makefile
@@ -17,12 +17,11 @@ BASEDIR = ..
 
 include $(BASEDIR)/etc/buildsys/config.mk
 
-SUBDIRS = libs msgs refbox shell tools
+SUBDIRS = libs refbox
 
 # Explicit dependencies, this is needed to have make bail out if there is any
 # error. This is also necessary for working parallel build (i.e. for dual core)
-refbox tools shell: msgs
-msgs refbox tools shell: libs
+refbox: libs
 
 
 include $(BUILDSYSDIR)/base.mk