Skip to content

Commit

Permalink
Merge pull request #32 from banditcpp/prepare-v3.0.0
Browse files Browse the repository at this point in the history
Prepare v3.0.0
  • Loading branch information
sbeyer committed Apr 8, 2017
2 parents d5f541a + fa9485d commit ad1f812
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 4 deletions.
30 changes: 27 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,33 @@ As above, but only in debug builds.
Assert that a test behaved as expected.
Throw an exception and let our testing framework deal with the test failure.

## Versioning

Snowhouse uses [Semantic Versioning 2.0.0](http://semver.org/spec/v2.0.0.html) since
version 3.0.0.
The macros `SNOWHOUSE_MAJOR`, `SNOWHOUSE_MINOR` and `SNOWHOUSE_PATCH` are defined
accordingly and `SNOWHOUSE_VERSION` contains the version string.
Note that in prior versions `SNOWHOUSE_VERSION` was the only defined macro.

## Contributing

The development of Snowhouse takes place on [GitHub](//github.com/banditcpp/snowhouse).

Snowhouse is licensed under the Boost Software License.
See LICENSE_1_0.txt for further information.

By making available code for inclusion into Snowhouse (e.g., by opening a
pull request on GitHub), you guarantee that the code is licensed under the
same license as Snowhouse.

Please make sure to be consistent with the project's coding style.
The `.clang-format` file allows easy checking and implementation of the
coding style.

C++ code should comply to C++98, C++03- and C++11.
Please use `__cplusplus` guards if you want to use language features of
a certain C++ version.

## Responsibilities

Snowhouse was originally developed as part of the [Igloo](//github.com/joakimkarlsson/igloo)
Expand All @@ -492,6 +519,3 @@ It has been extracted to be usable in other contexts, for example,

Snowhouse is maintained by [Stephan Beyer](//github.com/sbeyer) since
[October 2016](//twitter.com/JHKarlsson/status/789332548799332352).

Snowhouse is licensed under the Boost Software License.
See LICENSE_1_0.txt for further information.
2 changes: 2 additions & 0 deletions example/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ void StringizeTests();

int main()
{
std::cout << "Spec for Snowhouse " SNOWHOUSE_VERSION << std::endl;

try
{
BasicAssertions();
Expand Down
11 changes: 10 additions & 1 deletion snowhouse/macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,16 @@
#define SNOWHOUSE_MACROS_H
// clang-format off

#define SNOWHOUSE_VERSION "2.1.0"
#define SNOWHOUSE_MAJOR 3
#define SNOWHOUSE_MINOR 0
#define SNOWHOUSE_PATCH 0

#define SNOWHOUSE_TOSTRING(x) #x
#define SNOWHOUSE_MACROTOSTRING(x) SNOWHOUSE_TOSTRING(x)
#define SNOWHOUSE_VERSION \
SNOWHOUSE_MACROTOSTRING(SNOWHOUSE_MAJOR) "." \
SNOWHOUSE_MACROTOSTRING(SNOWHOUSE_MINOR) "." \
SNOWHOUSE_MACROTOSTRING(SNOWHOUSE_PATCH)

#if __cplusplus > 199711L
// Visual Studio (including 2013) does not support the noexcept keyword
Expand Down

0 comments on commit ad1f812

Please sign in to comment.