Changeset 3611


Ignore:
Timestamp:
Jan 24, 2015 11:16:13 AM (5 years ago)
Author:
bradbell
Message:

Bug fixes on 2015-01-21 and 2015-01-23.

merge to branch: stable/20150000
from repository: https://github.com/coin-or/CppAD
start hash code: 331ceb929c5f63fd77d1cdd39bc23d84c1ee51ff
end hash code: 5b6c353177c4ecc1ef5a97a4e19321e3a79f286f

commit 5b6c353177c4ecc1ef5a97a4e19321e3a79f286f
Author: Brad Bell <bradbell@…>
Date: Sat Jan 24 08:32:41 2015 -0700

new_release.sh: Advance version, more error checking.

commit 5c66844af1d5b63bc467d63e0f3136e014a5373c
Author: Brad Bell <bradbell@…>
Date: Sat Jan 24 08:29:10 2015 -0700

Advance version 20150000.2 -> 20150000.3

commit 07b9c069add75609dbde99c4aa635ea6c8b5539e
Author: Brad Bell <bradbell@…>
Date: Sat Jan 24 06:38:17 2015 -0700

check_source_runs.cmake: bug fix; see whats new 2015-01-23.

commit f192457dd5c5803196c2726e1c3bd331bfd44115
Author: Brad Bell <bradbell@…>
Date: Wed Jan 21 05:59:22 2015 -0700

Same bug fix as on master commit 9a352fea

