From 63562a5ee0e9cbc86e99e2c76d24caf0b1f98e80 Mon Sep 17 00:00:00 2001 From: vincent <34571152+vpoinot@users.noreply.github.com> Date: Fri, 15 Nov 2024 20:05:57 +0100 Subject: [PATCH 1/5] provide sqlite2cpp as well --- releases.json | 3 ++- subprojects/packagefiles/sqlpp11/meson.build | 1 + subprojects/sqlpp11.wrap | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/releases.json b/releases.json index 77db01088..bd9e5c242 100644 --- a/releases.json +++ b/releases.json @@ -3465,7 +3465,8 @@ "sqlpp11" ], "program_names": [ - "ddl2cpp" + "ddl2cpp", + "sqlite2cpp" ], "versions": [ "0.64-1" diff --git a/subprojects/packagefiles/sqlpp11/meson.build b/subprojects/packagefiles/sqlpp11/meson.build index 3c495b8dd..0e4fc8699 100644 --- a/subprojects/packagefiles/sqlpp11/meson.build +++ b/subprojects/packagefiles/sqlpp11/meson.build @@ -1,6 +1,7 @@ project('sqlpp11', 'cpp', version: '0.64', license: 'BSD-2-Clause') meson.override_find_program('ddl2cpp', files('scripts/ddl2cpp')) +meson.override_find_program('sqlite2cpp', files('scripts/sqlite2cpp.py')) connector_deps = [] diff --git a/subprojects/sqlpp11.wrap b/subprojects/sqlpp11.wrap index bd462ce04..b1c914fc1 100644 --- a/subprojects/sqlpp11.wrap +++ b/subprojects/sqlpp11.wrap @@ -7,4 +7,4 @@ patch_directory = sqlpp11 [provide] sqlpp11 = sqlpp11_dep -program_names = ddl2cpp +program_names = ddl2cpp, sqlite2cpp From 8ade1ac0d5ea76588570a927ef1c0e939caf214f Mon Sep 17 00:00:00 2001 From: vincent <34571152+vpoinot@users.noreply.github.com> Date: Thu, 21 Nov 2024 19:08:18 +0100 Subject: [PATCH 2/5] update version list --- releases.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/releases.json b/releases.json index bd9e5c242..c41a5ab0a 100644 --- a/releases.json +++ b/releases.json @@ -3469,7 +3469,8 @@ "sqlite2cpp" ], "versions": [ - "0.64-1" + "0.64-1", + "0.64-2" ] }, "stduuid": { From add7589f20039bfce4a9f2203ca8e393dddf1bd4 Mon Sep 17 00:00:00 2001 From: vincent <34571152+vpoinot@users.noreply.github.com> Date: Thu, 21 Nov 2024 20:06:44 +0100 Subject: [PATCH 3/5] tell meson to parse the script and use the shebang --- subprojects/packagefiles/sqlpp11/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/packagefiles/sqlpp11/meson.build b/subprojects/packagefiles/sqlpp11/meson.build index 0e4fc8699..4f450e95d 100644 --- a/subprojects/packagefiles/sqlpp11/meson.build +++ b/subprojects/packagefiles/sqlpp11/meson.build @@ -1,7 +1,7 @@ project('sqlpp11', 'cpp', version: '0.64', license: 'BSD-2-Clause') -meson.override_find_program('ddl2cpp', files('scripts/ddl2cpp')) -meson.override_find_program('sqlite2cpp', files('scripts/sqlite2cpp.py')) +meson.override_find_program('ddl2cpp', find_program('scripts/ddl2cpp')) +meson.override_find_program('sqlite2cpp', find_program('scripts/sqlite2cpp.py')) connector_deps = [] From f999c2c44489bf4d7ccb4f31383c44248644558e Mon Sep 17 00:00:00 2001 From: vincent <34571152+vpoinot@users.noreply.github.com> Date: Fri, 22 Nov 2024 19:21:48 +0100 Subject: [PATCH 4/5] order matters (as far as I can tell) --- releases.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releases.json b/releases.json index c41a5ab0a..c88ea5d06 100644 --- a/releases.json +++ b/releases.json @@ -3469,8 +3469,8 @@ "sqlite2cpp" ], "versions": [ - "0.64-1", - "0.64-2" + "0.64-2", + "0.64-1" ] }, "stduuid": { From 4f9ac63bf1634e97dd0b609275aed4c3b7e5a206 Mon Sep 17 00:00:00 2001 From: vincent <34571152+vpoinot@users.noreply.github.com> Date: Sat, 7 Dec 2024 19:23:08 +0100 Subject: [PATCH 5/5] don't assume mariadb is available by default on macos --- ci_config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ci_config.json b/ci_config.json index dae8fa439..a47f171a2 100644 --- a/ci_config.json +++ b/ci_config.json @@ -1061,6 +1061,7 @@ "libpq-dev" ], "brew_packages": [ + "mariadb", "mariadb-connector-c", "libpq" ],