Feature/refactor 2019 10

.ci/docker/Dockerfile-post

@@ -1,21 +1,19 @@
-FROM dactl-debian
+FROM dactl-debian:latest
 
-RUN apt install --no-install-recommends -qq -y libcomedi-dev
-RUN updatedb
+RUN apt install --no-install-recommends -qq -y \
+        libcomedi-dev
 
 RUN useradd -ms /bin/bash user
 
 USER user
 WORKDIR /home/user
 
 COPY --chown=user:user . dactl
-
-RUN tar -zcvf libdactl_1.0.orig.tar.gz ./dactl
-
 WORKDIR /home/user/dactl
-
+RUN meson -Dprefix=/usr _build \
+    && ninja -C _build
+RUN tar -zcvf ../libdactl_1.0.orig.tar.gz ./
 RUN export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/
-
 RUN debuild
 
 WORKDIR /home/user

.dockerignore

@@ -0,0 +1 @@
+_build/

.gitignore

@@ -3,22 +3,16 @@
 \#*.*\#
 
 _build/
-debian/dactl-1.0-0.debhelper.log
-debian/dactl-1.0-dev.debhelper.log
-debian/gir1.2-dactl-1.0.debhelper.log
+
+# ignore unwanted packaging files
 obj-x86_64-linux-gnu/
+debian/dactl/
+debian/files
+debian/tmp/
 debian/.debhelper/
+debian/**/*.log
+debian/**/*.substvars
 debian/debhelper-build-stamp
-debian/tmp/
-debian/files
-debian/gir1.2-dactl-1.0.substvars
 debian/gir1.2-dactl-1.0/
-debian/libdactl-1.0-0.debhelper.log
-debian/libdactl-1.0-0.substvars
 debian/libdactl-1.0-0/
-debian/libdactl-1.0-dev.debhelper.log
-debian/libdactl-1.0-dev.substvars
 debian/libdactl-1.0-dev/
-debian/dactl.debhelper.log
-debian/dactl.substvars
-debian/dactl/

doc/reference/meson.build

@@ -7,29 +7,108 @@ if valadoc.found()
     '--directory', '@OUTPUT@',
     '--vapidir', join_paths(meson.source_root(), 'vapi'),
     '--vapidir', join_paths(meson.source_root(), 'src', 'config'),
-    '--pkg', 'dactl-config',
     '--pkg', 'cld-1.0',
+    '--pkg', 'comedilib',
+    '--pkg', 'dactl-config',
     '--pkg', 'gio-2.0',
     '--pkg', 'gee-0.8',
     '--pkg', 'gmodule-2.0',
     '--pkg', 'libpeas-1.0',
     '--pkg', 'libxml-2.0',
-    '--pkg', 'comedilib',
     '--pkg', 'linux',
     '--pkg', 'posix'
  ]
 
-  custom_target('valadoc-core',
-    input: libdactl_core_sources,
-    output: 'valadoc',
+  #custom_target('valadoc-core',
+    #input: libdactl_core_sources,
+    #output: 'valadoc-core',
+    #depends : libdactl,
+    #build_by_default : get_option('with-valadoc'),
+    #command :
+    #[
+      #valadoc,
+      #core_doc_common_args,
+      #'-o', 'valadoc',
+      #libdactl_core_sources
+    #]
+  #)
+
+  dactl_doc_common_args = [
+    '--package-name', 'dactl',
+    '--package-version', api_version,
+    '-b', join_paths(meson.source_root(), 'src', 'dactl'),
+    '--force',
+    '--directory', '@OUTPUT@',
+    '--vapidir', join_paths(meson.source_root(), 'vapi'),
+    '--vapidir', join_paths(meson.source_root(), 'src', 'config'),
+    '--pkg', 'cld-1.0',
+    '--pkg', 'comedilib',
+    '--pkg', 'dactl-1.0',
+    '--pkg', 'dactl-config',
+    '--pkg', 'gee-0.8',
+    '--pkg', 'glib-2.0',
+    '--pkg', 'glib-extra',
+    '--pkg', 'gobject-2.0',
+    '--pkg', 'gtk+-3.0',
+    '--pkg', 'gtksourceview-3.0',
+    '--pkg', 'json-glib-1.0',
+    '--pkg', 'libxml-2.0',
+    '--pkg', 'librsvg-2.0',
+    '--pkg', 'libpeas-1.0',
+    '--pkg', 'posix',
+    '--pkg', 'webkit2gtk-4.0',
+ ]
+
+  custom_target('valadoc-dactl',
+    input: dactl_sources_object,
+    output: 'valadoc-dactl',
+    depends : libdactl,
+    build_by_default : get_option('with-valadoc'),
+    command :
+    [
+      valadoc,
+      dactl_doc_common_args,
+      '-o', 'valadoc',
+      dactl_sources_object
+    ]
+  )
+
+  ui_doc_common_args = [
+    '--verbose',
+    '--package-name', 'libdactl',
+    '--package-version', api_version,
+    '-b', join_paths(meson.source_root(), 'src', 'libdactl'),
+    '--force',
+    '--directory', '@OUTPUT@',
+    '--vapidir', join_paths(meson.source_root(), 'vapi'),
+    '--vapidir', join_paths(meson.source_root(), 'src', 'config'),
+    '--pkg', 'cld-1.0',
+    '--pkg', 'comedilib',
+    '--pkg', 'dactl-config',
+    '--pkg', 'gee-0.8',
+    '--pkg', 'gmodule-2.0',
+    '--pkg', 'gsl',
+    '--pkg', 'gtk+-3.0',
+    '--pkg', 'libpeas-1.0',
+    '--pkg', 'libxml-2.0',
+    '--pkg', 'librsvg-2.0',
+    '--pkg', 'linux',
+    '--pkg', 'posix',
+    '--pkg', 'webkit2gtk-4.0',
+  ]
+
+  core_ui_sources = [libdactl_core_sources, ui_sources_object]
+  custom_target('valadoc-dactl-ui',
+    input: core_ui_sources,
+    output: 'valadoc-dactl-ui',
     depends : libdactl,
     build_by_default : get_option('with-valadoc'),
     command :
     [
       valadoc,
-      core_doc_common_args,
+      ui_doc_common_args,
       '-o', 'valadoc',
-      libdactl_core_sources
+      core_ui_sources,
     ]
   )
 
@@ -53,12 +132,31 @@ if valadoc.found()
       ]
     )
 
