From 1a5ff545a27047d66e07bc49a54122a7f5de8bef Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 3 May 2019 21:51:30 -0300 Subject: [PATCH] project: Move a few classes to core/ --- po/POTFILES.in | 2 +- src/{ => core}/gcal-calendar.c | 0 src/{ => core}/gcal-calendar.h | 0 src/{ => core}/gcal-clock.c | 0 src/{ => core}/gcal-clock.h | 0 src/{ => core}/gcal-event.c | 0 src/{ => core}/gcal-event.h | 0 src/{ => core}/gcal-manager.c | 0 src/{ => core}/gcal-manager.h | 0 src/{ => core}/gcal-recurrence.c | 0 src/{ => core}/gcal-recurrence.h | 0 src/{ => core}/gcal-timer.c | 0 src/{ => core}/gcal-timer.h | 0 src/meson.build | 21 +++++++++++---------- tests/meson.build | 10 ++++++---- 15 files changed, 18 insertions(+), 15 deletions(-) rename src/{ => core}/gcal-calendar.c (100%) rename src/{ => core}/gcal-calendar.h (100%) rename src/{ => core}/gcal-clock.c (100%) rename src/{ => core}/gcal-clock.h (100%) rename src/{ => core}/gcal-event.c (100%) rename src/{ => core}/gcal-event.h (100%) rename src/{ => core}/gcal-manager.c (100%) rename src/{ => core}/gcal-manager.h (100%) rename src/{ => core}/gcal-recurrence.c (100%) rename src/{ => core}/gcal-recurrence.h (100%) rename src/{ => core}/gcal-timer.c (100%) rename src/{ => core}/gcal-timer.h (100%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 6b979913..972cc26b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -19,7 +19,6 @@ data/ui/year-view.ui src/gcal-application.c src/gcal-date-selector.c src/gcal-edit-dialog.c -src/gcal-event.c src/gcal-event-widget.c src/gcal-manager.c src/gcal-quick-add-popover.c @@ -27,6 +26,7 @@ src/gcal-source-dialog.c src/gcal-time-selector.c src/gcal-window.c src/main.c +src/core/gcal-event.c src/utils/gcal-utils.c src/views/gcal-month-view.c src/views/gcal-week-grid.c diff --git a/src/gcal-calendar.c b/src/core/gcal-calendar.c similarity index 100% rename from src/gcal-calendar.c rename to src/core/gcal-calendar.c diff --git a/src/gcal-calendar.h b/src/core/gcal-calendar.h similarity index 100% rename from src/gcal-calendar.h rename to src/core/gcal-calendar.h diff --git a/src/gcal-clock.c b/src/core/gcal-clock.c similarity index 100% rename from src/gcal-clock.c rename to src/core/gcal-clock.c diff --git a/src/gcal-clock.h b/src/core/gcal-clock.h similarity index 100% rename from src/gcal-clock.h rename to src/core/gcal-clock.h diff --git a/src/gcal-event.c b/src/core/gcal-event.c similarity index 100% rename from src/gcal-event.c rename to src/core/gcal-event.c diff --git a/src/gcal-event.h b/src/core/gcal-event.h similarity index 100% rename from src/gcal-event.h rename to src/core/gcal-event.h diff --git a/src/gcal-manager.c b/src/core/gcal-manager.c similarity index 100% rename from src/gcal-manager.c rename to src/core/gcal-manager.c diff --git a/src/gcal-manager.h b/src/core/gcal-manager.h similarity index 100% rename from src/gcal-manager.h rename to src/core/gcal-manager.h diff --git a/src/gcal-recurrence.c b/src/core/gcal-recurrence.c similarity index 100% rename from src/gcal-recurrence.c rename to src/core/gcal-recurrence.c diff --git a/src/gcal-recurrence.h b/src/core/gcal-recurrence.h similarity index 100% rename from src/gcal-recurrence.h rename to src/core/gcal-recurrence.h diff --git a/src/gcal-timer.c b/src/core/gcal-timer.c similarity index 100% rename from src/gcal-timer.c rename to src/core/gcal-timer.c diff --git a/src/gcal-timer.h b/src/core/gcal-timer.h similarity index 100% rename from src/gcal-timer.h rename to src/core/gcal-timer.h diff --git a/src/meson.build b/src/meson.build index bf3f2ce8..16e8b332 100644 --- a/src/meson.build +++ b/src/meson.build @@ -20,6 +20,12 @@ gcal_deps = [ ] sources = files( + 'core/gcal-calendar.c', + 'core/gcal-clock.c', + 'core/gcal-event.c', + 'core/gcal-manager.c', + 'core/gcal-recurrence.c', + 'core/gcal-timer.c', 'search/gcal-search-button.c', 'search/gcal-search-engine.c', 'search/gcal-search-hit.c', @@ -41,27 +47,21 @@ sources = files( 'weather/gcal-weather-service.c', 'weather/gcal-weather-settings.c', 'gcal-application.c', - 'gcal-clock.c', - 'gcal-calendar.c', 'gcal-context.c', 'gcal-date-chooser-day.c', 'gcal-date-chooser.c', 'gcal-date-selector.c', 'gcal-edit-dialog.c', 'gcal-event-widget.c', - 'gcal-event.c', 'gcal-log.c', - 'gcal-manager.c', 'gcal-multi-choice.c', 'gcal-night-light-monitor.c', 'gcal-quick-add-popover.c', - 'gcal-recurrence.c', 'gcal-shell-search-provider.c', 'gcal-source-dialog.c', 'gcal-time-selector.c', 'gcal-time-zone-monitor.c', 'gcal-window.c', - 'gcal-timer.c' ) enum_types = 'gcal-enum-types' @@ -111,15 +111,16 @@ sources += configure_file( # Include directories # ####################### -incs = [ +calendar_incs = [ top_inc, + include_directories('core'), include_directories('search'), include_directories('utils'), include_directories('views'), include_directories('weather'), ] -incs += contrib_incs +calendar_incs += contrib_incs ################### @@ -129,7 +130,7 @@ incs += contrib_incs libgcal = shared_library( 'gcal-private', sources: sources, - include_directories: incs, + include_directories: calendar_incs, dependencies: gcal_deps, install: false, ) @@ -147,7 +148,7 @@ libgcal_dep = declare_dependency( executable( meson.project_name(), sources + files('main.c'), - include_directories: incs, + include_directories: calendar_incs, dependencies: gcal_deps, install: true, install_dir: calendar_bindir diff --git a/tests/meson.build b/tests/meson.build index bea60760..32bec10a 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -19,8 +19,9 @@ test_cflags = '-DTEST_DATA_DIR="@0@"'.format(join_paths(meson.source_root(), 'da test_event = executable( 'test-event', ['test-event.c', compiled_schemas], - c_args: test_cflags, - dependencies: test_deps + c_args: test_cflags, + dependencies: test_deps, + include_directories: calendar_incs, ) test('test-event', test_event, env: test_env) @@ -33,8 +34,9 @@ test('test-event', test_event, env: test_env) test_manager = executable( 'test-manager', ['test-manager.c', compiled_schemas], - c_args: test_cflags, - dependencies: test_deps + c_args: test_cflags, + dependencies: test_deps, + include_directories: calendar_incs, ) test('test-manager', test_manager, env: test_env)