[gnome-break-timer/dylanmccall/meson-build: 25/25] Move vala sources to "src"

[Dylan McCall <dylanmccall src gnome org>]

commit b160ca87a0738631895b6eb13e4102f00518dfc7
Author: Dylan McCall <dylan dylanmccall com>
Date:   Sat Jan 19 15:59:43 2019 -0800

    Move vala sources to "src"
    
    This move is a precursor for merging the settings dialog into the helper
    application.

 meson.build                                        | 23 ++++------------------
 ...me.BreakTimer.json => org.gnome.BreakTimer.json | 12 -----------
 {common => src/common}/IBreakHelper.vala           |  0
 {common => src/common}/ISessionStatus.vala         |  0
 {common => src/common}/NaturalTime.vala            |  0
 {common => src/common}/meson.build                 |  0
 src/config.vapi                                    | 15 ++++++++++++++
 {helper => src/helper}/BreakManager.vala           |  0
 {helper => src/helper}/HelperApplication.vala      |  0
 {helper => src/helper}/SessionStatus.vala          |  0
 {helper => src/helper}/UIFragment.vala             |  0
 {helper => src/helper}/UIManager.vala              |  0
 .../helper}/activity-monitor/ActivityMonitor.vala  |  0
 .../MutterActivityMonitorBackend.vala              |  0
 .../helper}/activity-monitor/UserActivity.vala     |  0
 {helper => src/helper}/break/BreakController.vala  |  0
 {helper => src/helper}/break/BreakType.vala        |  0
 {helper => src/helper}/break/BreakView.vala        |  0
 .../helper}/break/TimerBreakController.vala        |  0
 {helper => src/helper}/break/TimerBreakType.vala   |  0
 {helper => src/helper}/break/TimerBreakView.vala   |  0
 {helper => src/helper}/main.vala                   |  0
 {helper => src/helper}/meson.build                 |  0
 .../helper}/microbreak/MicroBreakController.vala   |  0
 .../helper}/microbreak/MicroBreakType.vala         |  0
 .../helper}/microbreak/MicroBreakView.vala         |  0
 .../helper}/restbreak/RestBreakController.vala     |  0
 .../helper}/restbreak/RestBreakType.vala           |  0
 .../helper}/restbreak/RestBreakView.vala           |  0
 {helper => src/helper}/util/Countdown.vala         |  0
 {helper => src/helper}/util/PausableTimeout.vala   |  0
 .../helper}/util/SimpleFocusManager.vala           |  0
 {helper => src/helper}/util/StatefulTimer.vala     |  0
 {helper => src/helper}/util/Util.vala              |  0
 src/meson.build                                    | 18 +++++++++++++++++
 {settings => src/settings}/BreakManager.vala       |  0
 .../settings}/BreakSettingsDialog.vala             |  0
 {settings => src/settings}/BreakType.vala          |  0
 {settings => src/settings}/CircleCounter.vala      |  0
 {settings => src/settings}/MainWindow.vala         |  0
 {settings => src/settings}/MicroBreakType.vala     |  0
 {settings => src/settings}/OverlayArrow.vala       |  0
 {settings => src/settings}/RestBreakType.vala      |  0
 .../settings}/SettingsApplication.vala             |  0
 {settings => src/settings}/TimeChooser.vala        |  0
 {settings => src/settings}/TimerBreakType.vala     |  0
 {settings => src/settings}/main.vala               |  0
 {settings => src/settings}/meson.build             |  0
 48 files changed, 37 insertions(+), 31 deletions(-)
---
diff --git a/meson.build b/meson.build
index 9c96892..f5e7826 100644
--- a/meson.build
+++ b/meson.build
@@ -25,6 +25,7 @@ m_dep = cc.find_library('m', required : false)
 
 gettext_package = meson.project_name()
 po_dir = join_paths(meson.source_root(), 'po')
+src_dir = join_paths(meson.source_root(), 'src')
 
 prefix = get_option('prefix')
 bindir = join_paths(prefix, get_option('bindir'))