+    #custom_target('gtkdoc-dactl',
+      #input : libdactl_core_sources,
+      #output : 'gtkdoc',
+      #depends : libdactl,
+      #build_by_default : get_option('with-gtkdoc'),
+      #command :
+      #[
+        #valadoc,
+        #'--doclet', 'gtkdoc',
+        #'-o', 'gtkdoc',
+        #core_doc_common_args,
+        #'-X', join_paths(meson.build_root(), 'src/libdactl/dactl.h'),
+        #'-X', '-l',
+        #'-X', join_paths(meson.build_root(), 'src/libdactl/libdactl-1.0.so'),
+        #'-b', join_paths(meson.source_root(), 'src', 'libdactl'),
+        #libdactl_core_sources
+      #]
+    #)
+  endif
+
 # TODO: implement gtkdoc creation - see https://gitlab.gnome.org/sbacher/rygel/tree/master/doc/reference/librygel-core/gtkdoc
 ##    if get_option('with-gtkdoc')
 ##      install_subdir('gtkdoc/html',
 ##            install_dir : join_paths(get_option('datadir'), 'gtk-doc/html/libdactl'),
 ##        strip_directory : true
 ##      )
 ##    endif
-  endif
 endif

meson.build

@@ -1,7 +1,7 @@
 project('dactl', [ 'c', 'vala' ],
           license: 'LGPL3+',
           version: '0.4.4',
-    meson_version: '>= 0.50.0',
+    meson_version: '>= 0.49.2',
   default_options: [
                      'c_std=gnu11',
                      'warning_level=2',
@@ -62,7 +62,7 @@ dir_vapi = join_paths(meson.current_source_dir(), 'vapi')
 
 add_project_arguments([
   ['--vapidir', dir_vapi],
-  '--disable-warnings',
+  #'--disable-warnings',
 ], language: 'vala')
 
 dep_cld = dependency('cld-1.0')

src/dactl/application.vala

@@ -3,7 +3,7 @@
  * on the changes made to the model.
  *
  * XXX should consider adding signals where necessary in the model and only
- *     update the view when it fires a signal to improve performance.
+ * update the view when it fires a signal to improve performance.
  */
 public class Dactl.UI.Application : Gtk.Application {
 

src/dactl/meson.build

@@ -34,6 +34,8 @@ dactl_sources = [
   'settings/treeview.vala',
 ]
 
+dactl_sources_object = files(dactl_sources)
+
 dactl_c_args = [
   '-DG_LOG_DOMAIN="dactl"',
 ]

src/dactl/settings/toolbar.vala

@@ -4,9 +4,6 @@ private class Dactl.SettingsToolbar : Gtk.HeaderBar {
     [GtkChild]
     private Gtk.Button btn_ok;
 
-    [GtkChild]
-    private Gtk.Button btn_cancel;
-
     public signal void ok ();
 
     public signal void cancel ();

src/dactl/settings/topbar.vala

@@ -23,9 +23,11 @@ private class Dactl.SettingsTopbar : Gtk.Stack {
         settings_toolbar.cancel.connect (do_cancel);
     }
 
-    public void set_subtitle (string subtitle) {
-      settings_toolbar.set_subtitle (subtitle);
-    }
+    /*
+     *public void set_subtitle (string subtitle) {
+     *  settings_toolbar.set_subtitle (subtitle);
+     *}
+     */
 
     private void do_ok () {
         ok ();

src/libdactl/core/application-config.vala

@@ -82,9 +82,6 @@ public class Dactl.ApplicationConfig : GLib.Object {
         return nodes;
     }
 
-    private int depth = 0;
-    private int indent = 0;
-
     /**
      * XXX this doesn't work
      *

src/libdactl/core/object.vala

@@ -41,7 +41,6 @@ public interface Dactl.Object : GLib.Object {
         result += " %-24s%-35s%-24s%-20s\n".printf ("Name:", "Value:", "Value Type:", "Owner Type:");
 
         foreach (ParamSpec spec in ocl.list_properties ()) {
-            string value;
             Type ptype = spec.value_type;
             string name = spec.get_name ();
             Value number = Value (ptype);

src/libdactl/meson.build

@@ -51,12 +51,14 @@ gir_sources = libdactl_sources + libdactl_headers + libdactl_generated_headers +
   join_paths(meson.current_build_dir(), 'dactl.h')
 ]
 
+dir_gir = join_paths(get_option('prefix'), 'share', 'gir-1.0')
+
 libdactl_gir = gnome.generate_gir(libdactl,
               sources: gir_sources,
             namespace: 'Dactl',
             nsversion: '@0@'.format(api_version),
          dependencies: dactl_deps,
-  include_directories: [include_directories('/usr/local/share/gir-1.0')],
+  include_directories: [include_directories(dir_gir)],
              includes: [
                'cairo-1.0',
                'Cld-1.0',

src/libdactl/ui/ai-control.vala

@@ -10,33 +10,12 @@ public class Dactl.AIControl : Dactl.CompositeWidget, Dactl.CldAdapter {
     [GtkChild]
     private Gtk.Box box_secondary;
 
-    [GtkChild]
-    private Gtk.Button btn_primary;
-
-    [GtkChild]
-    private Gtk.Button btn_secondary;
-
     [GtkChild]
     private Gtk.Label lbl_tag;
 
     [GtkChild]
     private Gtk.Label lbl_value;
 
-    [GtkChild]
-    private Gtk.Label lbl_avg;
-
-    [GtkChild]
-    private Gtk.Label lbl_stddev;
-
-    [GtkChild]
-    private Gtk.Label lbl_variance;
-
-    [GtkChild]
-    private Gtk.Image img_primary;
-
-    [GtkChild]
-    private Gtk.Image img_secondary;
-
     private Gee.Map<string, Dactl.Object> _objects;
 
     private string _xml = """

src/libdactl/ui/ao-control.vala

@@ -22,12 +22,6 @@ public class Dactl.AOControl : Dactl.CompositeWidget, Dactl.CldAdapter {
     [GtkChild]
     private Gtk.Box box_secondary;
 
-    [GtkChild]
-    private Gtk.Button btn_next;
-
-    [GtkChild]
-    private Gtk.Button btn_previous;
-
     [GtkChild]
     private Gtk.Label lbl_tag;
 

src/libdactl/ui/channel-matrix.vala

@@ -203,8 +203,6 @@ public class Dactl.ChannelMatrix : GLib.Object, Dactl.Object,
         }
     }
 
-    private int index = 0;
-
     /**
      * {@inheritDoc}
      */

src/libdactl/ui/channel-vector.vala

@@ -154,8 +154,6 @@ public class Dactl.ChannelVector : GLib.Object, Dactl.Object,
         }
     }
 
-    private int index = 0;
-
     /**
      * {@inheritDoc}
      */
@@ -235,7 +233,6 @@ public class Dactl.ChannelVector : GLib.Object, Dactl.Object,
         }
     }
 
-    int count = 0;
     private void new_value_cb (string uri, double value) {
         var xvalue = channel_xvalues.get (uri);
         int ix = channel_indexes.get (uri);

src/libdactl/ui/chart-axis.vala

@@ -93,8 +93,6 @@ public class Dactl.Axis : Dactl.Canvas, Dactl.Buildable, Dactl.Object {
 
     public int div_minor { get; set; default = 2; }
 
-    private bool dragging = false;
-
     public signal void range_changed (double min, double max);
 
     public signal void label_changed (string label);
@@ -109,12 +107,6 @@ public class Dactl.Axis : Dactl.Canvas, Dactl.Buildable, Dactl.Object {
 
     //private double cursor_y;
 
-    private double start_drag_x;
-
-    private double start_drag_y;
-
-    private bool reversed = false;
-
     /**
      * {@inheritDoc}
      */