Permalink
Browse files

Remove Blockly plugin. (#733) (#817)

Starting with version 1.6, Thymio Blockly will be offered as a standalone browser-based package.
Therefore we remove it from Aseba.
  • Loading branch information...
cor3ntin authored and stephanemagnenat committed Feb 5, 2018
1 parent 400e550 commit 321be12c5f2ea01bc90af34364e50bf422e4c5b5
View
@@ -1,4 +1 @@
[submodule "blockly"]
path = clients/studio/plugins/ThymioBlockly/blockly
url = https://github.com/aseba-community/blockly.git
branch = aseba-1.6
View
@@ -78,7 +78,6 @@ find_package(Qt5Help)
find_package(Qt5Multimedia)
find_package(Qt5Concurrent)
find_package(Qt5Xml)
find_package(Qt5WebKitWidgets)
find_package(Qt5Svg)
find_package(Qt5X11Extras)
find_package(Qt5Test)
@@ -33,18 +33,13 @@ if (DNSSD_FOUND)
set(ADDITIONAL_LIBRARIES ${ADDITIONAL_LIBRARIES} ${ASEBA_ZEROCONFQT_LIBRARIES})
endif()
if (Qt5Widgets_FOUND AND Qt5Xml_FOUND AND Qt5Network_FOUND AND Qt5Concurrent_FOUND AND Qt5Svg_FOUND AND Qt5WebKitWidgets_FOUND)
if (Qt5Widgets_FOUND AND Qt5Xml_FOUND AND Qt5Network_FOUND AND Qt5Concurrent_FOUND AND Qt5Svg_FOUND)
# add a console for debug messages under Windows
if (WIN32)
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-Wl,-subsystem,console ${CMAKE_EXE_LINKER_FLAGS}")
endif ()
if(UNIX AND NOT APPLE)
set(ASEBA_ENABLE_BLOCKLY_PLUGIN TRUE)
add_definitions(-DASEBA_ENABLE_BLOCKLY_PLUGIN)
endif(UNIX AND NOT APPLE)
if (QWT_LIBRARIES AND QWT_INCLUDE_DIR)
message(STATUS "Qwt found, enabling plotting in Studio")
include_directories (${QWT_INCLUDE_DIR})
@@ -142,7 +137,7 @@ if (Qt5Widgets_FOUND AND Qt5Xml_FOUND AND Qt5Network_FOUND AND Qt5Concurrent_FOU
endif ()
add_dependencies(asebastudio asebaqtplugins asebaqtcommon asebaqtabout asebacompiler )
target_link_libraries(asebastudio asebaqtplugins asebaqtcommon asebaqtabout asebacompiler ${ASEBA_CORE_LIBRARIES} ${ADDITIONAL_LIBRARIES} Qt5::Help Qt5::WebKitWidgets Qt5::Svg Qt5::Concurrent Qt5::Network Qt5::Xml Qt5::Widgets)
target_link_libraries(asebastudio asebaqtplugins asebaqtcommon asebaqtabout asebacompiler ${ASEBA_CORE_LIBRARIES} ${ADDITIONAL_LIBRARIES} Qt5::Help Qt5::Svg Qt5::Concurrent Qt5::Network Qt5::Xml Qt5::Widgets)
install(TARGETS asebastudio RUNTIME DESTINATION bin LIBRARY DESTINATION bin)
endif ()
@@ -33,9 +33,6 @@
#include "plugins/StopThymioPlugin.h"
#include "plugins/ThymioVPL/ThymioVisualProgramming.h"
#ifdef ASEBA_ENABLE_BLOCKLY_PLUGIN
#include "plugins/ThymioBlockly/ThymioBlockly.h"
#endif
namespace Aseba
{
/** \addtogroup studio */
@@ -107,9 +104,6 @@ namespace Aseba
linearCameraPids << ASEBA_PID_CHALLENGE << ASEBA_PID_PLAYGROUND_EPUCK << ASEBA_PID_EPUCK << ASEBA_PID_SMARTROB;
reg("LinearCameraViewPlugin", linearCameraPids, &createInstance<LinearCameraViewPlugin>);
reg("ThymioVisualProgramming", ASEBA_PID_THYMIO2, &createInstance<ThymioVPL::ThymioVisualProgramming>);
#ifdef ASEBA_ENABLE_BLOCKLY_PLUGIN
reg("ThymioBlockly", ASEBA_PID_THYMIO2, &createInstance<ThymioBlockly::ThymioBlockly>);
#endif
reg("StopThymioPlugin", ASEBA_PID_THYMIO2, &createInstance<StopThymioPlugin>);
}
@@ -108,44 +108,9 @@
<file>images/icons/vpl-advanced_on.svgz</file>
<file>images/icons/asebastudio.svgz</file>
<file>images/icons/thymiovpl.svgz</file>
<file>images/icons/thymioblockly.svgz</file>
<file>images/vpl/success.svgz</file>
<file>images/vpl/missing_block.svgz</file>
<file>images/vpl/error.svgz</file>
<file>images/vpl/blink.svg</file>
<file>plugins/ThymioBlockly/blockly/tests/asebastudio.html</file>
<file>plugins/ThymioBlockly/blockly/tests/asebastudio.de.html</file>
<file>plugins/ThymioBlockly/blockly/tests/asebastudio.fr.html</file>
<file>plugins/ThymioBlockly/blockly/tests/asebastudio.es.html</file>
<file>plugins/ThymioBlockly/blockly/tests/asebastudio.it.html</file>
<file>plugins/ThymioBlockly/blockly/blockly_compressed.js</file>
<file>plugins/ThymioBlockly/blockly/blocks_compressed.js</file>
<file>plugins/ThymioBlockly/blockly/msg/js/en.js</file>
<file>plugins/ThymioBlockly/blockly/msg/js/de.js</file>
<file>plugins/ThymioBlockly/blockly/msg/js/fr.js</file>
<file>plugins/ThymioBlockly/blockly/msg/js/es.js</file>
<file>plugins/ThymioBlockly/blockly/msg/js/it.js</file>
<file>plugins/ThymioBlockly/blockly/aesl_compressed.js</file>
<file>plugins/ThymioBlockly/blockly/overrides_compressed.js</file>
<file>plugins/ThymioBlockly/blockly/media/1x1.gif</file>
<file>plugins/ThymioBlockly/blockly/media/anon.jpeg</file>
<file>plugins/ThymioBlockly/blockly/media/click.mp3</file>
<file>plugins/ThymioBlockly/blockly/media/click.ogg</file>
<file>plugins/ThymioBlockly/blockly/media/click.wav</file>
<file>plugins/ThymioBlockly/blockly/media/delete.mp3</file>
<file>plugins/ThymioBlockly/blockly/media/delete.ogg</file>
<file>plugins/ThymioBlockly/blockly/media/delete.wav</file>
<file>plugins/ThymioBlockly/blockly/media/disconnect.mp3</file>
<file>plugins/ThymioBlockly/blockly/media/disconnect.ogg</file>
<file>plugins/ThymioBlockly/blockly/media/disconnect.wav</file>
<file>plugins/ThymioBlockly/blockly/media/handclosed.cur</file>
<file>plugins/ThymioBlockly/blockly/media/handdelete.cur</file>
<file>plugins/ThymioBlockly/blockly/media/handopen.cur</file>
<file>plugins/ThymioBlockly/blockly/media/icons.svg</file>
<file>plugins/ThymioBlockly/blockly/media/progress.gif</file>
<file>plugins/ThymioBlockly/blockly/media/quote0.png</file>
<file>plugins/ThymioBlockly/blockly/media/quote1.png</file>
<file>plugins/ThymioBlockly/blockly/media/sprites.png</file>
<file>plugins/ThymioBlockly/blockly/media/sprites.svg</file>
</qresource>
</RCC>
@@ -32,11 +32,6 @@ qt5_wrap_cpp(qt_plugins_MOCS
ThymioVPL/LogSignalMapper.h
)
if(ASEBA_ENABLE_BLOCKLY_PLUGIN)
list(APPEND qt_plugins_SRCS ThymioBlockly/ThymioBlockly.cpp)
qt5_wrap_cpp(qt_plugins_MOCS ThymioBlockly/AsebaJavascriptInterface.h ThymioBlockly/ThymioBlockly.h)
endif(ASEBA_ENABLE_BLOCKLY_PLUGIN)
if (PROTOBUF_FOUND AND PROTOBUF_PROTOC_EXECUTABLE)
execute_process(COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --cpp_out=${CMAKE_CURRENT_BINARY_DIR}/ThymioVPL -I${CMAKE_CURRENT_SOURCE_DIR}/ThymioVPL ${CMAKE_CURRENT_SOURCE_DIR}/ThymioVPL/UsageProfile.proto)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/ThymioVPL)
@@ -45,7 +40,7 @@ endif (PROTOBUF_FOUND AND PROTOBUF_PROTOC_EXECUTABLE)
add_library(asebaqtplugins STATIC ${qt_plugins_SRCS} ${qt_plugins_MOCS})
qt5_use_modules(asebaqtplugins Widgets Xml Svg WebKitWidgets)
qt5_use_modules(asebaqtplugins Widgets Xml Svg)
if (Qt5X11Extras_FOUND)
qt5_use_modules(asebaqtplugins X11Extras)
endif ()

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 321be12

Please sign in to comment.