[Nickle] nickle: Branch 'master' - 5 commits
Keith Packard
keithp at keithp.com
Wed Oct 30 13:43:39 PDT 2024
configure.ac | 4 ++--
debian/changelog | 14 ++++++++++++++
examples/smlng/meson.build | 2 +-
examples/turtle/meson.build | 2 +-
meson.build | 13 +++++++++++--
test/meson.build | 8 ++++++--
6 files changed, 35 insertions(+), 8 deletions(-)
New commits:
commit 4b25c844d37503a3e387bd04bd0f184053ab4dbc
Author: Keith Packard <keithp at keithp.com>
Date: Wed Oct 30 12:58:54 2024 -0700
Version 2.101
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/configure.ac b/configure.ac
index 39e3a42..e761967 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,8 +6,8 @@ dnl for licensing information.
AC_PREREQ([2.69])
-AC_INIT([nickle],[2.100],[http://nickle.org],[nickle])
-RELEASE_DATE="2024-10-29"
+AC_INIT([nickle],[2.101],[http://nickle.org],[nickle])
+RELEASE_DATE="2024-10-30"
AC_CONFIG_SRCDIR([nickle.h])
AC_CONFIG_HEADERS([nickle-config.h])
AC_CONFIG_AUX_DIR(.)
diff --git a/debian/changelog b/debian/changelog
index eabc1c1..abaa452 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nickle (2.101) unstable; urgency=medium
+
+ * Format manual fixing dangling template var. Closes: #1070162.
+ * Install tests for use with autopkgtest
+
+ -- Keith Packard <keithp at keithp.com> Wed, 30 Oct 2024 12:56:47 -0700
+
nickle (2.100) unstable; urgency=medium
* Increase testing timeouts to 1000 seconds. Closes: #1086332.
diff --git a/meson.build b/meson.build
index 7810103..a0ed9a7 100644
--- a/meson.build
+++ b/meson.build
@@ -12,10 +12,10 @@ project('nickle', 'c',
],
license : 'BSD',
meson_version : '>= 1.0',
- version: '2.100'
+ version: '2.101'
)
-release_date = '2024-10-29'
+release_date = '2024-10-30'
prefix = get_option('prefix')
include = prefix / get_option('includedir')
commit 154c84f7423380db750aafe5fca74da9d5db1e6d
Author: Keith Packard <keithp at keithp.com>
Date: Wed Oct 30 12:56:30 2024 -0700
Install manual
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/meson.build b/meson.build
index 136a30a..7810103 100644
--- a/meson.build
+++ b/meson.build
@@ -189,6 +189,8 @@ conf_data = configuration_data({
'SIZEOF_UNSIGNED_LONG_LONG': sizeof_unsigned_long_long,
'SIZEOF_UNSIGNED_SHORT': sizeof_unsigned_short,
'VERSION': '"@0@"'.format(meson.project_version()),
+ 'pkgdatadir': nickle_libdir,
+ 'RELEASE_DATE': release_date,
})
if history_h != ''
@@ -263,6 +265,12 @@ nickle = executable('nickle', nickle_srcs,
link_args: link_args,
install: true)
+manual = configure_file(output : 'nickle.1',
+ input : 'nickle.1.in',
+ configuration: conf_data)
+
+install_man(manual)
+
test_env = environment(
{
'NICKLESTART': meson.current_source_dir() / 'builtin.5c',
commit 9911e35305ea4febbd865173788698229ff5f95f
Author: Keith Packard <keithp at keithp.com>
Date: Wed Oct 30 12:48:24 2024 -0700
test: Install tests
This allows testing of the installed version without needing the
source.
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/meson.build b/meson.build
index 17c279e..136a30a 100644
--- a/meson.build
+++ b/meson.build
@@ -26,6 +26,7 @@ nickle_libdir = datadir / 'nickle'
nickle_includedir = include / 'nickle'
nickle_docdir = docdir / 'nickle'
nickle_examplesdir = nickle_libdir / 'examples'
+nickle_testdir = nickle_libdir / 'test'
cc = meson.get_compiler('c')
diff --git a/test/meson.build b/test/meson.build
index 86b6664..5c402bf 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -31,7 +31,9 @@ prog_math_tables = find_program('math-tables.sh', required: true)
math_tables_dep = custom_target('math-tables.5c',
capture: true,
command: prog_math_tables,
- output: 'math-tables.5c'
+ output: 'math-tables.5c',
+ install: true,
+ install_dir: nickle_testdir
)
foreach test : tests
@@ -43,3 +45,5 @@ foreach test : tests
timeout: 1000
)
endforeach
+
+install_data(tests, install_dir: nickle_testdir)
commit a4f8045b76aafedc0265f77f176f771ec6e26f54
Author: Keith Packard <keithp at keithp.com>
Date: Tue Oct 29 15:21:33 2024 -0700
Version 2.100
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/configure.ac b/configure.ac
index e268431..39e3a42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl for licensing information.
AC_PREREQ([2.69])
-AC_INIT([nickle],[2.99],[http://nickle.org],[nickle])
+AC_INIT([nickle],[2.100],[http://nickle.org],[nickle])
RELEASE_DATE="2024-10-29"
AC_CONFIG_SRCDIR([nickle.h])
AC_CONFIG_HEADERS([nickle-config.h])
diff --git a/debian/changelog b/debian/changelog
index 9009631..eabc1c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nickle (2.100) unstable; urgency=medium
+
+ * Increase testing timeouts to 1000 seconds. Closes: #1086332.
+ * Uses bc for test vectors (starting with 2.98). Closes: #1086188.
+
+ -- Keith Packard <keithp at keithp.com> Tue, 29 Oct 2024 15:18:10 -0700
+
nickle (2.99) unstable; urgency=medium
* Install the binary
diff --git a/meson.build b/meson.build
index 8627ef8..17c279e 100644
--- a/meson.build
+++ b/meson.build
@@ -12,7 +12,7 @@ project('nickle', 'c',
],
license : 'BSD',
meson_version : '>= 1.0',
- version: '2.99'
+ version: '2.100'
)
release_date = '2024-10-29'
commit ac595e75b165c6164b7f0d1143bdd41626dd8bcb
Author: Keith Packard <keithp at keithp.com>
Date: Tue Oct 29 15:17:32 2024 -0700
test: Increase test timeout to 1000 seconds
The math test takes 'a while' on some targets
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/examples/smlng/meson.build b/examples/smlng/meson.build
index 602ffc4..50e3eb9 100644
--- a/examples/smlng/meson.build
+++ b/examples/smlng/meson.build
@@ -16,4 +16,4 @@ install_data(nickle_files + ['COPYING', 'data.sgml'],
test('smlng', nickle,
args: files(['test.5c', 'data.sgml']),
env: test_env,
- timeout: 240)
+ timeout: 1000)
diff --git a/examples/turtle/meson.build b/examples/turtle/meson.build
index b1cc3d5..3d6197a 100644
--- a/examples/turtle/meson.build
+++ b/examples/turtle/meson.build
@@ -13,6 +13,6 @@ install_data(nickle_files + ['snowflake.tex', 'COPYING'],
test('snowflake', nickle,
args: files('snowflake.5c'),
- timeout: 240,
+ timeout: 1000,
env: test_env)
diff --git a/test/meson.build b/test/meson.build
index b9ad998..86b6664 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -40,6 +40,6 @@ foreach test : tests
depends: math_tables_dep,
env: test_env,
workdir: meson.current_build_dir(),
- timeout: 240
+ timeout: 1000
)
endforeach
More information about the Nickle
mailing list