From bcbb476e20d6c4a10985d687e2ed2e96bb4fc94a Mon Sep 17 00:00:00 2001 From: Michael Brockus <55331536+michaelbadcrumble@users.noreply.github.com> Date: Sat, 12 Oct 2019 08:38:10 -0700 Subject: [PATCH 1/3] Upgrade Meson support version number two 0.52.0. This is because Meson now has better support for static libraries. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index a2c0a15..062fcad 100644 --- a/meson.build +++ b/meson.build @@ -13,7 +13,7 @@ project('unity', 'c', license : 'MIT', - meson_version : '>=0.50.0', + meson_version : '>=0.52.0', default_options: [ 'buildtype=minsize', 'optimization=3', From 8227ea2c36e49d86be44e4f76aa25bd03d0b7074 Mon Sep 17 00:00:00 2001 From: Michael Brockus <55331536+michaelbadcrumble@users.noreply.github.com> Date: Sat, 12 Oct 2019 08:44:03 -0700 Subject: [PATCH 2/3] Update .gitattributes Adding Meson build script into hit attributes as text. --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index ad95226..f84c162 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16,6 +16,7 @@ *.md text makefile text rakefile text +meson.build text #These files are binary and should not be normalized From 1748f00fc75993ff77882ace3fc470d45ef067a1 Mon Sep 17 00:00:00 2001 From: Michael Brockus <55331536+michaelbadcrumble@users.noreply.github.com> Date: Sat, 12 Oct 2019 08:50:58 -0700 Subject: [PATCH 3/3] Adding ignore entries. Adding basic ignore entry for example and main build directories. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index a383c3c..083b4f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build/ +builddir/ test/sandbox .DS_Store examples/example_1/test1.exe @@ -7,3 +8,4 @@ examples/example_2/all_tests.exe examples/example_1/test1.out examples/example_1/test2.out examples/example_2/all_tests.out +examples/example_4/builddir