Commit 1497068a authored by Hanspeter Portner's avatar Hanspeter Portner

web_ui: deprecate.

parent e882cc73
Pipeline #5276839 (#) canceled with stages
in 0 seconds
......@@ -89,15 +89,15 @@ pages:
stage: deploy
script:
- mkdir -p public
- sed -e "s/@MOONY_VERSION@/$(cat VERSION)/g" web_ui/manual.html.in > public/index.html
- cp web_ui/style.css public/.
- cp web_ui/jquery*.js public/.
- cp web_ui/libreJS.html public/.
- cp web_ui/ace.js public/.
- cp web_ui/mode-lua.js public/.
- cp web_ui/theme-chaos.js public/.
- cp web_ui/Chango-Regular.ttf public/.
- cp web_ui/favicon.png public/.
- sed -e "s/@MOONY_VERSION@/$(cat VERSION)/g" manual/manual.html.in > public/index.html
- cp manual/style.css public/.
- cp manual/jquery*.js public/.
- cp manual/libreJS.html public/.
- cp manual/ace.js public/.
- cp manual/mode-lua.js public/.
- cp manual/theme-chaos.js public/.
- cp manual/Chango-Regular.ttf public/.
- cp manual/favicon.png public/.
artifacts:
paths:
- public/
......@@ -72,11 +72,9 @@ set(LIBS ${LIBS} ${LV2_LDFLAGS})
# options
include(CMakeDependentOption)
option(BUILD_SIMPLE_UI "Build simple external UI" OFF)
option(BUILD_WEB_UI "Build web-based external UI" ON)
option(BUILD_NK_UI "Build nuklear UI" ON)
option(BUILD_INLINE_DISPLAY "Build inline display" ON)
option(USE_MANUAL_GC "Use manual garbage collection" OFF)
option(USE_VERBOSE_LOG "Use verbose log for websocket" OFF)
if(BUILD_INLINE_DISPLAY)
add_definitions("-DBUILD_INLINE_DISPLAY")
......@@ -98,10 +96,6 @@ if(USE_MANUAL_GC)
add_definitions("-DUSE_MANUAL_GC")
endif()
if(USE_VERBOSE_LOG)
add_definitions("-DUSE_VERBOSE_LOG")
endif()
if(BUILD_SIMPLE_UI)
add_library(moony_simple MODULE
ui/moony_simple.c
......@@ -118,50 +112,8 @@ else()
set(SIMPLE_WRAP "#")
endif()
if(BUILD_WEB_UI)
set(LIBS_WEB ${LIBS_WEB} m)
pkg_search_module(LWS REQUIRED libwebsockets>=1.7.0)
include_directories(${LWS_INCLUDE_DIRS})
if(DEFINED STATIC_LWS)
set(LIBS_WEB ${STATIC_LWS} ${LIBS_WEB})
else()
set(LIBS_WEB ${LIBS_WEB} ${LWS_LDFLAGS})
endif()
configure_file(${PROJECT_SOURCE_DIR}/web_ui/index.html.in ${PROJECT_BINARY_DIR}/index.html)
configure_file(${PROJECT_SOURCE_DIR}/web_ui/manual.html.in ${PROJECT_BINARY_DIR}/manual.html)
add_library(moony_web MODULE
cJSON/cJSON.c
ui/moony_web.c
ui/web_ui.c)
target_link_libraries(moony_web ${LIBS_WEB})
set_target_properties(moony_web PROPERTIES POSITION_INDEPENDENT_CODE true) # -fPIC
set_target_properties(moony_web PROPERTIES INTERPROCEDURAL_OPTIMIZATION true) # -flto
set_target_properties(moony_web PROPERTIES PREFIX "")
if(NOT WIN32)
set_target_properties(moony_web PROPERTIES LINK_FLAGS "-Wl,-e,lv2ui_descriptor")
endif()
install(TARGETS moony_web DESTINATION ${PLUGIN_DEST})
install(FILES ${PROJECT_BINARY_DIR}/index.html DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_BINARY_DIR}/manual.html DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_SOURCE_DIR}/web_ui/libreJS.html DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_SOURCE_DIR}/web_ui/favicon.png DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_SOURCE_DIR}/web_ui/jquery-3.1.0.min.js DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_SOURCE_DIR}/web_ui/jquery.knob.js DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_SOURCE_DIR}/web_ui/jsonld.js DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_SOURCE_DIR}/web_ui/moony.js DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_SOURCE_DIR}/web_ui/style.css DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_SOURCE_DIR}/web_ui/Chango-Regular.ttf DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_SOURCE_DIR}/web_ui/ace.js DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_SOURCE_DIR}/web_ui/mode-lua.js DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_SOURCE_DIR}/web_ui/theme-chaos.js DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_SOURCE_DIR}/web_ui/keybinding-vim.js DESTINATION ${PLUGIN_DEST}/web_ui)
install(FILES ${PROJECT_SOURCE_DIR}/web_ui/keybinding-emacs.js DESTINATION ${PLUGIN_DEST}/web_ui)
else()
set(WEB_WRAP "#")
endif()
# manual
configure_file(${PROJECT_SOURCE_DIR}/manual/manual.html.in ${PROJECT_BINARY_DIR}/manual.html)
if(BUILD_NK_UI)
set(LIBS_NK ${LIBS_NK} m)
......@@ -351,10 +303,10 @@ if(${BUILD_TESTING})
COMMAND ${XSLTPROC} ARGS
"--html"
"--output" ${PROJECT_BINARY_DIR}/moony_manual.lua
${PROJECT_SOURCE_DIR}/web_ui/manual.xslt
${PROJECT_SOURCE_DIR}/manual/manual.xslt
${PROJECT_BINARY_DIR}/manual.html
DEPENDS
${PROJECT_SOURCE_DIR}/web_ui/manual.xslt
${PROJECT_SOURCE_DIR}/manual/manual.xslt
${PROJECT_BINARY_DIR}/manual.html)
add_custom_target(MOONY_MANUAL_TEST ALL DEPENDS ${PROJECT_BINARY_DIR}/moony_manual.lua)
......
0.19.3077
0.19.3079
......@@ -17,10 +17,4 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(STATIC_LWS "/opt/${TOOLCHAIN}/lib/libwebsockets.a")
set(STATIC_SERD "/opt/${TOOLCHAIN}/lib/libserd-0.a")
set(STATIC_SORD "/opt/${TOOLCHAIN}/lib/libsord-0.a")
set(STATIC_CAIRO "/opt/${TOOLCHAIN}/lib/libcairo.a")
set(STATIC_PIXMAN "/opt/${TOOLCHAIN}/lib/libpixman-1.a")
set(QEMU qemu-arm)
......@@ -5,9 +5,3 @@ set(TOOLCHAIN "i686-linux-gnu")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "c++ flags")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32" CACHE STRING "c flags")
set(STATIC_LWS "/opt/${TOOLCHAIN}/lib/libwebsockets.a")
set(STATIC_SERD "/opt/${TOOLCHAIN}/lib/libserd-0.a")
set(STATIC_SORD "/opt/${TOOLCHAIN}/lib/libsord-0.a")
set(STATIC_CAIRO "/opt/${TOOLCHAIN}/lib/libcairo.a")
set(STATIC_PIXMAN "/opt/${TOOLCHAIN}/lib/libpixman-1.a")
......@@ -18,13 +18,6 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(STATIC_LWS "/opt/${TOOLCHAIN}/lib/libwebsockets_static.a")
set(STATIC_SERD "/opt/${TOOLCHAIN}/lib/libserd-0.a")
set(STATIC_SORD "/opt/${TOOLCHAIN}/lib/libsord-0.a")
set(STATIC_CAIRO "/opt/${TOOLCHAIN}/lib/libcairo.a")
set(STATIC_PIXMAN "/opt/${TOOLCHAIN}/lib/libpixman-1.a")
set(LIBS ${LIBS} "-static-libgcc -lws2_32")
set(LIBS_WEB ${LIBS_WEB} "-static-libgcc -lws2_32")
set(WINE wine32)
......@@ -18,9 +18,3 @@ set(CMAKE_FIND_ROOT_PATH "/usr/${TOOLCHAIN}")
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(STATIC_LWS "/opt/${TOOLCHAIN}/lib/libwebsockets.a")
set(STATIC_SERD "/opt/${TOOLCHAIN}/lib/libserd-0.a")
set(STATIC_SORD "/opt/${TOOLCHAIN}/lib/libsord-0.a")
set(STATIC_CAIRO "/opt/${TOOLCHAIN}/lib/libcairo.a")
set(STATIC_PIXMAN "/opt/${TOOLCHAIN}/lib/libpixman-1.a")
......@@ -2,9 +2,3 @@
set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
set(TOOLCHAIN "x86_64-linux-gnu")
set(STATIC_LWS "/opt/${TOOLCHAIN}/lib/libwebsockets.a")
set(STATIC_SERD "/opt/${TOOLCHAIN}/lib/libserd-0.a")
set(STATIC_SORD "/opt/${TOOLCHAIN}/lib/libsord-0.a")
set(STATIC_CAIRO "/opt/${TOOLCHAIN}/lib/libcairo.a")
set(STATIC_PIXMAN "/opt/${TOOLCHAIN}/lib/libpixman-1.a")
......@@ -18,13 +18,6 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(STATIC_LWS "/opt/${TOOLCHAIN}/lib/libwebsockets_static.a")
set(STATIC_SERD "/opt/${TOOLCHAIN}/lib/libserd-0.a")
set(STATIC_SORD "/opt/${TOOLCHAIN}/lib/libsord-0.a")
set(STATIC_CAIRO "/opt/${TOOLCHAIN}/lib/libcairo.a")
set(STATIC_PIXMAN "/opt/${TOOLCHAIN}/lib/libpixman-1.a")
set(LIBS ${LIBS} "-static-libgcc -lws2_32")
set(LIBS_WEB ${LIBS_WEB} "-static-libgcc -lws2_32")
set(WINE wine64)
......@@ -88,9 +88,6 @@
#define MOONY_SIMPLE_UI_URI MOONY_URI"#ui_2_simple_1_ui"
#define MOONY_SIMPLE_KX_URI MOONY_URI"#ui_2_simple_2_kx"
#define MOONY_WEB_UI_URI MOONY_URI"#ui_1_web_1_ui"
#define MOONY_WEB_KX_URI MOONY_URI"#ui_1_web_2_kx"
#define MOONY_NK_URI MOONY_URI"#ui_3_nk"
#define MOONY_C1XC1_URI MOONY_URI"#c1xc1"
......
......@@ -35,8 +35,6 @@ moony:c1xc1
lv2:minorVersion @MOONY_MINOR_VERSION@ ;
lv2:microVersion @MOONY_MICRO_VERSION@ ;
lv2:binary <moony@CMAKE_SHARED_MODULE_SUFFIX@> ;
@WEB_WRAP@ui:ui moony:ui_1_web_1_ui ;
@WEB_WRAP@ui:ui moony:ui_1_web_2_kx ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_1_ui ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_2_kx ;
@NK_WRAP@ui:ui moony:ui_3_nk ;
......@@ -47,8 +45,6 @@ moony:c2xc2
lv2:minorVersion @MOONY_MINOR_VERSION@ ;
lv2:microVersion @MOONY_MICRO_VERSION@ ;
lv2:binary <moony@CMAKE_SHARED_MODULE_SUFFIX@> ;
@WEB_WRAP@ui:ui moony:ui_1_web_1_ui ;
@WEB_WRAP@ui:ui moony:ui_1_web_2_kx ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_1_ui ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_2_kx ;
@NK_WRAP@ui:ui moony:ui_3_nk ;
......@@ -59,8 +55,6 @@ moony:c4xc4
lv2:minorVersion @MOONY_MINOR_VERSION@ ;
lv2:microVersion @MOONY_MICRO_VERSION@ ;
lv2:binary <moony@CMAKE_SHARED_MODULE_SUFFIX@> ;
@WEB_WRAP@ui:ui moony:ui_1_web_1_ui ;
@WEB_WRAP@ui:ui moony:ui_1_web_2_kx ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_1_ui ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_2_kx ;
@NK_WRAP@ui:ui moony:ui_3_nk ;
......@@ -72,8 +66,6 @@ moony:a1xa1
lv2:minorVersion @MOONY_MINOR_VERSION@ ;
lv2:microVersion @MOONY_MICRO_VERSION@ ;
lv2:binary <moony@CMAKE_SHARED_MODULE_SUFFIX@> ;
@WEB_WRAP@ui:ui moony:ui_1_web_1_ui ;
@WEB_WRAP@ui:ui moony:ui_1_web_2_kx ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_1_ui ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_2_kx ;
@NK_WRAP@ui:ui moony:ui_3_nk ;
......@@ -84,8 +76,6 @@ moony:a2xa2
lv2:minorVersion @MOONY_MINOR_VERSION@ ;
lv2:microVersion @MOONY_MICRO_VERSION@ ;
lv2:binary <moony@CMAKE_SHARED_MODULE_SUFFIX@> ;
@WEB_WRAP@ui:ui moony:ui_1_web_1_ui ;
@WEB_WRAP@ui:ui moony:ui_1_web_2_kx ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_1_ui ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_2_kx ;
@NK_WRAP@ui:ui moony:ui_3_nk ;
......@@ -96,8 +86,6 @@ moony:a4xa4
lv2:minorVersion @MOONY_MINOR_VERSION@ ;
lv2:microVersion @MOONY_MICRO_VERSION@ ;
lv2:binary <moony@CMAKE_SHARED_MODULE_SUFFIX@> ;
@WEB_WRAP@ui:ui moony:ui_1_web_1_ui ;
@WEB_WRAP@ui:ui moony:ui_1_web_2_kx ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_1_ui ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_2_kx ;
@NK_WRAP@ui:ui moony:ui_3_nk ;
......@@ -109,8 +97,6 @@ moony:c1a1xc1a1
lv2:minorVersion @MOONY_MINOR_VERSION@ ;
lv2:microVersion @MOONY_MICRO_VERSION@ ;
lv2:binary <moony@CMAKE_SHARED_MODULE_SUFFIX@> ;
@WEB_WRAP@ui:ui moony:ui_1_web_1_ui ;
@WEB_WRAP@ui:ui moony:ui_1_web_2_kx ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_1_ui ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_2_kx ;
@NK_WRAP@ui:ui moony:ui_3_nk ;
......@@ -121,8 +107,6 @@ moony:c2a1xc2a1
lv2:minorVersion @MOONY_MINOR_VERSION@ ;
lv2:microVersion @MOONY_MICRO_VERSION@ ;
lv2:binary <moony@CMAKE_SHARED_MODULE_SUFFIX@> ;
@WEB_WRAP@ui:ui moony:ui_1_web_1_ui ;
@WEB_WRAP@ui:ui moony:ui_1_web_2_kx ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_1_ui ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_2_kx ;
@NK_WRAP@ui:ui moony:ui_3_nk ;
......@@ -133,8 +117,6 @@ moony:c4a1xc4a1
lv2:minorVersion @MOONY_MINOR_VERSION@ ;
lv2:microVersion @MOONY_MICRO_VERSION@ ;
lv2:binary <moony@CMAKE_SHARED_MODULE_SUFFIX@> ;
@WEB_WRAP@ui:ui moony:ui_1_web_1_ui ;
@WEB_WRAP@ui:ui moony:ui_1_web_2_kx ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_1_ui ;
@SIMPLE_WRAP@ui:ui moony:ui_2_simple_2_kx ;
@NK_WRAP@ui:ui moony:ui_3_nk ;
......
......@@ -22,93 +22,8 @@
@prefix moony: <http://open-music-kontrollers.ch/lv2/moony#> .
# Web UI
moony:ui_1_web_1_ui
a ui:UI ;
ui:portNotification [
ui:plugin moony:c1xc1 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:c2xc2 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:c4xc4 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:a1xa1 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:a2xa2 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:a4xa4 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:c1a1xc1a1 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:c2a1xc2a1 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:c4a1xc4a1 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] ;
lv2:requiredFeature ui:idleInterface, ui:portMap, urid:map, urid:unmap ;
lv2:extensionData ui:idleInterface, ui:showInterface .
moony:ui_1_web_2_kx
a kx:Widget ;
ui:portNotification [
ui:plugin moony:c1xc1 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:c2xc2 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:c4xc4 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:a1xa1 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:a2xa2 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:a4xa4 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:c1a1xc1a1 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:c2a1xc2a1 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] , [
ui:plugin moony:c4a1xc4a1 ;
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] ;
lv2:requiredFeature kx:Host, ui:portMap, urid:map, urid:unmap .
# Simple UI
moony:ui_2_simple_1_ui
a ui:UI ;
ui:portNotification [
ui:plugin moony:c1xc1 ;
lv2:symbol "notify" ;
......@@ -150,7 +65,6 @@ moony:ui_2_simple_1_ui
lv2:extensionData ui:idleInterface, ui:showInterface .
moony:ui_2_simple_2_kx
a kx:Widget ;
ui:portNotification [
ui:plugin moony:c1xc1 ;
lv2:symbol "notify" ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment