cpputest-3.8

cpputest/README

@@ -10,45 +10,46 @@ CppUTest is based on the following design principles
  * Portable to old and new platforms.
 
 Runtime requirements:
-  cygwin-2.0.2-1
-  libCppUTest-devel-3.7.2-1bl1
-  libCppUTest0-3.7.2-1bl1
-  libgcc1-4.9.2-3
-  libstdc++6-4.9.2-3
+  cygwin-2.6.1-1
+  libCppUTest-devel-3.8-1bl1
+  libCppUTest0-3.8-1bl1
+  libgcc1-5.4.0-1
+  libstdc++6-5.4.0-1
+  pkg-config-0.29.1-1
 
 Build requirements:
 (besides corresponding -devel packages)
   autoconf-13-1
   automake-9-1
-  binutils-2.25-2
-  cmake-3.1.2-1
-  cygport-0.20.0-1
-  gcc-core-4.9.2-3
-  gcc-g++-4.9.2-3
-  libtool-2.4.6-1
-  make-4.1-1
-  ruby-2.2.2-1
+  binutils-2.25-4
+  cmake-3.6.2-1
+  cygport-0.23.0-1
+  gcc-core-5.4.0-1
+  gcc-g++-5.4.0-1
+  libtool-2.4.6-4
+  make-4.2.1-1
+  ruby-2.2.5-1
 
 Canonical website:
   http://cpputest.github.io/
 
 Canonical download:
-  https://github.com/cpputest/cpputest/archive/3.7.2.tar.gz
+  https://github.com/cpputest/cpputest/archive/v3.8.tar.gz
 
 -------------------------------------------
 
 Build instructions:
-  1. unpack cpputest-3.7.2-X-src.tar.xz
+  1. unpack cpputest-3.8-X-src.tar.xz
   2. if you use setup to install this src package,
      it will be unpacked under /usr/src automatically
         % cd /usr/src
-        % cygport ./cpputest-3.7.2-X.cygport all
+        % cygport ./cpputest-3.8-X.cygport all
 
 This will create:
-  /usr/src/cpputest-3.7.2-X-src.tar.xz
-  /usr/src/cpputest-3.7.2-X.tar.xz
-  /usr/src/libCppUTest0-3.7.2-X.tar.xz
-  /usr/src/libCppUTest-devel-3.7.2-X.tar.xz
+  /usr/src/cpputest-3.8-X-src.tar.xz
+  /usr/src/cpputest-3.8-X.tar.xz
+  /usr/src/libCppUTest0-3.8-X.tar.xz
+  /usr/src/libCppUTest-devel-3.8-X.tar.xz
 
 -------------------------------------------
 
@@ -70,6 +71,7 @@ Files included in the binary package:
   /usr/include/CppUTest/CommandLineArguments.h
   /usr/include/CppUTest/CommandLineTestRunner.h
   /usr/include/CppUTest/CppUTestConfig.h
+  /usr/include/CppUTest/CppUTestGeneratedConfig.h
   /usr/include/CppUTest/JUnitTestOutput.h
   /usr/include/CppUTest/MemoryLeakDetector.h
   /usr/include/CppUTest/MemoryLeakDetectorMallocMacros.h
@@ -80,6 +82,7 @@ Files included in the binary package:
   /usr/include/CppUTest/SimpleMutex.h
   /usr/include/CppUTest/SimpleString.h
   /usr/include/CppUTest/StandardCLibrary.h
+  /usr/include/CppUTest/TeamCityTestOutput.h
   /usr/include/CppUTest/TestFailure.h
   /usr/include/CppUTest/TestFilter.h
   /usr/include/CppUTest/TestHarness.h
@@ -95,6 +98,7 @@ Files included in the binary package:
   /usr/include/CppUTestExt/GMock.h
   /usr/include/CppUTestExt/GTest.h
   /usr/include/CppUTestExt/GTestConvertor.h
+  /usr/include/CppUTestExt/IEEE754ExceptionsPlugin.h
   /usr/include/CppUTestExt/MemoryReportAllocator.h
   /usr/include/CppUTestExt/MemoryReportFormatter.h
   /usr/include/CppUTestExt/MemoryReporterPlugin.h
