Changeset 3589


Ignore:
Timestamp:
Jan 11, 2015 9:07:42 AM (5 years ago)
Author:
bradbell
Message:

merge to branch: stable/20150000
from repository: https://github.com/bradbell/cppad
start hash code: da9e4a1e5bdb8eb6cee67db393a088b807313f4a
end hash code: b45eb7762c2375b695859f9b98bbdb6e59a849c4

commit b45eb7762c2375b695859f9b98bbdb6e59a849c4
Author: Brad Bell <bradbell@…>
Date: Sun Jan 11 06:11:24 2015 -0700

Fix bug in multiple directory forward and advance version to 20150000.2.


new_release.sh: new procedure that uses push_git2svn (not git-svn).
forward2sweep.hpp: bug fix here.

Location:
stable/20150000
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • stable/20150000/CMakeLists.txt

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

    r3546 r3589  
    2424repository="https://projects.coin-or.org/svn/CppAD"
    2525stable_version="20150000"
    26 release='1'
     26release='2'
    2727release_version="$stable_version.$release"
    2828# -----------------------------------------------------------------------------
     
    5050        echo "  bin/version.sh set $release_version"
    5151        echo '  bin/version.sh copy'
    52         echo 'then test and then commit the changes.'
     52        echo 'Then test and then commit the changes.'
     53        echo 'Then push changes to github.'
     54        echo 'Then execute the following command:'
     55        echo "  bin/push_git2svn.sh  stable/$stable_version"
    5356        exit 1
    5457fi
     
    6265        -m "corresponds $repository/releases/$release_version" \
    6366        $release_version
    64 #
    65 # copy committed changes to subversion version
    66 echo_eval git svn dcommit
    6767# -----------------------------------------------------------------------------
    6868msg="Creating releases/$release_version"
  • stable/20150000/configure

    r3546 r3589  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for cppad 20150000.1.
     3# Generated by GNU Autoconf 2.69 for cppad 20150000.2.
    44#
    55# Report bugs to <cppad@list.coin-or.org>.
     
    581581PACKAGE_NAME='cppad'
    582582PACKAGE_TARNAME='cppad'
    583 PACKAGE_VERSION='20150000.1'
    584 PACKAGE_STRING='cppad 20150000.1'
     583PACKAGE_VERSION='20150000.2'
     584PACKAGE_STRING='cppad 20150000.2'
    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.1 to adapt to many kinds of systems.
     1404\`configure' configures cppad 20150000.2 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.1:";;
     1474     short | recursive ) echo "Configuration of cppad 20150000.2:";;
    14751475   esac
    14761476  cat <<\_ACEOF
     
    16051605if $ac_init_version; then
    16061606  cat <<\_ACEOF
    1607 cppad configure 20150000.1
     1607cppad configure 20150000.2
    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.1, which was
     2236It was created by cppad $as_me 20150000.2, which was
    22372237generated by GNU Autoconf 2.69.  Invocation command line was
    22382238
     
    52425242# Define the identity of the package.
    52435243 PACKAGE='cppad'
    5244  VERSION='20150000.1'
     5244 VERSION='20150000.2'
    52455245
    52465246
     
    84148414# values after options handling.
    84158415ac_log="
    8416 This file was extended by cppad $as_me 20150000.1, which was
     8416This file was extended by cppad $as_me 20150000.2, 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.1
     8473cppad config.status 20150000.2
    84748474configured by $0, generated by GNU Autoconf 2.69,
    84758475  with options \\"\$ac_cs_config\\"
  • stable/20150000/configure.ac

    r3546 r3589  
    1313dnl Process this file with autoconf to produce a configure script.
    1414dnl   package   version              bug-report
    15 AC_INIT([cppad], [20150000.1], [cppad@list.coin-or.org])
     15AC_INIT([cppad], [20150000.2], [cppad@list.coin-or.org])
    1616AM_SILENT_RULES([yes])
    1717
  • stable/20150000/cppad/local/forward2sweep.hpp

    r3372 r3589  
    406406
    407407                        case ParOp:
    408                         k = i_var*(J-1)*r + i_var + (q-1)*r;
     408                        k = i_var*(J-1)*r + i_var + (q-1)*r + 1;
    409409                        for(ell = 0; ell < r; ell++)
    410410                                taylor[k + ell] = Base(0);
  • stable/20150000/doc.omh

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

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