Changeset 3619


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

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

commit cd7e9f991da55de6eed00f320c30b609ecf5a94d
Author: Brad Bell <bradbell@…>
Date: Wed Jan 28 07:08:15 2015 -0700

parallel_ad.hpp: Bug fix on 2015-01-26.
CMakeLists.txt: Detects bug.

commit bed7c730edc8e92d8b8dccbd56f4afb597fede56
Author: Brad Bell <bradbell@…>
Date: Sat Jan 24 09:22:01 2015 -0700

new_release.sh: final version that was used for 20150000.3 release.
push_git2svn.py: copied from master branch (to use with releases).

Location:
stable/20150000
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • stable/20150000/bin/new_release.sh

    r3611 r3619  
    2222}
    2323# -----------------------------------------------------------------------------
    24 repository="https://projects.coin-or.org/svn/CppAD"
     24svn_repository="https://projects.coin-or.org/svn/CppAD"
    2525stable_version="20150000"
    2626release='3'
     
    2828# -----------------------------------------------------------------------------
    2929# Check release version
    30 if svn list $repository/releases | grep "$release_version" > /dev/null
     30if svn list $svn_repository/releases | grep "$release_version" > /dev/null
    3131then
    3232        echo bin/"new_release.sh: Release number $release_version already exists."
     
    7272        echo '  bin/version.sh copy'
    7373        echo 'Then test and then commit the changes.'
    74         echo 'Then push changes to github.'
     74fi
     75# -----------------------------------------------------------------------------
     76svn_hash=`svn log $svn_repository/stable/$stable_version --stop-on-copy | \
     77        grep 'end *hash *code:' | head -1 | sed -e 's|end *hash *code: *||'`
     78if [ "$svn_hash" != "$remote_hash" ]
     79then
     80        echo "svn hash code = $svn_hash"
     81        echo "git hash code = $remote_hash"
    7582        echo 'Then execute the following command:'
    76         echo "  bin/push_git2svn.sh stable/$stable_version"
     83        echo "  bin/push_git2svn.py stable/$stable_version"
    7784        exit 1
    7885fi
     
    8491fi
    8592git tag -a \
    86         -m "corresponds $repository/releases/$release_version" \
     93        -m "corresponds $svn_repository/releases/$release_version" \
    8794        $release_version
    8895# -----------------------------------------------------------------------------
    8996msg="Creating releases/$release_version"
    90 rep_stable="$repository/stable/$stable_version"
    91 rep_release="$repository/releases/$release_version"
     97rep_stable="$svn_repository/stable/$stable_version"
     98rep_release="$svn_repository/releases/$release_version"
    9299echo_eval svn copy $rep_stable $rep_release -m \"$msg\"
    93100# -----------------------------------------------------------------------------
     
    97104fi
    98105echo_eval cd build
    99 echo_eval svn checkout $repository/conf conf
     106echo_eval svn checkout $svn_repository/conf conf
    100107#
    101108echo_eval cd conf
  • stable/20150000/cppad/local/parallel_ad.hpp

    r2765 r3619  
    9191        ErrorHandler::Current();
    9292        NumArg(BeginOp);
     93        NumRes(BeginOp);
    9394        one_element_std_set<size_t>();
    9495        two_element_std_set<size_t>();
  • stable/20150000/multi_thread/pthread/CMakeLists.txt

    r3114 r3619  
    1515# Specifies build type for this directory. Possible values are
    1616# empty, Debug, Release, RelWithDebInfo and MinSizeRel
    17 SET(CMAKE_BUILD_TYPE RELEASE)
     17SET(CMAKE_BUILD_TYPE DEBUG)
    1818
    1919# Local include directories to search (not in package_prefix/include)
Note: See TracChangeset for help on using the changeset viewer.