Changeset 3728


Ignore:
Timestamp:
Sep 22, 2015 11:37:16 PM (4 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 0603e033afebe957046312a39fab9b2d66aa7a83
end hash code: 0377abb3f245287b4fdd087213d00c7206d332d3

commit 0377abb3f245287b4fdd087213d00c7206d332d3
Author: Brad Bell <bradbell@…>
Date: Tue Sep 22 20:36:11 2015 -0700

Remove invisible white space.

commit da2560efe2700c8b19175fee186752e609de470f
Author: Brad Bell <bradbell@…>
Date: Tue Sep 22 20:35:55 2015 -0700

get_sacado.sh: add patch to trilinos install procedure.

commit 3ba444a12dd1d4af2331ca4044620db5a41a656e
Author: Brad Bell <bradbell@…>
Date: Tue Sep 22 10:46:23 2015 -0700

download.omh: improve formatting in DOS path settings commands.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/get_sacado.sh

    r3657 r3728  
    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#
     
    2222# $index sacado, download and install$$
    2323# $index download, install sacado$$
    24 # $index install, sacado$$ 
     24# $index install, sacado$$
    2525#
    2626# $head Syntax$$
     
    2828#
    2929# $head Purpose$$
    30 # If you are using Unix, this command will download and install 
     30# If you are using Unix, this command will download and install
    3131# $href%http://trilinos.sandia.gov/packages/sacado%Sacado%$$ in the
    3232# CppAD $code build$$ directory.
    3333#
    3434# $head Distribution Directory$$
    35 # This command must be executed in the 
     35# This command must be executed in the
    3636# $cref/distribution directory/download/Distribution Directory/$$.
    3737#
     
    9898fi
    9999# -----------------------------------------------------------------------------
     100# libdir
    100101if [ -e /usr/lib64 ]
    101102then
     
    116117echo "coin_lapack_blas=$coin_lapack_blas"
    117118# -----------------------------------------------------------------------------
     119# change into build/external directory
    118120if [ ! -d build/external ]
    119121then
     
    122124echo_eval cd build/external
    123125# -----------------------------------------------------------------------------
     126# create the trilions source directory and change into it
    124127if [ ! -e "$version.tar.gz" ]
    125128then
    126129        echo_eval wget --no-check-certificate $web_page/$version.tar.gz
    127130fi
    128 for package in Sacado Teuchos Trilinois 
     131for package in Sacado Teuchos Trilinois
    129132do
    130133        echo_eval rm -rf $prefix/include/$package*
    131 done 
     134done
    132135if [ ! -e "$version" ]
    133136then
    134137        echo_eval tar -xzf $version.tar.gz
     138        # ------------------------------------------------------------------------
     139        # patch the cmake/tribits/modules/FindPythonInterp.cmake file
     140        file="$version/cmake/tribits/modules/FindPythonInterp.cmake"
     141        line='[HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\Python\\\\PythonCore\\\\2.8\\\\'
     142        line="${line}InstallPath]"
     143        if [ -e "$file" ]
     144        then
     145                echo "patch $file"
     146                sed \
     147                        -e 's|NAMES \(python2.7 python2.6\)|NAMES python2.8 \1|' \
     148                        -e "s|^\( *\)\[HKEY_LOCAL_MACHINE.*2\.7.*|\1$line\n&|" \
     149                        -i $file
     150        fi
     151        # ------------------------------------------------------------------------
    135152fi
    136 #
    137153echo_eval cd $version
     154# -----------------------------------------------------------------------------
     155# change into build sub-directory
    138156if [ ! -e build ]
    139157then
     
    141159fi
    142160echo_eval cd build
     161# -----------------------------------------------------------------------------
     162# cmake command
    143163if [ "$coin_lapack_blas" == 'yes' ]
    144164then
  • trunk/omh/install/download.omh

    r3726 r3728  
    152152$lnext
    153153In a command window, execute the following commands:
    154 $codei%
    155         set PATH=%path_to_7_zip%;%PATH%
    156         set PATH=%path_to_cmake%;%PATH%
    157         set VCDIR=%path_to_vcdir%;%PATH%
     154$codei|
     155        set PATH=|path_to_7_zip|;%PATH%
     156        set PATH=|path_to_cmake|;%PATH%
     157        set VCDIR=|path_to_vcdir|;%PATH%
    158158        call "%VCDIR%\vcvarsall.bat" x86
    159 %$$
     159|$$
    160160For example, on one machine these paths had the following values:
    161 $codei%
    162         %path_to_7_zip%=C:\Program Files\7-zip
    163         %path_to_cmake%=C:\Program Files (x86)\CMake\bin
    164         %path_to_vcdir%=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
    165 %$$
     161$codei|
     162        |path_to_7_zip|=C:\Program Files\7-zip
     163        |path_to_cmake|=C:\Program Files (x86)\CMake\bin
     164        |path_to_vcdir|=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
     165|$$
    166166$lnext
    167167Use the following commands to extract the distribution from the tarball:
Note: See TracChangeset for help on using the changeset viewer.