Merge pull request #9 from markuspg/meson

Replace Autotools by Meson build system
TobiX · Dec 24, 2023 · 192a2df · 192a2df
2 parents 780e6cb + c8c6ecb
commit 192a2df
Show file tree

Hide file tree

Showing 19 changed files with 89 additions and 267 deletions.
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -1,3 +1,4 @@
+---
 name: Compile
 on:
   - push
@@ -16,9 +17,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Install requirements
-        run: sudo apt-get install automake intltool libgtk2.0-dev libtool-bin
+        run: sudo apt-get install intltool libgtk2.0-dev libtool-bin meson
 
       - name: Build
         env:
           CC: ${{ matrix.compiler }}
-        run: ./autogen.sh && make
+        run: meson setup builddir && ninja -C builddir
diff --git a/Makefile.am b/Makefile.am
diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+Version 2.2 (Work in Progress)
+
+* Switch build system from Autotools to Meson
+
 Version 2.1
 
 * Switches from Glade to GtkBuilder

diff --git a/NEW_TESTS.md b/NEW_TESTS.md
@@ -13,9 +13,7 @@ the file with copyright notice and #include statements from another source file
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <gtk/gtk.h>

diff --git a/autogen.sh b/autogen.sh
diff --git a/callbacks.c b/callbacks.c
@@ -18,9 +18,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/configure.ac b/configure.ac
diff --git a/main.c b/main.c
@@ -18,9 +18,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <config.h>
 
 #include <stdlib.h>
 #include <gtk/gtk.h>
@@ -42,7 +40,7 @@ int main(int argc, char *argv[])
 	gtk_init(&argc, &argv);
 
 	builder = gtk_builder_new();
-	err = gtk_builder_add_from_file(builder, DATADIR "/screentest.ui", NULL);
+	err = gtk_builder_add_from_file(builder, DATADIR "/screentest/screentest.ui", NULL);
 	if (err == 0)
 		err = gtk_builder_add_from_file(builder, "screentest.ui", NULL);
 	if (err == 0) {

diff --git a/meson.build b/meson.build
@@ -0,0 +1,61 @@
+project(
+  'screentest',
+  'c',
+  license: 'GPL-2.0-only',
+  # license_files: ['COPYING'], -- needs Meson 1.1, Ubuntu 22.04 is too old
+  meson_version: '>= 0.61',
+  version: '2.2-dev',
+)
+
+i18n = import('i18n')
+
+gmodule_dep = dependency('gmodule-2.0', version: '>= 1.1.3')
+gtk_dep = dependency('gtk+-2.0', version: '>= 2.24')
+screentest_deps = [
+  gmodule_dep,
+  gtk_dep,
+]
+
+prefix = get_option('prefix')
+datadir = join_paths(prefix, get_option('datadir'))
+localdir = join_paths(datadir, 'local')
+
+config_h = configuration_data()
+config_h.set_quoted('DATADIR', datadir)
+config_h.set_quoted('LOCALEDIR', localdir)
+config_h.set_quoted('PACKAGE', meson.project_name())
+config_h.set_quoted('PACKAGE_NAME', meson.project_name())
+config_h.set_quoted('VERSION', meson.project_version())
+
+configure_file(
+  configuration: config_h,
+  output: 'config.h',
+)
+
+subdir('po')
+
+screentest_srcs = [
+  'callbacks.c',
+  'test_basic.c',
+  'test_blink.c',
+  'test_bright_pixels.c',
+  'test_grid.c',
+  'test_horizontal.c',
+  'test_lcdalign.c',
+  'test_text.c',
+  'test_vertical.c',
+]
+
+executable(
+  meson.project_name(),
+  'main.c',
+  dependencies: screentest_deps,
+  install: true,
+  sources: screentest_srcs,
+)
+
+uidir = datadir / meson.project_name()
+install_data(
+  'screentest.ui',
+  install_dir: uidir,
+)
diff --git a/po/LINGUAS b/po/LINGUAS
@@ -0,0 +1,5 @@
+cs
+da
+de
+fi
+fr
diff --git a/po/meson.build b/po/meson.build
@@ -0,0 +1,4 @@
+i18n.gettext(
+  meson.project_name(),
+  preset: 'glib',
+)
diff --git a/test_basic.c b/test_basic.c
@@ -19,9 +19,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <gtk/gtk.h>

diff --git a/test_blink.c b/test_blink.c
@@ -18,9 +18,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <config.h>
 
 #include <gtk/gtk.h>