Merge branch 'stable' into branch 'main'

Merge tag '1.2' into branch 'stable' (2-dev)
ladish-1.2 Changes since 1.1: * Apply downstream patches from FreeBSD * meson: Fix project license field (MIT->GPL-2.0-only) * meson: Fix version.h when building from tarball * meson: disable siginfo build * meson: Fix after README->README.adoc rename in 1.1
2024-03-29 16:56:04 +02:00 · 2024-03-29 16:55:27 +02:00 · 2024-03-29 16:43:50 +02:00 · 2024-03-27 17:30:12 +02:00 · 2024-03-27 16:58:41 +02:00 · 2024-03-27 16:09:13 +02:00
3 changed files with 30 additions and 9 deletions
--- a/8
+++ b/8
@ -1,6 +1,12 @@
-= Version 1.2 on 20XX-XX-XX =
+= Version 1.2 on 2023-03-29 =
+
+Changes since 1.1:

 * Apply downstream patches from FreeBSD
+ * meson: Fix project license field (MIT->GPL-2.0-only)
+ * meson: Fix version.h when building from tarball
+ * meson: disable siginfo build
+ * meson: Fix after README->README.adoc rename in 1.1

 = Version 1.1 on 2023-11-26 =

--- a/daemon/meson.build
+++ b/daemon/meson.build
@ -46,6 +46,9 @@ daemon_sources = [
  '../string_constants.c',
 ]

+# define SIGINFO_ENABLED and build
+#  'siginfo.c',
+
 ladishd = executable('ladishd', daemon_sources,
                     dependencies : deps,
                     include_directories : inc,
--- a/meson.build
+++ b/meson.build
@ -1,19 +1,31 @@
 project('ladish', 'c', 'cpp',
-  version : '0.3',
-  license : 'MIT')
+  version : '1.2',
+  license : 'GPL-2.0-only')

 data_dir = get_option('prefix') / 'share' / 'ladish'
 locale_dir = get_option('prefix') / 'share' / 'locale'
 dbus_name_base = 'org.ladish'
 dbus_base_path = '/org/ladish'

-git_version = run_command(['git', 'rev-parse', '--short', 'HEAD']).stdout().strip()
+fs = import('fs')
+if fs.is_dir('.git')
+  # This block handles building from git source tree
+  # version.h is generated during build
+  git_version = run_command(['git', 'rev-parse', '--short', 'HEAD']).stdout().strip()

-configure_file(output : 'version.h',
-    configuration : {
-        'GIT_VERSION' : '"@0@"'.format(git_version)
-    }
-)
+  configure_file(output : 'version.h',
+                 configuration : {
+                                   'GIT_VERSION' : '"@0@"'.format(git_version)
+                 }
+  )
+else
+  # Tarballs already have version.h,
+  # Just copy the file in this case
+  configure_file(output : 'version.h',
+                 input : 'version.h',
+                 copy: true
+  )
+endif

 configure_file(output : 'config.h',
  configuration : {
Author	SHA1	Message	Date
Nedko Arnaudov	977de72135	Merge branch 'stable' into branch 'main'	2024-03-29 16:56:04 +02:00
Nedko Arnaudov	44b47cfc71	Merge tag '1.2' into branch 'stable' (2-dev) ladish-1.2 Changes since 1.1: * Apply downstream patches from FreeBSD * meson: Fix project license field (MIT->GPL-2.0-only) * meson: Fix version.h when building from tarball * meson: disable siginfo build * meson: Fix after README->README.adoc rename in 1.1	2024-03-29 16:55:27 +02:00
Nedko Arnaudov	4dcd67d735	ladish-1.2 Changes since 1.1: * Apply downstream patches from FreeBSD * meson: Fix project license field (MIT->GPL-2.0-only) * meson: Fix version.h when building from tarball * meson: disable siginfo build * meson: Fix after README->README.adoc rename in 1.1	2024-03-29 16:43:50 +02:00
Nedko Arnaudov	e687775381	meson: s/f'.git'/'.git'/	2024-03-27 17:30:12 +02:00
Nedko Arnaudov	5102838329	meson: Fix version.h when building from tarball meson.build always assumed running from git source tree, resulting in GIT_VERSION with value "" (empty string). This commit makes meson use the tarballed version.h, for the cases when not building from git source tree.	2024-03-27 16:58:41 +02:00
Nedko Arnaudov	cdad426401	meson: Fix project license field (MIT->GPL-2.0-only) Most of code is GPL2+, but common/klist.h comes from Linux kernel, so as a whole, GPL2 only is valid (but consult your lawyer anyway)	2024-03-27 16:09:13 +02:00
Nedko Arnaudov	e362a9a13b	meson: disable siginfo build siginfo was already disabled in waf builds See commit `13fa61455c`	2024-03-27 00:04:39 +02:00
Nedko Arnaudov	22e0a60631	meson: Fix after README->README.adoc rename	2024-03-26 23:53:22 +02:00
Nedko Arnaudov	497decb295	Bump version to 1.2	2024-03-26 23:50:09 +02:00