From 58f98c99f533440a6ad996c299d74642659c51f2 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Fri, 3 Jun 2016 16:45:21 +0300 Subject: [PATCH] Move weston source to compositor/ This is the start of separating weston-the-compositor source files from libweston source files. This is moving all the files related to the 'weston' binary. Also the CMS and systemd plugins are moved. xwayland plugin is not moved, because it will be turned into a libweston feature. To avoid breaking the build, #includes for weston.h are fixed to use compositor/weston.h. This serves as a reminder that such files may need further attention: moving to the right directory, or maybe using the proper -I flags instead. v2: Move also screen-share.c, and add a note about weston-launch. Signed-off-by: Pekka Paalanen Reviewed-by: Yong Bakos Acked-by: Daniel Stone Reviewed-by: Quentin Glidic Tested-by: Quentin Glidic Tested-by: Benoit Gschwind Acked-by: Benoit Gschwind [Pekka: rebased] --- Makefile.am | 28 +++++++++++----------- README | 7 +++++- {src => compositor}/cms-colord.c | 0 {src => compositor}/cms-helper.c | 0 {src => compositor}/cms-helper.h | 0 {src => compositor}/cms-static.c | 0 {src => compositor}/main.c | 0 {src => compositor}/screen-share.c | 0 {src => compositor}/systemd-notify.c | 0 {src => compositor}/text-backend.c | 0 {src => compositor}/weston-screenshooter.c | 0 {src => compositor}/weston.desktop | 0 {src => compositor}/weston.h | 0 {src => compositor}/weston.pc.in | 0 configure.ac | 2 +- desktop-shell/shell.c | 2 +- ivi-shell/hmi-controller.c | 2 +- ivi-shell/ivi-layout.c | 2 +- ivi-shell/ivi-shell.c | 2 +- tests/ivi_layout-test-plugin.c | 2 +- tests/weston-test.c | 2 +- xwayland/launcher.c | 2 +- xwayland/xwayland.h | 2 +- 23 files changed, 29 insertions(+), 24 deletions(-) rename {src => compositor}/cms-colord.c (100%) rename {src => compositor}/cms-helper.c (100%) rename {src => compositor}/cms-helper.h (100%) rename {src => compositor}/cms-static.c (100%) rename {src => compositor}/main.c (100%) rename {src => compositor}/screen-share.c (100%) rename {src => compositor}/systemd-notify.c (100%) rename {src => compositor}/text-backend.c (100%) rename {src => compositor}/weston-screenshooter.c (100%) rename {src => compositor}/weston.desktop (100%) rename {src => compositor}/weston.h (100%) rename {src => compositor}/weston.pc.in (100%) diff --git a/Makefile.am b/Makefile.am index 8466a5fb7..0d0334a74 100644 --- a/Makefile.am +++ b/Makefile.am @@ -113,7 +113,7 @@ systemd_notify_la_CFLAGS = \ $(PIXMAN_CFLAGS) \ $(AM_CFLAGS) systemd_notify_la_SOURCES = \ - src/systemd-notify.c \ + compositor/systemd-notify.c \ shared/helpers.h \ shared/zalloc.h \ src/compositor.h @@ -148,9 +148,9 @@ weston_LDADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \ -lm libshared.la libweston.la weston_SOURCES = \ - src/main.c \ - src/weston-screenshooter.c \ - src/text-backend.c + compositor/main.c \ + compositor/weston-screenshooter.c \ + compositor/text-backend.c # Track this dependency explicitly instead of using BUILT_SOURCES. We # add BUILT_SOURCES to CLEANFILES, but we want to keep git-version.h @@ -220,10 +220,10 @@ endif endif # BUILD_WESTON_LAUNCH pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = src/weston.pc src/libweston-${LIBWESTON_ABI_VERSION}.pc +pkgconfig_DATA = compositor/weston.pc src/libweston-${LIBWESTON_ABI_VERSION}.pc wayland_sessiondir = $(datadir)/wayland-sessions -dist_wayland_session_DATA = src/weston.desktop +dist_wayland_session_DATA = compositor/weston.desktop libwestonincludedir = $(includedir)/libweston-${LIBWESTON_ABI_VERSION} libwestoninclude_HEADERS = \ @@ -242,7 +242,7 @@ libwestoninclude_HEADERS = \ shared/platform.h westonincludedir = $(includedir)/weston -westoninclude_HEADERS = src/weston.h +westoninclude_HEADERS = compositor/weston.h if ENABLE_IVI_SHELL westoninclude_HEADERS += \ @@ -401,9 +401,9 @@ cms_static_la_LDFLAGS = -module -avoid-version cms_static_la_LIBADD = $(COMPOSITOR_LIBS) $(LCMS_LIBS) libshared.la cms_static_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LCMS_CFLAGS) cms_static_la_SOURCES = \ - src/cms-static.c \ - src/cms-helper.c \ - src/cms-helper.h \ + compositor/cms-static.c \ + compositor/cms-helper.c \ + compositor/cms-helper.h \ shared/helpers.h if ENABLE_COLORD module_LTLIBRARIES += cms-colord.la @@ -411,9 +411,9 @@ cms_colord_la_LDFLAGS = -module -avoid-version cms_colord_la_LIBADD = $(COMPOSITOR_LIBS) $(COLORD_LIBS) cms_colord_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(COLORD_CFLAGS) cms_colord_la_SOURCES = \ - src/cms-colord.c \ - src/cms-helper.c \ - src/cms-helper.h \ + compositor/cms-colord.c \ + compositor/cms-helper.c \ + compositor/cms-helper.h \ shared/helpers.h endif endif @@ -945,7 +945,7 @@ screen_share_la_CFLAGS = \ $(SCREEN_SHARE_CFLAGS) \ $(AM_CFLAGS) screen_share_la_SOURCES = \ - src/screen-share.c \ + compositor/screen-share.c \ shared/helpers.h nodist_screen_share_la_SOURCES = \ protocol/fullscreen-shell-unstable-v1-protocol.c \ diff --git a/README b/README index 110a14bb3..789755dcb 100644 --- a/README +++ b/README @@ -114,6 +114,11 @@ Details: - xwayland ??? +- weston-launch is still with libweston even though it can only launch + Weston and nothing else. We would like to allow it to launch any compositor, + but since it gives by design root access to input devices and DRM, how can + we restrict it to intended programs? + There are still many more details to be decided. @@ -141,13 +146,13 @@ would be roughly like this: - fbdev-backend (depends on libudev...) - rdp-backend (depends on freerdp) - + screen-share - weston (the executable, not parallel-installable): + desktop shell + ivi-shell + fullscreen shell + weston-info, weston-terminal, etc. we install by default + + screen-share - weston demos (not parallel-installable) + weston-simple-* programs diff --git a/src/cms-colord.c b/compositor/cms-colord.c similarity index 100% rename from src/cms-colord.c rename to compositor/cms-colord.c diff --git a/src/cms-helper.c b/compositor/cms-helper.c similarity index 100% rename from src/cms-helper.c rename to compositor/cms-helper.c diff --git a/src/cms-helper.h b/compositor/cms-helper.h similarity index 100% rename from src/cms-helper.h rename to compositor/cms-helper.h diff --git a/src/cms-static.c b/compositor/cms-static.c similarity index 100% rename from src/cms-static.c rename to compositor/cms-static.c diff --git a/src/main.c b/compositor/main.c similarity index 100% rename from src/main.c rename to compositor/main.c diff --git a/src/screen-share.c b/compositor/screen-share.c similarity index 100% rename from src/screen-share.c rename to compositor/screen-share.c diff --git a/src/systemd-notify.c b/compositor/systemd-notify.c similarity index 100% rename from src/systemd-notify.c rename to compositor/systemd-notify.c diff --git a/src/text-backend.c b/compositor/text-backend.c similarity index 100% rename from src/text-backend.c rename to compositor/text-backend.c diff --git a/src/weston-screenshooter.c b/compositor/weston-screenshooter.c similarity index 100% rename from src/weston-screenshooter.c rename to compositor/weston-screenshooter.c diff --git a/src/weston.desktop b/compositor/weston.desktop similarity index 100% rename from src/weston.desktop rename to compositor/weston.desktop diff --git a/src/weston.h b/compositor/weston.h similarity index 100% rename from src/weston.h rename to compositor/weston.h diff --git a/src/weston.pc.in b/compositor/weston.pc.in similarity index 100% rename from src/weston.pc.in rename to compositor/weston.pc.in diff --git a/configure.ac b/configure.ac index f2638fea8..41191f69c 100644 --- a/configure.ac +++ b/configure.ac @@ -633,7 +633,7 @@ if test "x$enable_systemd_notify" = "xyes"; then PKG_CHECK_MODULES(SYSTEMD_DAEMON, [libsystemd]) fi -AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) +AC_CONFIG_FILES([Makefile src/version.h compositor/weston.pc]) # AC_CONFIG_FILES needs the full name when running autoconf, so we need to use # libweston_abi_version here, and outside [] because of m4 quoting rules diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 79cf8dde2..2c881765a 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -36,7 +36,7 @@ #include #include "shell.h" -#include "weston.h" +#include "compositor/weston.h" #include "weston-desktop-shell-server-protocol.h" #include "shared/config-parser.h" #include "shared/helpers.h" diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c index 77278eebd..548d68f9c 100644 --- a/ivi-shell/hmi-controller.c +++ b/ivi-shell/hmi-controller.c @@ -62,7 +62,7 @@ #include "ivi-hmi-controller-server-protocol.h" #include "shared/helpers.h" #include "shared/xalloc.h" -#include "src/weston.h" +#include "compositor/weston.h" /***************************************************************************** * structure, globals diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index 9ce0ab0a1..4808172d2 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -60,7 +60,7 @@ #include #include -#include "weston.h" +#include "compositor/weston.h" #include "compositor.h" #include "ivi-shell.h" #include "ivi-layout-export.h" diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c index 6ecb32fae..8bf3e80a8 100644 --- a/ivi-shell/ivi-shell.c +++ b/ivi-shell/ivi-shell.c @@ -46,7 +46,7 @@ #include "ivi-layout-export.h" #include "ivi-layout-shell.h" #include "shared/helpers.h" -#include "weston.h" +#include "compositor/weston.h" /* Representation of ivi_surface protocol object. */ struct ivi_shell_surface diff --git a/tests/ivi_layout-test-plugin.c b/tests/ivi_layout-test-plugin.c index 362893e3c..4cae3c597 100644 --- a/tests/ivi_layout-test-plugin.c +++ b/tests/ivi_layout-test-plugin.c @@ -33,7 +33,7 @@ #include #include "src/compositor.h" -#include "src/weston.h" +#include "compositor/weston.h" #include "weston-test-server-protocol.h" #include "ivi-test.h" #include "ivi-shell/ivi-layout-export.h" diff --git a/tests/weston-test.c b/tests/weston-test.c index b9242c324..26b2ae09b 100644 --- a/tests/weston-test.c +++ b/tests/weston-test.c @@ -32,7 +32,7 @@ #include #include "src/compositor.h" -#include "src/weston.h" +#include "compositor/weston.h" #include "weston-test-server-protocol.h" #ifdef ENABLE_EGL diff --git a/xwayland/launcher.c b/xwayland/launcher.c index 4fd25537b..f77146af2 100644 --- a/xwayland/launcher.c +++ b/xwayland/launcher.c @@ -37,7 +37,7 @@ #include "xwayland.h" #include "shared/helpers.h" -#include "weston.h" +#include "compositor/weston.h" static int handle_sigusr1(int signal_number, void *data) diff --git a/xwayland/xwayland.h b/xwayland/xwayland.h index e09c6f969..5606d125e 100644 --- a/xwayland/xwayland.h +++ b/xwayland/xwayland.h @@ -30,7 +30,7 @@ #include #include "compositor.h" -#include "weston.h" +#include "compositor/weston.h" #define SEND_EVENT_MASK (0x80) #define EVENT_TYPE(event) ((event)->response_type & ~SEND_EVENT_MASK)