From b7e0d70a63a0b862ec4bce37c14ae11446fc5e42 Mon Sep 17 00:00:00 2001 From: Patrick Johnmeyer Date: Mon, 25 Apr 2016 13:37:31 -0500 Subject: [PATCH 1/3] Fix failures in `make distcheck` --- tests/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 647476e..06cc26c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,5 @@ check_PROGRAMS = UnitTest++/TestUnitTest++ -UnitTest___TestUnitTest___SOURCES = tests/Main.cpp tests/TestAssertHandler.cpp tests/TestCheckMacros.cpp tests/TestChecks.cpp tests/TestCompositeTestReporter.cpp tests/TestCurrentTest.cpp tests/TestDeferredTestReporter.cpp tests/TestExceptions.cpp tests/TestMemoryOutStream.cpp tests/TestRequireMacrosWithExceptionsOff.cpp tests/TestRequireMacrosWithExceptionsOn.cpp tests/TestTest.cpp tests/TestTestList.cpp tests/TestTestMacros.cpp tests/TestTestResults.cpp tests/TestTestRunner.cpp tests/TestTestSuite.cpp tests/TestTimeConstraint.cpp tests/TestTimeConstraintMacro.cpp tests/TestUnitTestPP.cpp tests/TestXmlTestReporter.cpp + +UnitTest___TestUnitTest___SOURCES = tests/Main.cpp tests/TestAssertHandler.cpp tests/TestCheckMacros.cpp tests/TestChecks.cpp tests/TestCompositeTestReporter.cpp tests/TestCurrentTest.cpp tests/TestDeferredTestReporter.cpp tests/TestExceptions.cpp tests/TestMemoryOutStream.cpp tests/TestRequireMacrosWithExceptionsOff.cpp tests/TestRequireMacrosWithExceptionsOn.cpp tests/TestTest.cpp tests/TestTestList.cpp tests/TestTestMacros.cpp tests/TestTestResults.cpp tests/TestTestRunner.cpp tests/TestTestSuite.cpp tests/TestTimeConstraint.cpp tests/TestTimeConstraintMacro.cpp tests/TestUnitTestPP.cpp tests/TestXmlTestReporter.cpp tests/RecordingReporter.h tests/ScopedCurrentTest.h UnitTest___TestUnitTest___LDADD = UnitTest++/libUnitTest++.la TESTS = UnitTest++/TestUnitTest++ From 1a62540b790345001fe584b8be05b076a46da403 Mon Sep 17 00:00:00 2001 From: Patrick Johnmeyer Date: Wed, 4 May 2016 21:30:44 -0500 Subject: [PATCH 2/3] Determine autoconf package version from git tags --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index fbf92c8..6b81131 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([UnitTest++], [1.6.0], [pjohnmeyer@gmail.com]) +AC_INIT([UnitTest++], + m4_esyscmd_s([git describe --tags | cut -c2-]), + [pjohnmeyer@gmail.com], + [unittest-cpp]) + AC_CONFIG_SRCDIR([UnitTest++/TestDetails.cpp]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) From 782e620fbb6e03bb479eeae012b68b86c06f650f Mon Sep 17 00:00:00 2001 From: Patrick Johnmeyer Date: Wed, 4 May 2016 21:36:40 -0500 Subject: [PATCH 3/3] Update versions to 1.6.1 --- README.md | 10 +++++----- appveyor.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index cf88fea..8a49c3d 100644 --- a/README.md +++ b/README.md @@ -30,17 +30,17 @@ Via svn: svn checkout https://github.com/unittest-cpp/unittest-cpp/trunk unittest-cpp -### Latest release (v1.6.0) ### +### Latest release (v1.6.1) ### Via git: git clone https://github.com/unittest-cpp/unittest-cpp cd unittest-cpp - git checkout v1.6.0 + git checkout v1.6.1 Via svn: - svn checkout https://github.com/unittest-cpp/unittest-cpp/tags/v1.6.0 unittest-cpp + svn checkout https://github.com/unittest-cpp/unittest-cpp/tags/v1.6.1 unittest-cpp License --------- @@ -58,7 +58,7 @@ Contributors * Charles Nicholson (charles.nicholson@gmail.com) @charlesnicholson ### Original Authors: ### -* Noel Llopis (llopis@convexhull.com) +* Noel Llopis (llopis@convexhull.com) * Charles Nicholson (charles.nicholson@gmail.com) ### Contributors not included in github history ### @@ -114,7 +114,7 @@ Historic release notes - Standard streams can be optionally compiled off by defining UNITTEST_USE_CUSTOM_STREAMS in Config.h - Added named test suites -- Added CHECK_ARRAY2D_CLOSE +- Added CHECK_ARRAY2D_CLOSE - Posix library name is libUnitTest++.a now - Floating point numbers are postfixed with 'f' in the failure reports diff --git a/appveyor.yml b/appveyor.yml index 28dc4fc..71e4398 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.6.0.{build} +version: 1.6.1.{build} os: - Windows Server 2012 R2