From a52e94b98d848e75070faff25948e77b816cafb6 Mon Sep 17 00:00:00 2001
From: onqtam <vik.kirilov@gmail.com>
Date: Sun, 2 Jun 2019 17:42:14 +0300
Subject: version 2.3.3

---
 README.md                                         | 2 +-
 doc/html_generated/build-systems.html             | 2 ++
 doc/html_generated/features.html                  | 1 +
 doc/html_generated/roadmap.html                   | 1 +
 doctest/doctest.h                                 | 4 ++--
 doctest/parts/doctest_fwd.h                       | 4 ++--
 examples/all_features/test_output/version.txt     | 2 +-
 examples/all_features/test_output/version_xml.txt | 2 +-
 meson.build                                       | 2 +-
 scripts/release_process.md                        | 2 ++
 scripts/version.txt                               | 2 +-
 11 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 7d40e4ec..fc0ec07e 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/503/badge)](https://bestpractices.coreinfrastructure.org/projects/503)
 [![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/onqtam/doctest.svg)](https://lgtm.com/projects/g/onqtam/doctest/context:cpp)
 [![Join the chat at https://gitter.im/onqtam/doctest](https://badges.gitter.im/onqtam/doctest.svg)](https://gitter.im/onqtam/doctest?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Try it online](https://img.shields.io/badge/try%20it-online-orange.svg)](https://wandbox.org/permlink/K1BuLId1qC8wCJ52)
+[![Try it online](https://img.shields.io/badge/try%20it-online-orange.svg)](https://wandbox.org/permlink/cSNITptGIf1c0jrg)
 <!--
 [![Language](https://img.shields.io/badge/language-C++-blue.svg)](https://isocpp.org/)
 [![documentation](https://img.shields.io/badge/documentation%20%20-online-blue.svg)](https://github.com/onqtam/doctest/blob/master/doc/markdown/readme.md#reference)
diff --git a/doc/html_generated/build-systems.html b/doc/html_generated/build-systems.html
index 6c9b7788..f3603fa7 100644
--- a/doc/html_generated/build-systems.html
+++ b/doc/html_generated/build-systems.html
@@ -68,6 +68,8 @@ target_link_libraries(my_tests doctest)
 
 - The ```CMakeLists.txt``` file of the doctest repository has ```install()``` commands so you could also use doctest as a package.
 
+- To discover tests from an executable and register them in ctest you could use [```doctest_discover_tests(<target>)``` from scripts/cmake/doctest.cmake](../../scripts/cmake/doctest.cmake) - read the comments in the file on how to use it. It works just like [the same functionality in Catch](https://github.com/catchorg/Catch2/blob/master/docs/cmake-integration.html#automatic-test-registration).
+
 ### Package managers
 
 **doctest** is available through the following package managers:
diff --git a/doc/html_generated/features.html b/doc/html_generated/features.html
index 66ba741c..322b16df 100644
--- a/doc/html_generated/features.html
+++ b/doc/html_generated/features.html
@@ -76,6 +76,7 @@
 - controlling the order of test execution
 - different ```doctest::Context```s can be created and ran many times within a single execution of the program
 - ability to query if code is currently being ran in a test -  ```doctest::is_running_in_test```
+- tests can be registered in CTest with the use of [```doctest_discover_tests(<target>)``` from scripts/cmake/doctest.cmake](../../scripts/cmake/doctest.cmake)
 
 There is a list of planned features which are all important and big - see the [**roadmap**](roadmap.html).
 
diff --git a/doc/html_generated/roadmap.html b/doc/html_generated/roadmap.html
index 76b502c1..c229448b 100644
--- a/doc/html_generated/roadmap.html
+++ b/doc/html_generated/roadmap.html
@@ -81,6 +81,7 @@ Planned features for future releases - order changes constantly...
 
 ### Things that are being considered but not part of the roadmap yet:
 
+- add ability to print a diff for strings/values instead of the whole 2 versions (gtest does that)
 - add LIKELY & friends for the conditions of asserts - look at BOOST_LIKELY, ppk_assert, foonathan/debug_assert, etc
 - ability for users to register their own command line options and access them later on
 - fix this: https://github.com/catchorg/Catch2/issues/1292
diff --git a/doctest/doctest.h b/doctest/doctest.h
index acb7fbd4..68bc7f1b 100644
--- a/doctest/doctest.h
+++ b/doctest/doctest.h
@@ -48,8 +48,8 @@
 
 #define DOCTEST_VERSION_MAJOR 2
 #define DOCTEST_VERSION_MINOR 3
-#define DOCTEST_VERSION_PATCH 2
-#define DOCTEST_VERSION_STR "2.3.2"
+#define DOCTEST_VERSION_PATCH 3
+#define DOCTEST_VERSION_STR "2.3.3"
 
 #define DOCTEST_VERSION                                                                            \
     (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH)
diff --git a/doctest/parts/doctest_fwd.h b/doctest/parts/doctest_fwd.h
index 9471e255..0142b248 100644
--- a/doctest/parts/doctest_fwd.h
+++ b/doctest/parts/doctest_fwd.h
@@ -45,8 +45,8 @@
 
 #define DOCTEST_VERSION_MAJOR 2
 #define DOCTEST_VERSION_MINOR 3
-#define DOCTEST_VERSION_PATCH 2
-#define DOCTEST_VERSION_STR "2.3.2"
+#define DOCTEST_VERSION_PATCH 3
+#define DOCTEST_VERSION_STR "2.3.3"
 
 #define DOCTEST_VERSION                                                                            \
     (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH)
diff --git a/examples/all_features/test_output/version.txt b/examples/all_features/test_output/version.txt
index b9ec7479..18ef42ee 100644
--- a/examples/all_features/test_output/version.txt
+++ b/examples/all_features/test_output/version.txt
@@ -1 +1 @@
-[doctest] doctest version is "2.3.2"
+[doctest] doctest version is "2.3.3"
diff --git a/examples/all_features/test_output/version_xml.txt b/examples/all_features/test_output/version_xml.txt
index 74739c29..e7383798 100644
--- a/examples/all_features/test_output/version_xml.txt
+++ b/examples/all_features/test_output/version_xml.txt
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<doctest binary="all_features" version="2.3.2">
+<doctest binary="all_features" version="2.3.3">
   <Options order_by="file" rand_seed="324" first="0" last="4294967295" abort_after="0" subcase_filter_levels="2147483647" case_sensitive="false" no_throw="false" no_skip="false"/>
 </doctest>
diff --git a/meson.build b/meson.build
index c30f43af..fa31e360 100644
--- a/meson.build
+++ b/meson.build
@@ -1,2 +1,2 @@
-project('doctest', ['cpp'], version: '2.3.2', meson_version:'>=0.50')
+project('doctest', ['cpp'], version: '2.3.3', meson_version:'>=0.50')
 doctest_dep = declare_dependency(include_directories: include_directories('doctest'))
diff --git a/scripts/release_process.md b/scripts/release_process.md
index a4240b95..691c00c6 100644
--- a/scripts/release_process.md
+++ b/scripts/release_process.md
@@ -2,10 +2,12 @@
 - run update_stuff.py from the scripts folder
 - regenerate test output by running cmake with -DTEST_MODE=COLLECT and then running ctest
 - run update_wandbox_link.py
+    - might need to do this first: set path=C:/Python27;%PATH%
 - commit in dev
 - merge dev in master and coverity_scan (and rebase them?)
 - push all branches (git push --all)
 - run update_changelog.py in master
+    - might need a tmp folder in the root drive (C or D)
 - commit in master and push
 - create github release with the same semver tag as the changelog
 - merge master in dev
diff --git a/scripts/version.txt b/scripts/version.txt
index e7034819..45674f16 100644
--- a/scripts/version.txt
+++ b/scripts/version.txt
@@ -1 +1 @@
-2.3.2
\ No newline at end of file
+2.3.3
\ No newline at end of file
-- 
cgit v1.2.3