@@ -117,6 +121,9 @@ Files included in the binary package:
 
 Port Notes:
 
+----- version 3.8-1bl1 -----
+Version bump.
+
 ----- version 3.7.2-1bl1 -----
 Version bump.
 
@@ -128,4 +135,3 @@ Version bump.
 
 ----- version 3.4-1bl1 -----
 Initial release for Cygwin-1.7 by fd0 <http://fd0.hatenablog.jp/>
-

cpputest/cpputest-3.7.2-1bl1.cygport → cpputest/cpputest-3.8-1bl1.cygport

@@ -1,5 +1,5 @@
 HOMEPAGE="http://${PN}.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz"
 
 CATEGORY="Devel"
 SUMMARY="Unit testing and mocking framework for C/C++"
@@ -27,7 +27,6 @@ libCppUTest_devel_CONTENTS="
 	usr/include
 	usr/lib
 "
-
 cpputest_SUMMARY="${SUMMARY} (licensing & readmes)"
 libCppUTest0_SUMMARY="${SUMMARY} (runtime)"
 libCppUTest_devel_SUMMARY="${SUMMARY} (development)"

cpputest/cpputest-3.7.2-1bl1.src.patch → cpputest/cpputest-3.8-1bl1.src.patch

@@ -1,6 +1,5 @@
-diff -wuprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.guess -x config.log -x config.status -x config.sub -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.gem' -x .gitignore -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x aclocal.m4 -x configure -x config.h -x '*.h.in' -x COPYING -x INSTALL -x ansi2knr.c -x ar-lib -x config-ml.in -x elisp-comp -x mdate-sh -x mkinstalldirs -x py-compile -x symlink-tree -x test-driver -x texinfo.tex -x ylwrap -x Makefile.in -x GNUmakefile.in -x makefile.in -x libtool.m4 -x ltoptions.m4 -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltmain.sh -x compile -x depcomp -x install-sh -x missing -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 origsrc/cpputest-3.7.2/Makefile.am src/cpputest-3.7.2/Makefile.am
---- origsrc/cpputest-3.7.2/Makefile.am	2015-05-10 22:57:06.000000000 +0900
-+++ src/cpputest-3.7.2/Makefile.am	2015-05-31 18:15:37.450814700 +0900
+--- origsrc/cpputest-3.8/Makefile.am	2016-05-25 14:41:47.000000000 +0900
++++ src/cpputest-3.8/Makefile.am	2017-01-03 16:28:15.889314300 +0900
 @@ -4,14 +4,11 @@ ACLOCAL_AMFLAGS = -I m4
  CPPUTEST_TESTS = CppUTestTests
  CPPUTESTEXT_TESTS = CppUTestExtTests
@@ -35,40 +34,39 @@ diff -wuprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x
  	src/CppUTest/CommandLineArguments.cpp \
  	src/CppUTest/CommandLineTestRunner.cpp \
  	src/CppUTest/JUnitTestOutput.cpp \
-@@ -80,11 +78,13 @@ include_cpputest_HEADERS = \
- 	include/CppUTest/Utest.h \
- 	include/CppUTest/UtestMacros.h
+@@ -84,11 +82,13 @@ include_cpputest_HEADERS = \
+ 	include/CppUTest/UtestMacros.h \
+ 	generated/CppUTestGeneratedConfig.h
 
 -lib_libCppUTestExt_a_CPPFLAGS = $(lib_libCppUTest_a_CPPFLAGS)
 -lib_libCppUTestExt_a_CFLAGS = $(lib_libCppUTest_a_CFLAGS)
 -lib_libCppUTestExt_a_CXXFLAGS = $(lib_libCppUTest_a_CXXFLAGS)
 +lib_libCppUTestExt_la_CPPFLAGS = $(lib_libCppUTest_la_CPPFLAGS)
 +lib_libCppUTestExt_la_CFLAGS = $(lib_libCppUTest_la_CFLAGS)
 +lib_libCppUTestExt_la_CXXFLAGS = $(lib_libCppUTest_la_CXXFLAGS)
-+lib_libCppUTestExt_la_LIBADD = $(top_builddir)/lib/libCppUTest.la
 +lib_libCppUTestExt_la_LDFLAGS = -no-undefined
