From 7ac8aa63af94e94c30e0429d0e088f6e0f8e5cb4 Mon Sep 17 00:00:00 2001 From: M Hickford Date: Tue, 28 Jan 2025 22:20:41 +0000 Subject: [PATCH 1/2] meson: wire up credential-wincred Fix an error when compiling with MSVC. Signed-off-by: M Hickford --- contrib/credential/meson.build | 3 +++ contrib/credential/wincred/git-credential-wincred.c | 2 ++ contrib/credential/wincred/meson.build | 1 + contrib/meson.build | 1 + meson_options.txt | 2 ++ 5 files changed, 9 insertions(+) create mode 100644 contrib/credential/meson.build create mode 100644 contrib/credential/wincred/meson.build diff --git a/contrib/credential/meson.build b/contrib/credential/meson.build new file mode 100644 index 00000000000000..4017ae3fa88b4d --- /dev/null +++ b/contrib/credential/meson.build @@ -0,0 +1,3 @@ +if get_option('credential_wincred') + subdir('wincred') +endif diff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c index 4be0d58cd89ad7..04145b511839a5 100644 --- a/contrib/credential/wincred/git-credential-wincred.c +++ b/contrib/credential/wincred/git-credential-wincred.c @@ -12,7 +12,9 @@ #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) +#ifndef _MSC_VER __attribute__((format (printf, 1, 2))) +#endif static void die(const char *err, ...) { char msg[4096]; diff --git a/contrib/credential/wincred/meson.build b/contrib/credential/wincred/meson.build new file mode 100644 index 00000000000000..8c59d47174e518 --- /dev/null +++ b/contrib/credential/wincred/meson.build @@ -0,0 +1 @@ +executable('git-credential-wincred', 'git-credential-wincred.c') diff --git a/contrib/meson.build b/contrib/meson.build index d74b64a5181d66..c414c98d5a73d2 100644 --- a/contrib/meson.build +++ b/contrib/meson.build @@ -1,3 +1,4 @@ foreach feature : get_option('contrib') subdir(feature) endforeach +subdir('credential') diff --git a/meson_options.txt b/meson_options.txt index 5c12e9055e6b03..7554528482a50d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -29,6 +29,8 @@ option('version', type: 'string', value: '', # Features supported by Git. option('contrib', type: 'array', value: [ 'completion' ], choices: [ 'completion', 'subtree' ], description: 'Contributed features to include.') +option('credential_wincred', type: 'boolean', value: false, + description: 'Build helper git-credential-wincred. Requires Windows SDK.') option('curl', type: 'feature', value: 'enabled', description: 'Build helpers used to access remotes with the HTTP transport.') option('expat', type: 'feature', value: 'enabled', From 07ce068403072bf6933ddd00fdf1674dba6cb235 Mon Sep 17 00:00:00 2001 From: M Hickford Date: Thu, 30 Jan 2025 21:22:35 +0000 Subject: [PATCH 2/2] meson: wire up credential-libsecret Signed-off-by: M Hickford --- contrib/credential/libsecret/meson.build | 3 +++ contrib/credential/meson.build | 3 +++ meson_options.txt | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 contrib/credential/libsecret/meson.build diff --git a/contrib/credential/libsecret/meson.build b/contrib/credential/libsecret/meson.build new file mode 100644 index 00000000000000..92349be0ee8ea2 --- /dev/null +++ b/contrib/credential/libsecret/meson.build @@ -0,0 +1,3 @@ +glib = dependency('glib-2.0') +libsecret = dependency('libsecret-1') +executable('git-credential-libsecret', 'git-credential-libsecret.c', dependencies: [glib, libsecret]) diff --git a/contrib/credential/meson.build b/contrib/credential/meson.build index 4017ae3fa88b4d..bedc76b96f29d7 100644 --- a/contrib/credential/meson.build +++ b/contrib/credential/meson.build @@ -1,3 +1,6 @@ if get_option('credential_wincred') subdir('wincred') endif +if get_option('credential_libsecret') + subdir('libsecret') +endif diff --git a/meson_options.txt b/meson_options.txt index 7554528482a50d..69e386afc2a132 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -29,6 +29,8 @@ option('version', type: 'string', value: '', # Features supported by Git. option('contrib', type: 'array', value: [ 'completion' ], choices: [ 'completion', 'subtree' ], description: 'Contributed features to include.') +option('credential_libsecret', type: 'boolean', value: false, + description: 'Build helper git-credential-libsecret. Requires GLib and libsecret.') option('credential_wincred', type: 'boolean', value: false, description: 'Build helper git-credential-wincred. Requires Windows SDK.') option('curl', type: 'feature', value: 'enabled',