@@ -54,22 +55,8 @@ build_conf.set_quoted('HELPER_BUS_NAME', helper_bus_name)
 build_conf.set_quoted('HELPER_OBJECT_PATH', helper_object_path)
 build_conf.set_quoted('HELPER_BREAK_OBJECT_BASE_PATH', helper_break_object_base_path)
 
-add_project_arguments('-DGETTEXT_PACKAGE="' + gettext_package + '"', language: 'c')
-
-configure_file(
-    output: 'config.h',
-    configuration: build_conf
-)
-
-config_lib = valac.find_library(
-    'config',
-    dirs: meson.source_root()
-)
-
-config_lib_dep = declare_dependency(
-    dependencies: config_lib,
-    include_directories: include_directories('.')
-)
+add_project_arguments(['-DGETTEXT_PACKAGE="' + gettext_package + '"'], language: 'c')
+add_project_arguments(['--vapidir', src_dir], language: 'vala')
 
 run_script_conf = configuration_data()
 run_script_conf.set('BINDIR', bindir)
@@ -83,9 +70,7 @@ configure_file(
 )
 
 subdir('po')
-subdir('common')
 subdir('data')
-subdir('settings')
-subdir('helper')
+subdir('src')
 
 meson.add_install_script('build-aux/meson/postinstall.py')
