From c9943fbbe6247778c4c250a9be9d900fb779fe60 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 04:59:25 +0000 Subject: [PATCH 1/5] Initialize branch F-11 for cppad --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 5545e83ab9edb87402d3f2387e2e959361593435 Mon Sep 17 00:00:00 2001 From: "Bradley M. Bell" Date: Mon, 8 Jun 2009 12:54:37 +0000 Subject: [PATCH 2/5] copy changes from devel branch --- cppad.spec | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/cppad.spec b/cppad.spec index 4c65684..b7358b1 100644 --- a/cppad.spec +++ b/cppad.spec @@ -16,7 +16,7 @@ Name: cppad Version: 20090303.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: No base package is installed, see %{name}-devel Group: Development/Libraries @@ -62,6 +62,16 @@ as a single web page, in both html and xml, can be found at that web site. %prep %setup -q +# Patch problems fix in trunk on 20090606, but not yet in any release +# This grep should fail once the version passes 20090606 +grep 'x\[2\] = 5.0; x\[2\] = 5.0;' test_more/jacobian.cpp +# This patch will no longer be needed once the version passes 20090606 +sed -i.stamp test_more/jacobian.cpp \ + -e 's/x\[2\] = 5.0; x\[2\] = 5.0;/x[1] = 5.0; x[2] = 5.0;/' +# This patch will no longer be needed once the version passes 20090606 +sed -i.stamp cppad/local/default.hpp \ + -e 's/AD::AD(void) :/& value_(Base(0)), /' + # change example/example.cpp to print out machine epsilon cat << EOF > example.sed /^int main(void)/N @@ -120,12 +130,17 @@ rm -rf $RPM_BUILD_ROOT # ---------------------------------------------------------------------------- %changelog -* Mon Mar 30 2009 Brad Bell 20080303-2 +* Mon Jun 06 2009 Brad Bell 20090303-3 +- Patch file test_more/jacobian.cpp (required for versions below 20090606). +- Patch file cppad/local/default.hpp (required for versions below 20090606). +- Fix version (change 20080303 to 20090303) in previous two log entries. + +* Mon Mar 30 2009 Brad Bell 20090303-2 - Change tabs to spaces in spec file to avoid an rpmlint warning. - The base package in previous release had no files, hence did not exist. - Use Provides: in cppad-devel to indicate that it provides cppad. -* Sun Mar 29 2009 Brad Bell 20080303-1 +* Sun Mar 29 2009 Brad Bell 20090303-1 - Change to newer version of cppad. - Create a base package that requres both devel and doc sub-packages From b79e90c29d67b4e6c5d61d9c9f9306e54e2337e2 Mon Sep 17 00:00:00 2001 From: "Bradley M. Bell" Date: Sun, 21 Jun 2009 01:30:28 +0000 Subject: [PATCH 3/5] Improve error message to help figure out what is going worng in http://sparc.koji.fedoraproject.org/koji/getfile?taskID=208037&name=bui ld.log --- cppad.spec | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/cppad.spec b/cppad.spec index b7358b1..8ee4fbe 100644 --- a/cppad.spec +++ b/cppad.spec @@ -16,7 +16,7 @@ Name: cppad Version: 20090303.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: No base package is installed, see %{name}-devel Group: Development/Libraries @@ -72,6 +72,37 @@ sed -i.stamp test_more/jacobian.cpp \ sed -i.stamp cppad/local/default.hpp \ -e 's/AD::AD(void) :/& value_(Base(0)), /' +# This patch will no longer be needed once branches/sweep is merged into +# the CppAD trunk (date is as yet unknown). +sed -i.stamp cppad/local/fun_construct.hpp \ + -e '/for(i = 0; i < m; i++)/,$d' +cat << EOF >> cppad/local/fun_construct.hpp +# ifndef NDEBUG + for(i = 0; i < m; i++) if( taylor_[dep_taddr_[i]] != y[i].value_ ) + { using std::endl; + std::ostringstream buf; + buf << "A dependent variable value is not equal to " + << "its tape evaluation value (perhaps it is nan)" << endl + << "Dependent variable value = " + << y[i].value_ << endl + << "Tape evaluation value = " + << taylor_[dep_taddr_[i]] << endl + << "Difference = " + << y[i].value_ - taylor_[dep_taddr_[i]] << endl + ; + CPPAD_ASSERT_KNOWN( + 0, + buf.str().c_str() + ); + } +# endif +} + +} // END CppAD namespace + +# endif +EOF + # change example/example.cpp to print out machine epsilon cat << EOF > example.sed /^int main(void)/N @@ -130,6 +161,10 @@ rm -rf $RPM_BUILD_ROOT # ---------------------------------------------------------------------------- %changelog +* Sat Jun 20 2009 Brad Bell 20090303-4 +- Patch cppad/local/fun_construct.hpp to give a more useful error message +- (so we can figure out why the Fedora 11 build is failing). + * Mon Jun 06 2009 Brad Bell 20090303-3 - Patch file test_more/jacobian.cpp (required for versions below 20090606). - Patch file cppad/local/default.hpp (required for versions below 20090606). From 90e7b9150a45e5b3b1c1bacd68f617f08d933ee2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:46 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0b7a4f3..cfaf8f0 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := cppad SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From d28d22f6ca3cdaa376c6759d04d3ac4440d664f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 12:14:54 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index cfaf8f0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: cppad -# $Id$ -NAME := cppad -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11