Location:
stable/20150000
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • stable/20150000/CMakeLists.txt

    r3589 r3611  
    1717
    1818# cppad_version is used by set_version.sh to get the version number.
    19 SET(cppad_version      "20150000.2" )
     19SET(cppad_version      "20150000.3" )
    2020SET(cppad_url          "http://www.coin-or.org/CppAD" )
    2121SET(cppad_description  "Differentiation of C++ Algorithms" )
  • stable/20150000/bin/new_release.sh

    r3599 r3611  
    2424repository="https://projects.coin-or.org/svn/CppAD"
    2525stable_version="20150000"
    26 release='2'
     26release='3'
    2727release_version="$stable_version.$release"
    2828# -----------------------------------------------------------------------------
     
    3939echo_eval git checkout stable/$stable_version
    4040# -----------------------------------------------------------------------------
    41 #
     41# check that local branch is up to date
     42list=`git status -s`
     43if [ "$list" != '' ]
     44then
     45        echo "new_release.sh: 'git status -s' is not empty"
     46        exit 1
     47fi
     48# -----------------------------------------------------------------------------
     49# check that remote branch agrees with local branch
     50local_hash=`git show-ref stable/$stable_version | \
     51        grep "refs/heads/stable/$stable_version" | \
     52        sed -e "s| *refs/heads/stable/$stable_version||"`
     53remote_hash=`git show-ref stable/$stable_version | \
     54        grep "refs/remotes/origin/stable/$stable_version" | \
     55        sed -e "s| *refs/remotes/origin/stable/$stable_version||"`
     56if [ "$local_hash" != "$remote_hash" ]
     57then
     58        echo_eval git show-ref stable/$stable_version
     59        echo 'new_release.sh: exiting because local and remote branch differ'
     60        exit 1
     61fi
     62# -----------------------------------------------------------------------------
    4263check_one=`bin/version.sh get`
    4364echo_eval git checkout doc.omh
  • stable/20150000/cmake/check_source_runs.cmake

    r3532 r3611  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
     
    2121#
    2222MACRO(check_source_runs source variable)
    23         SET(CMAKE_REQUIRED_INCLUDES  "")
    24         SET(CMAKE_REQUIRED_LIBRARIES "")
    25         SET(CMAKE_REQUIRED_FLAGS     ${cppad_cxx_flags} )
    26         CHECK_CXX_SOURCE_RUNS("${source}" result)
    27         IF( result )
     23        SET(CMAKE_REQUIRED_INCLUDES    "" )
     24        SET(CMAKE_REQUIRED_LIBRARIES   "" )
     25        SET(CMAKE_REQUIRED_DEFINITIONS "" )
     26        IF( cppad_cxx_flags )
     27                SET(CMAKE_REQUIRED_FLAGS   "${cppad_cxx_flags}" )
     28        ELSE( cppad_cxx_flags )
     29                SET(CMAKE_REQUIRED_FLAGS   "" )
     30        ENDIF( cppad_cxx_flags )
     31        CHECK_CXX_SOURCE_RUNS("${source}" ${variable}_result)
     32        IF( ${variable}_result )
    2833                SET(${variable} 1)
    29         ELSE( result )
     34        ELSE( ${variable}_result )
    3035                SET(${variable} 0)
    31         ENDIF( result )
     36        ENDIF( ${variable}_result )
    3237        MESSAGE(STATUS "${variable} = ${${variable}}" )
    3338ENDMACRO( check_source_runs )
  • stable/20150000/configure

    r3589 r3611  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for cppad 20150000.2.
     3# Generated by GNU Autoconf 2.69 for cppad 20150000.3.
    44#
    55# Report bugs to <cppad@list.coin-or.org>.
     
    581581PACKAGE_NAME='cppad'
    582582PACKAGE_TARNAME='cppad'
    583 PACKAGE_VERSION='20150000.2'
    584 PACKAGE_STRING='cppad 20150000.2'
     583PACKAGE_VERSION='20150000.3'
     584PACKAGE_STRING='cppad 20150000.3'
    585585PACKAGE_BUGREPORT='cppad@list.coin-or.org'
    586586PACKAGE_URL=''
     
    14021402  # This message is too long to be a string in the A/UX 3.1 sh.
    14031403  cat <<_ACEOF
    1404 \`configure' configures cppad 20150000.2 to adapt to many kinds of systems.
     1404\`configure' configures cppad 20150000.3 to adapt to many kinds of systems.
    14051405
    14061406Usage: $0 [OPTION]... [VAR=VALUE]...
     
    14721472if test -n "$ac_init_help"; then
    14731473  case $ac_init_help in
    1474      short | recursive ) echo "Configuration of cppad 20150000.2:";;
     1474     short | recursive ) echo "Configuration of cppad 20150000.3:";;
    14751475   esac
    14761476  cat <<\_ACEOF
     
    16051605if $ac_init_version; then
    16061606  cat <<\_ACEOF
    1607 cppad configure 20150000.2
     1607cppad configure 20150000.3
    16081608generated by GNU Autoconf 2.69
    16091609
     
    22342234running configure, to aid debugging if configure makes a mistake.
    22352235
    2236 It was created by cppad $as_me 20150000.2, which was
     2236It was created by cppad $as_me 20150000.3, which was
    22372237generated by GNU Autoconf 2.69.  Invocation command line was
    22382238
     
    46744674
    46754675
    4676 if test "$ac_cv_size_t" == "$ac_cv_unsigned_int" ; then
     4676if test "$ac_cv_sizeof_size_t" != "$ac_cv_sizeof_unsigned_int" ; then
    46774677        cppad_size_t_not_unsigned_int=1
    46784678
     
    52425242# Define the identity of the package.
    52435243 PACKAGE='cppad'
    5244  VERSION='20150000.2'
     5244 VERSION='20150000.3'
    52455245
    52465246
     
    84148414# values after options handling.
    84158415ac_log="
    8416 This file was extended by cppad $as_me 20150000.2, which was
     8416This file was extended by cppad $as_me 20150000.3, which was
    84178417generated by GNU Autoconf 2.69.  Invocation command line was
    84188418
     
    84718471ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    84728472ac_cs_version="\\
    8473 cppad config.status 20150000.2
     8473cppad config.status 20150000.3
    84748474configured by $0, generated by GNU Autoconf 2.69,
    84758475  with options \\"\$ac_cs_config\\"
  • stable/20150000/configure.ac

    r3589 r3611  
    1313dnl Process this file with autoconf to produce a configure script.
    1414dnl   package   version              bug-report
    15 AC_INIT([cppad], [20150000.2], [cppad@list.coin-or.org])
     15AC_INIT([cppad], [20150000.3], [cppad@list.coin-or.org])
    1616AM_SILENT_RULES([yes])
    1717
     
    450450AC_CHECK_SIZEOF([size_t])
    451451AC_CHECK_SIZEOF([unsigned int])
    452 if test "$ac_cv_size_t" == "$ac_cv_unsigned_int" ; then
     452if test "$ac_cv_sizeof_size_t" != "$ac_cv_sizeof_unsigned_int" ; then
    453453        AC_SUBST(cppad_size_t_not_unsigned_int, 1)
    454454else
  • stable/20150000/doc.omh

    r3589 r3611  
    9696$comment bin/version assumes that : follows cppad version number here$$
    9797$section
    98 cppad-20150000.2: A Package for Differentiation of C++ Algorithms
     98cppad-20150000.3: A Package for Differentiation of C++ Algorithms
    9999$$
    100100
  • stable/20150000/omh/install/download.omh

    r3589 r3611  
    6464$rnext
    6565current  $cnext EPL $cnext $href%
    66 http://www.coin-or.org/download/source/CppAD/cppad-20150000.2.epl.tgz%
    67 cppad-20150000.2.epl.tgz%$$
     66http://www.coin-or.org/download/source/CppAD/cppad-20150000.3.epl.tgz%
     67cppad-20150000.3.epl.tgz%$$
    6868$rnext
    6969current  $cnext GPL $cnext $href%
    70 http://www.coin-or.org/download/source/CppAD/cppad-20150000.2.gpl.tgz%
    71 cppad-20150000.2.gpl.tgz%$$
     70http://www.coin-or.org/download/source/CppAD/cppad-20150000.3.gpl.tgz%
     71cppad-20150000.3.gpl.tgz%$$
    7272$rnext
    7373old      $cnext Both $cnext
Note: See TracChangeset for help on using the changeset viewer.