git.iko.soy/unity8
on xenial help sign in
Cleanup ashes left from dash and scopes
4e758cbMarius Gripsgard
data/unity8-dash.confdeleted−26
compare with xenial
unifiedsplit
@@ -1,26 +0,0 @@
1−description "Unity Shell v8 Dash"
2−author "Michael Zanetti <michael.zanetti@canonical.com>"
3−
4−emits scope-ui-starting
5−
6−start on started unity8
7−stop on stopping unity8
8−
9−kill timeout 120
10−
11−# Focused app is 100 so we want to be less likely to get
12−# killed than the focused app but more than Unity8
13−
14−## FIXME
15−#oom score 50
16−
17−respawn
18−respawn limit unlimited
19−
20−env APP_ID=unity8-dash
21−
22−pre-start script
23− initctl emit scope-ui-starting
24−end script
25−
26−exec ${BINARY:-unity8-dash} $ARGS --desktop_file_hint=unity8-dash.desktop
plugins/Dash/CMakeLists.txtdeleted−47
@@ -1,47 +0,0 @@
1−# There's no cmake var for v8 include path :-/
2−# so create one
3−LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
4−if(${Qt5Core_VERSION_STRING} VERSION_LESS "5.1.0")
5− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/../QtV8/${Qt5Core_VERSION_STRING}/QtV8)
6−else()
7− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
8−endif()
9−
10−include_directories(
11− ${CMAKE_CURRENT_SOURCE_DIR}
12− ${CMAKE_CURRENT_BINARY_DIR}
13−)
14−
15−include_directories(
16− SYSTEM
17− ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
18− ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
19− ${Qt5V8_PRIVATE_INCLUDE_DIR}
20−)
21−
22−remove_definitions(-DQT_NO_KEYWORDS)
23−
24−set(QMLPLUGIN_SRC
25− plugin.cpp
26− listviewwithpageheader.cpp
27− abstractdashview.cpp
28− verticaljournal.cpp
29− horizontaljournal.cpp
30− organicgrid.cpp
31− )
32−
33−add_library(Dash-qml MODULE
34− ${QMLPLUGIN_SRC}
35− )
36−
37−target_link_libraries(Dash-qml
38− ${Qt5Gui_LIBRARIES}
39− ${Qt5Quick_LIBRARIES}
40− )
41−
42−qt5_use_modules(Dash-qml Qml Quick Concurrent)
43−
44−add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)
45−
46−install(FILES graphics/music_progress_bg.png DESTINATION ${SHELL_INSTALL_QML}/Dash/graphics/)
47−file(COPY graphics/music_progress_bg.png DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/graphics/)
plugins/Unity/DashCommunicator/CMakeLists.txtdeleted−26
@@ -1,26 +0,0 @@
1−include_directories(
2− ${CMAKE_CURRENT_SOURCE_DIR}
3− ${CMAKE_CURRENT_BINARY_DIR}
4− ${libunity8-private_SOURCE_DIR}
5−)
6−
7−set(QMLDASHCOMMUNICATORPLUGIN_SRC
8− plugin.cpp
9− dbusdashcommunicatorservice.cpp
10− dashcommunicatorservice.cpp
11− dashcommunicator.cpp
12− dashconnection.cpp
13−)
14−
15−add_library(DashCommunicator-qml MODULE
16− ${QMLDASHCOMMUNICATORPLUGIN_SRC}
17−)
18−
19−qt5_use_modules(DashCommunicator-qml DBus Qml)
20−
21−target_link_libraries(DashCommunicator-qml
22− unity8-private
23−)
24−
25−# export the qmldir and qmltypes files
26−add_unity8_plugin(Unity.DashCommunicator 0.1 Unity/DashCommunicator TARGETS DashCommunicator-qml)
src/Dash/CMakeLists.txtdeleted−29
@@ -1,29 +0,0 @@
1−set(DASH_SRCS
2− main.cpp
3− ../CachingNetworkManagerFactory.cpp
4− ../UnixSignalHandler.cpp
5−)
6−
7−if (ENABLE_TOUCH_EMULATION)
8− set(DASH_SRCS ${DASH_SRCS} ../MouseTouchAdaptor.cpp)
9−endif()
10−
11−add_executable(unity8-dash ${DASH_SRCS})
12−
13−qt5_use_modules(unity8-dash DBus Gui Qml Quick Test)
14−
15−# For it to find libUbuntuGestures.so, needed by Ubuntu.Gestures QML module.
16−set_target_properties(unity8-dash PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")
17−
18−target_link_libraries(unity8-dash UbuntuGestures connectivity-qt1)
19−
20−if (ENABLE_TOUCH_EMULATION)
21− target_link_libraries(unity8-dash ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
22−endif()
23−
24−set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
25−
26−# install binaries
27−install(TARGETS ${DASH_APP}
28− RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
29−)
tests/mocks/Unity/DashCommunicator/CMakeLists.txtdeleted−18
@@ -1,18 +0,0 @@
1−include_directories(
2− ${CMAKE_CURRENT_SOURCE_DIR}
3−)
4−
5−set(QMLDASHCOMMUNICATORPLUGIN_SRC
6− plugin.cpp
7− dashcommunicatorservice.cpp
8− dashcommunicator.cpp
9− )
10−
11−add_library(MockDashCommunicator-qml MODULE
12− ${QMLDASHCOMMUNICATORPLUGIN_SRC}
13− )
14−
15−qt5_use_modules(MockDashCommunicator-qml DBus Qml)
16−
17−# export the qmldir and qmltypes files
18−add_unity8_mock(Unity.DashCommunicator 0.1 Unity/DashCommunicator TARGETS MockDashCommunicator-qml)
tests/plugins/Dash/CMakeLists.txtdeleted−104
@@ -1,104 +0,0 @@
1−# add_qml_test macro
2−include(QmlTest)
3−
4−# There's no cmake var for v8 include path :-/
5−# so create one
6−LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
7−if(${Qt5Core_VERSION_STRING} VERSION_LESS "5.1.0")
8− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/../QtV8/${Qt5Core_VERSION_STRING}/QtV8)
9−else()
10− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
11−endif()
12−
13−
14−include_directories(
15− SYSTEM
16− ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
17− ${Qt5Quick_INCLUDE_DIRS}
18− ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
19− ${Qt5V8_PRIVATE_INCLUDE_DIR}
20− )
21−
22−include_directories(
23− ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash
24− ${CMAKE_CURRENT_BINARY_DIR}
25− )
26−
27−remove_definitions(-DQT_NO_KEYWORDS)
28−
29−add_definitions(-DTEST_DIR="plugins/Dash")
30−
31−macro(add_lvwph_test FILENAME TESTNAME)
32− add_executable(${TESTNAME}TestExec
33− ${FILENAME}test.cpp
34− ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/listviewwithpageheader.cpp)
35− qt5_use_modules(${TESTNAME}TestExec Test Core Qml)
36− target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
37− install(TARGETS ${TESTNAME}TestExec
38− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
39− )
40−
41− add_unity8_uitest(${TESTNAME} ${TESTNAME}TestExec DEPENDS Dash-qml)
42−endmacro()
43−
44−add_lvwph_test(listviewwithpageheader ListViewWithPageHeader)
45−add_lvwph_test(listviewwithpageheadersection ListViewWithPageHeaderSection)
46−add_lvwph_test(listviewwithpageheadersectionexternalmodel ListViewWithPageHeaderSectionExternalModel)
47−
48−macro(add_dashview_try_test FILENAME TESTNAME)
49− add_executable(${TESTNAME}TestExec
50− ${FILENAME}test.cpp
51− ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/${FILENAME}.cpp
52− ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/abstractdashview.cpp
53− )
54− qt5_use_modules(${TESTNAME}TestExec Test Core Qml)
55− target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
56− install(TARGETS ${TESTNAME}TestExec
57− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
58− )
59−
60− add_unity8_uitest(${TESTNAME} ${TESTNAME}TestExec DEPENDS Dash-qml)
61−
62− add_executable(${TESTNAME}TryExec
63− ${FILENAME}try.cpp
64− ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/${FILENAME}.cpp
65− ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/abstractdashview.cpp
66− )
67− qt5_use_modules(${TESTNAME}TryExec Test Core Qml)
68− target_link_libraries(${TESTNAME}TryExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
69− install(TARGETS ${TESTNAME}TryExec
70− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
71− )
72− add_manual_test(${TESTNAME} ${TESTNAME}TryExec DEPENDS Dash-qml)
73−endmacro()
74−
75−add_dashview_try_test(verticaljournal VerticalJournal)
76−add_dashview_try_test(horizontaljournal HorizontalJournal)
77−add_dashview_try_test(organicgrid OrganicGrid)
78−
79−# Install data files needed for tests
80−file(GLOB qml_files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.qml)
81−foreach(qml_file ${qml_files})
82− add_qml_test_data(. "${qml_file}")
83−endforeach()
84−
85−# CardCreator test
86−add_executable(CardCreatorTestExec cardcreatortest.cpp)
87−qt5_use_modules(CardCreatorTestExec Test Core Qml)
88−target_link_libraries(CardCreatorTestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
89−install(TARGETS CardCreatorTestExec
90− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
91−)
92−add_unity8_uitest(CardCreator CardCreatorTestExec DEPENDS Dash-qml)
93−add_qml_test_data(. cardcreator)
94−
95−# This one qml file imports a file in an arch-specific directory, so to make its
96−# import line relative, we install it into an arch-specific directory too.
97−add_qml_test_data(. cardcreatortest.qml
98− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
99−)
100−
101−# plain qml test
102−foreach(dash_test ScopeStyle ListViewWithPageHeaderQML CardAttributes CroppedImageMinimumSourceSize)
103− add_unity8_qmltest(. ${dash_test})
104−endforeach()
tools/scopetool/CMakeLists.txtdeleted−12
@@ -1,12 +0,0 @@
1−add_executable(${SCOPE_TOOL}
2− scopetool.cpp
3− registry-tracker.cpp
4− ../../src/UnixSignalHandler.cpp
5− )
6−
7−qt5_use_modules(${SCOPE_TOOL} Qml Quick)
8−
9−# install binaries
10−install(TARGETS ${SCOPE_TOOL}
11− RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
12− )