++lib_libCppUTestExt_la_LIBADD = lib/libCppUTest.la
 
 -lib_libCppUTestExt_a_SOURCES = \
 +lib_libCppUTestExt_la_SOURCES = \
     src/CppUTestExt/CodeMemoryReportFormatter.cpp \
+    src/CppUTestExt/IEEE754ExceptionsPlugin.cpp \
     src/CppUTestExt/MemoryReportAllocator.cpp \
-    src/CppUTestExt/MemoryReporterPlugin.cpp \
-@@ -123,10 +123,10 @@ include_cpputestext_HEADERS = \
+@@ -129,10 +129,10 @@ include_cpputestext_HEADERS = \
 
  endif
 
 -CppUTestTests_CPPFLAGS = $(lib_libCppUTest_a_CPPFLAGS)
 -CppUTestTests_CFLAGS = $(lib_libCppUTest_a_CFLAGS)
--CppUTestTests_CXXFLAGS = $(lib_libCppUTest_a_CXXFLAGS)
--CppUTestTests_LDADD = lib/libCppUTest.a $(CPPUTEST_LDADD)
 +CppUTestTests_CPPFLAGS = $(lib_libCppUTest_la_CPPFLAGS)
-+CppUTestTests_CFLAGS = $(lib_libCppUTest_la_CFLAGS)
-+CppUTestTests_CXXFLAGS = $(lib_libCppUTest_la_CXXFLAGS)
++CppUTestTests_CFLAGS = $(lib_libCppUTest_lla_CFLAGS)
+ CppUTestTests_CXXFLAGS = $(lib_libCppUTest_a_CXXFLAGS)
+-CppUTestTests_LDADD = lib/libCppUTest.a $(CPPUTEST_LDADD)
 +CppUTestTests_LDADD = lib/libCppUTest.la $(CPPUTEST_LDADD)
  CppUTestTests_LDFLAGS = $(AM_LDFLAGS) $(CPPUTEST_LDFLAGS) $(CPPUTEST_ADDITIONAL_LDFLAGS)
 
  CppUTestTests_SOURCES = \
-@@ -161,10 +161,10 @@ CppUTestTests_SOURCES = \
+@@ -169,10 +169,10 @@ CppUTestTests_SOURCES = \
  	tests/UtestTest.cpp \
  	tests/UtestPlatformTest.cpp
 
@@ -83,7 +81,7 @@ diff -wuprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x
  CppUTestExtTests_LDFLAGS = $(CppUTestTests_LDFLAGS)
 
  CppUTestExtTests_SOURCES = \
-@@ -189,10 +189,10 @@ CppUTestExtTests_SOURCES = \
+@@ -211,10 +211,10 @@ DISTCLEANFILES = \
 
  if INCLUDE_GMOCKTESTS
 
@@ -98,17 +96,8 @@ diff -wuprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x
  #GTestTests_LDFLAGS = $(CppUTestTests_LDFLAGS)
 
  #GTestTests_SOURCES = \
-@@ -314,7 +314,7 @@ check_coverage:
-
- 	./$(CPPUTEST_TESTS) >> test_output.txt; ./$(CPPUTESTEXT_TESTS) >> test_output.txt
- 	$(SILENCE)for f in `ls *.gcno` ; do \
--		gcov $(CppUTestExtTests_SOURCES) $(CppUTestTests_SOURCES) $(lib_libCppUTest_a_SOURCES) $(lib_libCppUTestExt_a_SOURCES) -o $$f 1>>gcov_output.txt 2>>gcov_error.txt; \
-+		gcov $(CppUTestExtTests_SOURCES) $(CppUTestTests_SOURCES) $(lib_libCppUTest_la_SOURCES) $(lib_libCppUTestExt_la_SOURCES) -o $$f 1>>gcov_output.txt 2>>gcov_error.txt; \
- 	done
- 	$(srcdir)/scripts/filterGcov.sh gcov_output.txt gcov_error.txt gcov_report.txt test_output.txt
- 	cat gcov_report.txt
-@@ -354,4 +354,3 @@ dist-hook:
- 			exit 1; \
- 		fi \
- 	fi
+@@ -379,4 +379,3 @@ dist-hook:
+
+ distclean-local:
+ 	test -z "generated" || rmdir generated
 -