move libcontroller

cyberbotics · Aug 6, 2020 · 00b5dc6 · 00b5dc6
1 parent 323d923
commit 00b5dc6
Show file tree

Hide file tree

Showing 80 changed files with 9 additions and 9 deletions.
diff --git a/.atom-build.json b/.atom-build.json
@@ -38,19 +38,19 @@
     },
     "controller release": {
       "cmd": "make",
-      "cwd": "{PROJECT_PATH}/src/lib/Controller",
+      "cwd": "{PROJECT_PATH}/src/Controller",
       "args": [ "release", "-j$NUMBER_OF_PROCESSOR" ],
       "errorMatch": "(?<file>[\\/0-9a-zA-Z\\._]+):(?<line>\\d+):(?<col>\\d+):\\s+(?<message>.+)"
     },
     "controller debug": {
       "cmd": "make",
-      "cwd": "{PROJECT_PATH}/src/lib/Controller",
+      "cwd": "{PROJECT_PATH}/src/Controller",
       "args": [ "debug", "-j$NUMBER_OF_PROCESSOR" ],
       "errorMatch": "(?<file>[\\/0-9a-zA-Z\\._]+):(?<line>\\d+):(?<col>\\d+):\\s+(?<message>.+)"
     },
     "controller clean": {
       "cmd": "make",
-      "cwd": "{PROJECT_PATH}/src/lib/Controller",
+      "cwd": "{PROJECT_PATH}/src/Controller",
       "args": [ "clean" ]
     },
     "export doc": {

diff --git a/Makefile b/Makefile
@@ -92,7 +92,7 @@ ifeq ($(OSTYPE),windows)
 	@rm -rf msys64
 endif
 ifeq ($(OSTYPE),darwin)
-	@rm -rf Contents/Frameworks Contents/MacOS 
+	@rm -rf Contents/Frameworks Contents/MacOS
 endif
 	@+echo "#"; echo "# * tests *"; echo "#"
 	@find tests -name .*.cache | xargs rm -f
@@ -117,7 +117,7 @@ endif
 	@+echo "#"; echo "# * webots (core) *"; echo "#"
 	@+make --silent -C src/webots $(TARGET)
 	@+echo "#"; echo "# * libController *"; echo "#"
-	@+make --silent -C src/lib/Controller $(TARGET) WEBOTS_HOME="$(WEBOTS_HOME)"
+	@+make --silent -C src/Controller $(TARGET) WEBOTS_HOME="$(WEBOTS_HOME)"
 	@+echo "#"; echo "# * resources *";
 	@+make --silent -C resources $(MAKECMDGOALS) WEBOTS_HOME="$(WEBOTS_HOME)"
 	@+echo "#"; echo "# * projects *";

diff --git a/src/lib/Controller/Controller.def → src/Controller/Controller.def b/src/lib/Controller/Controller.def → src/Controller/Controller.def
diff --git a/src/lib/Controller/Makefile → src/Controller/Makefile b/src/lib/Controller/Makefile → src/Controller/Makefile
diff --git a/src/lib/Controller/api/README.TXT → src/Controller/api/README.TXT b/src/lib/Controller/api/README.TXT → src/Controller/api/README.TXT
diff --git a/src/lib/Controller/api/abstract_camera.c → src/Controller/api/abstract_camera.c b/src/lib/Controller/api/abstract_camera.c → src/Controller/api/abstract_camera.c
diff --git a/src/lib/Controller/api/abstract_camera.h → src/Controller/api/abstract_camera.h b/src/lib/Controller/api/abstract_camera.h → src/Controller/api/abstract_camera.h
diff --git a/src/lib/Controller/api/accelerometer.c → src/Controller/api/accelerometer.c b/src/lib/Controller/api/accelerometer.c → src/Controller/api/accelerometer.c
diff --git a/src/lib/Controller/api/brake.c → src/Controller/api/brake.c b/src/lib/Controller/api/brake.c → src/Controller/api/brake.c
diff --git a/src/lib/Controller/api/camera.c → src/Controller/api/camera.c b/src/lib/Controller/api/camera.c → src/Controller/api/camera.c
diff --git a/src/lib/Controller/api/compass.c → src/Controller/api/compass.c b/src/lib/Controller/api/compass.c → src/Controller/api/compass.c
diff --git a/src/lib/Controller/api/connector.c → src/Controller/api/connector.c b/src/lib/Controller/api/connector.c → src/Controller/api/connector.c
diff --git a/src/lib/Controller/api/console.c → src/Controller/api/console.c b/src/lib/Controller/api/console.c → src/Controller/api/console.c
diff --git a/...lib/Controller/api/default_robot_window.c → src/Controller/api/default_robot_window.c b/...lib/Controller/api/default_robot_window.c → src/Controller/api/default_robot_window.c
diff --git a/...roller/api/default_robot_window_private.h → ...roller/api/default_robot_window_private.h b/...roller/api/default_robot_window_private.h → ...roller/api/default_robot_window_private.h
diff --git a/src/lib/Controller/api/device.c → src/Controller/api/device.c b/src/lib/Controller/api/device.c → src/Controller/api/device.c
diff --git a/src/lib/Controller/api/device_private.h → src/Controller/api/device_private.h b/src/lib/Controller/api/device_private.h → src/Controller/api/device_private.h
diff --git a/src/lib/Controller/api/differential_wheels.c → src/Controller/api/differential_wheels.c b/src/lib/Controller/api/differential_wheels.c → src/Controller/api/differential_wheels.c
diff --git a/...troller/api/differential_wheels_private.h → ...troller/api/differential_wheels_private.h b/...troller/api/differential_wheels_private.h → ...troller/api/differential_wheels_private.h
diff --git a/src/lib/Controller/api/display.c → src/Controller/api/display.c b/src/lib/Controller/api/display.c → src/Controller/api/display.c
diff --git a/src/lib/Controller/api/display_private.h → src/Controller/api/display_private.h b/src/lib/Controller/api/display_private.h → src/Controller/api/display_private.h
diff --git a/src/lib/Controller/api/distance_sensor.c → src/Controller/api/distance_sensor.c b/src/lib/Controller/api/distance_sensor.c → src/Controller/api/distance_sensor.c
diff --git a/src/lib/Controller/api/dynamic_library.c → src/Controller/api/dynamic_library.c b/src/lib/Controller/api/dynamic_library.c → src/Controller/api/dynamic_library.c
diff --git a/src/lib/Controller/api/dynamic_library.h → src/Controller/api/dynamic_library.h b/src/lib/Controller/api/dynamic_library.h → src/Controller/api/dynamic_library.h
diff --git a/src/lib/Controller/api/emitter.c → src/Controller/api/emitter.c b/src/lib/Controller/api/emitter.c → src/Controller/api/emitter.c
diff --git a/src/lib/Controller/api/file.c → src/Controller/api/file.c b/src/lib/Controller/api/file.c → src/Controller/api/file.c
diff --git a/src/lib/Controller/api/file.h → src/Controller/api/file.h b/src/lib/Controller/api/file.h → src/Controller/api/file.h
diff --git a/src/lib/Controller/api/gps.c → src/Controller/api/gps.c b/src/lib/Controller/api/gps.c → src/Controller/api/gps.c
diff --git a/src/lib/Controller/api/gyro.c → src/Controller/api/gyro.c b/src/lib/Controller/api/gyro.c → src/Controller/api/gyro.c
diff --git a/src/lib/Controller/api/html_robot_window.c → src/Controller/api/html_robot_window.c b/src/lib/Controller/api/html_robot_window.c → src/Controller/api/html_robot_window.c
diff --git a/...ontroller/api/html_robot_window_private.h → ...ontroller/api/html_robot_window_private.h b/...ontroller/api/html_robot_window_private.h → ...ontroller/api/html_robot_window_private.h
diff --git a/src/lib/Controller/api/inertial_unit.c → src/Controller/api/inertial_unit.c b/src/lib/Controller/api/inertial_unit.c → src/Controller/api/inertial_unit.c
diff --git a/src/lib/Controller/api/joystick.c → src/Controller/api/joystick.c b/src/lib/Controller/api/joystick.c → src/Controller/api/joystick.c
diff --git a/src/lib/Controller/api/joystick_private.h → src/Controller/api/joystick_private.h b/src/lib/Controller/api/joystick_private.h → src/Controller/api/joystick_private.h
diff --git a/src/lib/Controller/api/keyboard.c → src/Controller/api/keyboard.c b/src/lib/Controller/api/keyboard.c → src/Controller/api/keyboard.c
diff --git a/src/lib/Controller/api/keyboard_private.h → src/Controller/api/keyboard_private.h b/src/lib/Controller/api/keyboard_private.h → src/Controller/api/keyboard_private.h
diff --git a/src/lib/Controller/api/led.c → src/Controller/api/led.c b/src/lib/Controller/api/led.c → src/Controller/api/led.c
diff --git a/src/lib/Controller/api/lidar.c → src/Controller/api/lidar.c b/src/lib/Controller/api/lidar.c → src/Controller/api/lidar.c
diff --git a/src/lib/Controller/api/light_sensor.c → src/Controller/api/light_sensor.c b/src/lib/Controller/api/light_sensor.c → src/Controller/api/light_sensor.c
diff --git a/src/lib/Controller/api/messages.h → src/Controller/api/messages.h b/src/lib/Controller/api/messages.h → src/Controller/api/messages.h
diff --git a/src/lib/Controller/api/microphone.c → src/Controller/api/microphone.c b/src/lib/Controller/api/microphone.c → src/Controller/api/microphone.c
diff --git a/src/lib/Controller/api/motion.c → src/Controller/api/motion.c b/src/lib/Controller/api/motion.c → src/Controller/api/motion.c
diff --git a/src/lib/Controller/api/motion_private.h → src/Controller/api/motion_private.h b/src/lib/Controller/api/motion_private.h → src/Controller/api/motion_private.h
diff --git a/src/lib/Controller/api/motor.c → src/Controller/api/motor.c b/src/lib/Controller/api/motor.c → src/Controller/api/motor.c
diff --git a/src/lib/Controller/api/mouse.c → src/Controller/api/mouse.c b/src/lib/Controller/api/mouse.c → src/Controller/api/mouse.c
diff --git a/src/lib/Controller/api/mouse_private.h → src/Controller/api/mouse_private.h b/src/lib/Controller/api/mouse_private.h → src/Controller/api/mouse_private.h
diff --git a/src/lib/Controller/api/node.c → src/Controller/api/node.c b/src/lib/Controller/api/node.c → src/Controller/api/node.c
diff --git a/src/lib/Controller/api/pen.c → src/Controller/api/pen.c b/src/lib/Controller/api/pen.c → src/Controller/api/pen.c
diff --git a/src/lib/Controller/api/position_sensor.c → src/Controller/api/position_sensor.c b/src/lib/Controller/api/position_sensor.c → src/Controller/api/position_sensor.c
diff --git a/src/lib/Controller/api/radar.c → src/Controller/api/radar.c b/src/lib/Controller/api/radar.c → src/Controller/api/radar.c
diff --git a/src/lib/Controller/api/radio.c → src/Controller/api/radio.c b/src/lib/Controller/api/radio.c → src/Controller/api/radio.c
diff --git a/src/lib/Controller/api/range_finder.c → src/Controller/api/range_finder.c b/src/lib/Controller/api/range_finder.c → src/Controller/api/range_finder.c
diff --git a/src/lib/Controller/api/receiver.c → src/Controller/api/receiver.c b/src/lib/Controller/api/receiver.c → src/Controller/api/receiver.c
diff --git a/src/lib/Controller/api/remote_control.c → src/Controller/api/remote_control.c b/src/lib/Controller/api/remote_control.c → src/Controller/api/remote_control.c
diff --git a/...b/Controller/api/remote_control_private.h → src/Controller/api/remote_control_private.h b/...b/Controller/api/remote_control_private.h → src/Controller/api/remote_control_private.h
diff --git a/src/lib/Controller/api/request.c → src/Controller/api/request.c b/src/lib/Controller/api/request.c → src/Controller/api/request.c
diff --git a/src/lib/Controller/api/request.h → src/Controller/api/request.h b/src/lib/Controller/api/request.h → src/Controller/api/request.h
diff --git a/src/lib/Controller/api/robot.c → src/Controller/api/robot.c b/src/lib/Controller/api/robot.c → src/Controller/api/robot.c
diff --git a/src/lib/Controller/api/robot_private.h → src/Controller/api/robot_private.h b/src/lib/Controller/api/robot_private.h → src/Controller/api/robot_private.h
diff --git a/src/lib/Controller/api/robot_window.c → src/Controller/api/robot_window.c b/src/lib/Controller/api/robot_window.c → src/Controller/api/robot_window.c
diff --git a/...lib/Controller/api/robot_window_private.h → src/Controller/api/robot_window_private.h b/...lib/Controller/api/robot_window_private.h → src/Controller/api/robot_window_private.h
diff --git a/src/lib/Controller/api/scheduler.c → src/Controller/api/scheduler.c b/src/lib/Controller/api/scheduler.c → src/Controller/api/scheduler.c
diff --git a/src/lib/Controller/api/scheduler.h → src/Controller/api/scheduler.h b/src/lib/Controller/api/scheduler.h → src/Controller/api/scheduler.h
diff --git a/src/lib/Controller/api/skin.c → src/Controller/api/skin.c b/src/lib/Controller/api/skin.c → src/Controller/api/skin.c
diff --git a/src/lib/Controller/api/speaker.c → src/Controller/api/speaker.c b/src/lib/Controller/api/speaker.c → src/Controller/api/speaker.c
diff --git a/src/lib/Controller/api/supervisor.c → src/Controller/api/supervisor.c b/src/lib/Controller/api/supervisor.c → src/Controller/api/supervisor.c
diff --git a/src/lib/Controller/api/supervisor_private.h → src/Controller/api/supervisor_private.h b/src/lib/Controller/api/supervisor_private.h → src/Controller/api/supervisor_private.h
diff --git a/src/lib/Controller/api/system.c → src/Controller/api/system.c b/src/lib/Controller/api/system.c → src/Controller/api/system.c
diff --git a/src/lib/Controller/api/touch_sensor.c → src/Controller/api/touch_sensor.c b/src/lib/Controller/api/touch_sensor.c → src/Controller/api/touch_sensor.c
diff --git a/src/lib/Controller/util/README.TXT → src/Controller/util/README.TXT b/src/lib/Controller/util/README.TXT → src/Controller/util/README.TXT
diff --git a/src/lib/Controller/util/base64.c → src/Controller/util/base64.c b/src/lib/Controller/util/base64.c → src/Controller/util/base64.c
diff --git a/src/lib/Controller/util/base64.h → src/Controller/util/base64.h b/src/lib/Controller/util/base64.h → src/Controller/util/base64.h
diff --git a/src/lib/Controller/util/g_image.c → src/Controller/util/g_image.c b/src/lib/Controller/util/g_image.c → src/Controller/util/g_image.c
diff --git a/src/lib/Controller/util/g_image.h → src/Controller/util/g_image.h b/src/lib/Controller/util/g_image.h → src/Controller/util/g_image.h
diff --git a/src/lib/Controller/util/g_pipe.c → src/Controller/util/g_pipe.c b/src/lib/Controller/util/g_pipe.c → src/Controller/util/g_pipe.c
diff --git a/src/lib/Controller/util/g_pipe.h → src/Controller/util/g_pipe.h b/src/lib/Controller/util/g_pipe.h → src/Controller/util/g_pipe.h
diff --git a/tests/sources/test_clang_format.py b/tests/sources/test_clang_format.py
@@ -62,7 +62,7 @@ def test_sources_are_clang_format_compliant(self):
             'resources/wren/shaders',
             'tests',
             'include/wren',
-            'src/lib/Controller',
+            'src/Controller',
             'src/license/sign',
             'src/webots',
             'src/wren'

diff --git a/tests/sources/test_cppcheck.py b/tests/sources/test_cppcheck.py
@@ -96,7 +96,7 @@ def test_sources_with_cppcheck(self):
         sourceDirs = [
             'src/webots',
             'src/wren',
-            'src/lib/Controller',
+            'src/Controller',
             'resources/languages/cpp',
             'resources/projects'
         ]

diff --git a/tests/sources/test_license.py b/tests/sources/test_license.py
@@ -80,7 +80,7 @@ class TestLicense(unittest.TestCase):
     def setUp(self):
         """Get all the source files which require a license check."""
         directories = [
-            'src/lib/Controller',
+            'src/Controller',
             'src/webots',
             'src/wren',
             'projects',

diff --git a/tests/sources/test_matlab_functions.py b/tests/sources/test_matlab_functions.py
@@ -35,7 +35,7 @@ def setUp(self):
             'EXPORTS'
         ]
         self.functions = []
-        filename = os.environ['WEBOTS_HOME'] + '/src/lib/Controller/Controller.def'
+        filename = os.environ['WEBOTS_HOME'] + '/src/Controller/Controller.def'
         self.assertTrue(
             os.path.isfile(filename),
             msg='Missing "%s" file.' % filename