\ No newline at end of file
diff --git a/flatpak/org.gnome.BreakTimer.json b/org.gnome.BreakTimer.json
similarity index 89%
rename from flatpak/org.gnome.BreakTimer.json
rename to org.gnome.BreakTimer.json
index caf844a..9dd3c33 100644
--- a/flatpak/org.gnome.BreakTimer.json
+++ b/org.gnome.BreakTimer.json
@@ -30,18 +30,6 @@
             "V" : "1"
         }
     },
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig",
-        "/share/pkgconfig",
-        "/share/aclocal",
-        "/man",
-        "/share/man",
-        "/share/gtk-doc",
-        "/share/vala",
-        "*.la",
-        "*.a"
-    ],
     "modules" : [
         {
             "name" : "libgee",
diff --git a/common/IBreakHelper.vala b/src/common/IBreakHelper.vala
similarity index 100%
rename from common/IBreakHelper.vala
rename to src/common/IBreakHelper.vala
diff --git a/common/ISessionStatus.vala b/src/common/ISessionStatus.vala
similarity index 100%
rename from common/ISessionStatus.vala
rename to src/common/ISessionStatus.vala
diff --git a/common/NaturalTime.vala b/src/common/NaturalTime.vala
similarity index 100%
rename from common/NaturalTime.vala
rename to src/common/NaturalTime.vala
diff --git a/common/meson.build b/src/common/meson.build
similarity index 100%
rename from common/meson.build
rename to src/common/meson.build
diff --git a/src/config.vapi b/src/config.vapi
new file mode 100644
index 0000000..4b9e749
--- /dev/null
+++ b/src/config.vapi
@@ -0,0 +1,15 @@
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
+namespace Config {
+    public const string GETTEXT_PACKAGE;
+    public const string LOCALE_DIR;
+    public const string PROJECT_NAME;
+    public const string PROJECT_VERSION;
+    public const string APPLICATION_ICON;
+    public const string APPLICATION_URL;
+    public const string HELPER_APPLICATION_ID;
+    public const string SETTINGS_APPLICATION_ID;
+    public const string HELPER_BUS_NAME;
+    public const string HELPER_OBJECT_PATH;
+    public const string HELPER_BREAK_OBJECT_BASE_PATH;
+}
+
diff --git a/helper/BreakManager.vala b/src/helper/BreakManager.vala
similarity index 100%
rename from helper/BreakManager.vala
rename to src/helper/BreakManager.vala
diff --git a/helper/HelperApplication.vala b/src/helper/HelperApplication.vala
similarity index 100%
rename from helper/HelperApplication.vala
rename to src/helper/HelperApplication.vala
diff --git a/helper/SessionStatus.vala b/src/helper/SessionStatus.vala
similarity index 100%
rename from helper/SessionStatus.vala
rename to src/helper/SessionStatus.vala
diff --git a/helper/UIFragment.vala b/src/helper/UIFragment.vala
similarity index 100%
rename from helper/UIFragment.vala
rename to src/helper/UIFragment.vala
diff --git a/helper/UIManager.vala b/src/helper/UIManager.vala
similarity index 100%
rename from helper/UIManager.vala
rename to src/helper/UIManager.vala
diff --git a/helper/activity-monitor/ActivityMonitor.vala b/src/helper/activity-monitor/ActivityMonitor.vala
similarity index 100%
rename from helper/activity-monitor/ActivityMonitor.vala
rename to src/helper/activity-monitor/ActivityMonitor.vala
diff --git a/helper/activity-monitor/MutterActivityMonitorBackend.vala 
b/src/helper/activity-monitor/MutterActivityMonitorBackend.vala
similarity index 100%
rename from helper/activity-monitor/MutterActivityMonitorBackend.vala
rename to src/helper/activity-monitor/MutterActivityMonitorBackend.vala
diff --git a/helper/activity-monitor/UserActivity.vala b/src/helper/activity-monitor/UserActivity.vala
similarity index 100%
rename from helper/activity-monitor/UserActivity.vala
rename to src/helper/activity-monitor/UserActivity.vala
diff --git a/helper/break/BreakController.vala b/src/helper/break/BreakController.vala
similarity index 100%
rename from helper/break/BreakController.vala
rename to src/helper/break/BreakController.vala
diff --git a/helper/break/BreakType.vala b/src/helper/break/BreakType.vala
similarity index 100%
rename from helper/break/BreakType.vala
rename to src/helper/break/BreakType.vala
diff --git a/helper/break/BreakView.vala b/src/helper/break/BreakView.vala
similarity index 100%
rename from helper/break/BreakView.vala
rename to src/helper/break/BreakView.vala
diff --git a/helper/break/TimerBreakController.vala b/src/helper/break/TimerBreakController.vala
similarity index 100%
rename from helper/break/TimerBreakController.vala
rename to src/helper/break/TimerBreakController.vala
diff --git a/helper/break/TimerBreakType.vala b/src/helper/break/TimerBreakType.vala
similarity index 100%
rename from helper/break/TimerBreakType.vala
rename to src/helper/break/TimerBreakType.vala
diff --git a/helper/break/TimerBreakView.vala b/src/helper/break/TimerBreakView.vala
similarity index 100%
rename from helper/break/TimerBreakView.vala
rename to src/helper/break/TimerBreakView.vala
diff --git a/helper/main.vala b/src/helper/main.vala
similarity index 100%
rename from helper/main.vala
rename to src/helper/main.vala
diff --git a/helper/meson.build b/src/helper/meson.build
similarity index 100%
rename from helper/meson.build
rename to src/helper/meson.build
diff --git a/helper/microbreak/MicroBreakController.vala b/src/helper/microbreak/MicroBreakController.vala
similarity index 100%
rename from helper/microbreak/MicroBreakController.vala
rename to src/helper/microbreak/MicroBreakController.vala
diff --git a/helper/microbreak/MicroBreakType.vala b/src/helper/microbreak/MicroBreakType.vala
similarity index 100%
rename from helper/microbreak/MicroBreakType.vala
rename to src/helper/microbreak/MicroBreakType.vala
diff --git a/helper/microbreak/MicroBreakView.vala b/src/helper/microbreak/MicroBreakView.vala
similarity index 100%
rename from helper/microbreak/MicroBreakView.vala
rename to src/helper/microbreak/MicroBreakView.vala
diff --git a/helper/restbreak/RestBreakController.vala b/src/helper/restbreak/RestBreakController.vala
similarity index 100%
rename from helper/restbreak/RestBreakController.vala
rename to src/helper/restbreak/RestBreakController.vala
diff --git a/helper/restbreak/RestBreakType.vala b/src/helper/restbreak/RestBreakType.vala
similarity index 100%
rename from helper/restbreak/RestBreakType.vala
rename to src/helper/restbreak/RestBreakType.vala
diff --git a/helper/restbreak/RestBreakView.vala b/src/helper/restbreak/RestBreakView.vala
similarity index 100%
rename from helper/restbreak/RestBreakView.vala
rename to src/helper/restbreak/RestBreakView.vala
diff --git a/helper/util/Countdown.vala b/src/helper/util/Countdown.vala
similarity index 100%
rename from helper/util/Countdown.vala
rename to src/helper/util/Countdown.vala
diff --git a/helper/util/PausableTimeout.vala b/src/helper/util/PausableTimeout.vala
similarity index 100%
rename from helper/util/PausableTimeout.vala
rename to src/helper/util/PausableTimeout.vala
diff --git a/helper/util/SimpleFocusManager.vala b/src/helper/util/SimpleFocusManager.vala
similarity index 100%
rename from helper/util/SimpleFocusManager.vala
rename to src/helper/util/SimpleFocusManager.vala
diff --git a/helper/util/StatefulTimer.vala b/src/helper/util/StatefulTimer.vala
similarity index 100%
rename from helper/util/StatefulTimer.vala
rename to src/helper/util/StatefulTimer.vala
diff --git a/helper/util/Util.vala b/src/helper/util/Util.vala
similarity index 100%
rename from helper/util/Util.vala
rename to src/helper/util/Util.vala
diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 0000000..03cdbd3
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,18 @@
+configure_file(
+    output: 'config.h',
+    configuration: build_conf
+)
+
+config_lib = valac.find_library(
+    'config',
+    dirs: meson.source_root()
+)
+
+config_lib_dep = declare_dependency(
+    dependencies: config_lib,
+    include_directories: include_directories('.')
+)
+
+subdir('common')
+subdir('settings')
+subdir('helper')
\ No newline at end of file
diff --git a/settings/BreakManager.vala b/src/settings/BreakManager.vala
similarity index 100%
rename from settings/BreakManager.vala
rename to src/settings/BreakManager.vala
diff --git a/settings/BreakSettingsDialog.vala b/src/settings/BreakSettingsDialog.vala
similarity index 100%
rename from settings/BreakSettingsDialog.vala
rename to src/settings/BreakSettingsDialog.vala
diff --git a/settings/BreakType.vala b/src/settings/BreakType.vala
similarity index 100%
rename from settings/BreakType.vala
rename to src/settings/BreakType.vala
diff --git a/settings/CircleCounter.vala b/src/settings/CircleCounter.vala
similarity index 100%
rename from settings/CircleCounter.vala
rename to src/settings/CircleCounter.vala
diff --git a/settings/MainWindow.vala b/src/settings/MainWindow.vala
similarity index 100%
rename from settings/MainWindow.vala
rename to src/settings/MainWindow.vala
diff --git a/settings/MicroBreakType.vala b/src/settings/MicroBreakType.vala
similarity index 100%
rename from settings/MicroBreakType.vala
rename to src/settings/MicroBreakType.vala
diff --git a/settings/OverlayArrow.vala b/src/settings/OverlayArrow.vala
similarity index 100%
rename from settings/OverlayArrow.vala
rename to src/settings/OverlayArrow.vala
diff --git a/settings/RestBreakType.vala b/src/settings/RestBreakType.vala
similarity index 100%
rename from settings/RestBreakType.vala
rename to src/settings/RestBreakType.vala
diff --git a/settings/SettingsApplication.vala b/src/settings/SettingsApplication.vala
similarity index 100%
rename from settings/SettingsApplication.vala
rename to src/settings/SettingsApplication.vala
diff --git a/settings/TimeChooser.vala b/src/settings/TimeChooser.vala
similarity index 100%
rename from settings/TimeChooser.vala
rename to src/settings/TimeChooser.vala
diff --git a/settings/TimerBreakType.vala b/src/settings/TimerBreakType.vala
similarity index 100%
rename from settings/TimerBreakType.vala
rename to src/settings/TimerBreakType.vala
diff --git a/settings/main.vala b/src/settings/main.vala
similarity index 100%
rename from settings/main.vala
rename to src/settings/main.vala
diff --git a/settings/meson.build b/src/settings/meson.build
similarity index 100%
rename from settings/meson.build
rename to src/settings/meson.build