Changeset 3722


Ignore:
Timestamp:
Sep 5, 2015 9:14:17 AM (4 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 5967e213f6fd2be5adf4adef224b3c86f6532496
end hash code: 03e21303245f1a5f0c4c0ff3d60409b793bf1f76

commit 03e21303245f1a5f0c4c0ff3d60409b793bf1f76
Author: Brad Bell <bradbell@…>
Date: Sat Sep 5 06:12:12 2015 -0700

Remove invisible white space and index commands that are no longer useful.

commit e15cd567e7e5cd61d0705727b001b7b846d28c8a
Author: Brad Bell <bradbell@…>
Date: Sat Sep 5 06:10:35 2015 -0700

Trying to get autotools build to work using jenkins and svn (push to git first).

Location:
trunk/bin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/get_adolc.sh

    r3488 r3722  
    22# $Id$
    33# -----------------------------------------------------------------------------
    4 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     4# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    55#
    66# CppAD is distributed under multiple licenses. This distribution is under
    7 # the terms of the 
     7# the terms of the
    88#                     Eclipse Public License Version 1.0.
    99#
     
    2020#
    2121# $section Download and Install Adolc in Build Directory$$
    22 # $index adolc, download and install$$
    23 # $index download, install adolc$$
    24 # $index install, adolc$$
    2522#
    2623# $head Syntax$$
     
    2825#
    2926# $head Purpose$$
    30 # If you are using Unix, this command will download and install 
     27# If you are using Unix, this command will download and install
    3128# $href%https://projects.coin-or.org/ADOL-C%ADOL-C%$$ in the
    3229# CppAD $code build$$ directory.
     
    3734#
    3835# $head Distribution Directory$$
    39 # This command must be executed in the 
     36# This command must be executed in the
    4037# $cref/distribution directory/download/Distribution Directory/$$.
    4138#
     
    110107if which autoconf >& /dev/null
    111108then
    112         ac_version=`autoconf --version | sed -n -e '/^autoconf/p' | \
    113                 sed -e 's|[^0-9]*\([0-9.]*\)[.]\([0-9]*\).*|\1 * 100 + \2|' | bc`
    114         if [ "$ac_version" -ge 267 ]
    115         then
    116                 echo_eval autoreconf -f -i
    117         fi
     109        echo_eval autoreconf --install --force
    118110fi
    119111# -----------------------------------------------------------------------------
  • trunk/bin/get_colpack.sh

    r3550 r3722  
    22# $Id$
    33# -----------------------------------------------------------------------------
    4 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
     4# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    55#
    66# CppAD is distributed under multiple licenses. This distribution is under
    7 # the terms of the 
     7# the terms of the
    88#                     Eclipse Public License Version 1.0.
    99#
     
    2020#
    2121# $section Download and Install ColPack in Build Directory$$
    22 # $index colpack, download and install$$
    23 # $index download, install colpack$$
    24 # $index install, colpack$$
    25 # $index get_colpack.sh$$
    2622#
    2723# $head Syntax$$
     
    2925#
    3026# $head Purpose$$
    31 # If you are using Unix, this command will download and install 
     27# If you are using Unix, this command will download and install
    3228# $href%http://cscapes.cs.purdue.edu/dox/ColPack/html/%ColPack%$$ in the
    3329# CppAD $code build$$ directory.
    3430#
    3531# $head Distribution Directory$$
    36 # This command must be executed in the 
     32# This command must be executed in the
    3733# $cref/distribution directory/download/Distribution Directory/$$.
    3834#
     
    9894        echo_eval rm aclocal.m4 ltmain.sh
    9995        echo_eval libtoolize
    100         echo_eval autoreconf --force
     96        echo_eval autoreconf --install --force
    10197fi
    10298# -----------------------------------------------------------------------------
  • trunk/bin/jenkins.sh

    r3657 r3722  
    22# $Id$
    33# -----------------------------------------------------------------------------
    4 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
     4# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    55#
    66# CppAD is distributed under multiple licenses. This distribution is under
     
    121121fi
    122122# -----------------------------------------------------------------------
     123if which autoconf >& /dev/null
     124then
     125        echo_eval autoreconf --install --force
     126fi
     127# -----------------------------------------------------------------------
    123128# Use trunk_dir/../build to build and test CppAD (no reuse)
    124129echo_eval cd build
Note: See TracChangeset for help on using the changeset viewer.