Changeset 2940


Ignore:
Timestamp:
Oct 14, 2013 12:14:52 PM (6 years ago)
Author:
bradbell
Message:

Working on getting jenkins.sh (with adolc) to run under cygwin.

get_adolc.sh: for cygwin: special edits version 2.3.0 and build static only.
get_colpack.sh: cygwin: build static only

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/get_adolc.sh

    r2939 r2940  
    105105echo_eval cd ADOL-C-$version
    106106# -----------------------------------------------------------------------------
     107system=`uname | tr [A-Z] [a-z] | sed -e 's|\([a-z][a-z]*\).*|\1|'`
     108if [ "$system" == 'cygwin' ] && [ "$version" == '2.3.0' ]
     109then
     110        # see http://list.coin-or.org/pipermail/adol-c/2012-April/000814.html
     111        echo 'changing ADOL-C/src/adouble.cpp'
     112        sed \
     113                -e '/^double fmin(/,/^}/s|^|// |' \
     114                -e '/^double fmax(/,/^}/s|^|// |' \
     115                -i 'ADOL-C/src/adouble.cpp'
     116        echo 'changing ADOL-C/src/adouble.h'
     117        sed \
     118                -e '/^double [A-Z_]* fmin(/s|^|// |' \
     119                -e '/^double [A-Z_]* fmax(/s|^|// |' \
     120                -i 'ADOL-C/src/adouble.h'
     121fi
     122# -----------------------------------------------------------------------------
     123if which autoconf > /dev/null
     124then
     125        echo_eval autoreconf -f -i
     126fi
     127# -----------------------------------------------------------------------------
    107128if [ ! -e build ]
    108129then
     
    112133# -----------------------------------------------------------------------------
    113134flags="--prefix=$prefix --with-colpack=$prefix --libdir=$prefix/$libdir"
     135if [ "$system" == 'cygwin' ]
     136then
     137        flags="$flags --enable-static --disable-shared"
     138else
     139        flags="$flags --enable-static --enable-shared"
     140fi
    114141#
    115 echo "../configure $flags"
    116 ../configure $flags
    117 #
    118 echo "make install"
    119 make install
     142echo_eval ../configure $flags
     143echo_eval make install
    120144# -----------------------------------------------------------------------------
    121145echo "get_adolc: OK"
  • trunk/bin/get_colpack.sh

    r2939 r2940  
    9393echo_eval cd ColPack-$version
    9494# -----------------------------------------------------------------------------
    95 echo_eval rm aclocal.m4 ltmain.sh
    96 echo_eval libtoolize
    97 echo_eval autoreconf --force
     95if which autoconf > /dev/null
     96then
     97        echo_eval rm aclocal.m4 ltmain.sh
     98        echo_eval libtoolize
     99        echo_eval autoreconf --force
     100fi
     101# -----------------------------------------------------------------------------
    98102#
    99103system_name=`uname | sed -e 's|\(......\).*|\1|'`
    100 if [ "$version" == 'ColPack-1.0.9' ] && [ "$system_name" == 'CYGWIN' ]
     104if [ "$system_name" == 'CYGWIN' ]
    101105then
    102         sed -i.save \
    103                 -e 's|\(^ *enable_dlopen\)=no|\1=yes|' \
    104                 -e 's|\(^ *enable_win32_dll\)=no|\1=yes|' \
    105                 -e 's|\(^ *enable_shared\)=no|\1=yes|' \
    106                 -e 's|\(^ *enable_shared\)=no|\1=yes|' \
    107                 -e 's|\(^ *no) *enable_shared\)=no|\1=yes|' \
    108                 -e 's|\(^ *enable_static\)=yes|\1=no|' \
    109                 -e 's|\(^ *yes) *enable_static\)=yes|\1=no|' \
    110                 -e 's|\(^ *enable_shared_with_static_runtimes\)=no|\1=yes|' \
    111                 -e 's|\(^ *enable_shared_with_static_runtimes_CXX\)=no|\1=yes|' \
    112                 configure
     106        lib_type='--enable-static --disable-shared'
     107else
     108        lib_type='--enable-static --enable-shared'
    113109fi
    114110echo_eval ./configure \
    115111        --prefix=$prefix \
    116112        --libdir=$prefix/$libdir \
    117         --enable-shared
    118 if [ "$version" == 'ColPack-1.0.9' ] && [ "$system_name" == 'CYGWIN' ]
    119 then
    120         sed -i.save \
    121                 -e 's|\(^ *allow_undefined\)=yes|\1=no|' \
    122                 libtool
    123 fi
     113        $lib_type
     114#
    124115echo_eval make install
    125116# -----------------------------------------------------------------------------
  • trunk/bin/jenkins.sh

    r2939 r2940  
    6262# -----------------------------------------------------------------------
    6363# The following test can be used to skip install of other packages
    64 skip='false'
     64skip='true'
    6565if [ "$skip" != 'true' ]
    6666then
    67         # ----------------------------------------------------------------------
     67        # -------------------------------------------------------------------
    6868        # Running bin/get_fadbad.sh will install include files in
    6969        #       $trunk_dir/build/prefix/include/FADBAD++
    7070        log_eval bin/get_fadbad.sh
    71         # ----------------------------------------------------------------------
     71        # -------------------------------------------------------------------
    7272        # Running bin/get_eigen.sh will install include files in
    7373        #       $trunk_dir/build/prefix/include/Eigen
    7474        log_eval bin/get_eigen.sh
    75         # ----------------------------------------------------------------------
     75        # -------------------------------------------------------------------
    7676        # Running bin/get_ipopt.sh will install include files in
    7777        #       $trunk_dir/build/prefix/include/coin
    7878        # and library files in
    7979        #       $trunk_dir/build/prefix/$libdir
    80         # where $libdir is 'lib64' if /usr/lib64 exists and just 'lib' otherwise.
     80        # where $libdir is 'lib64' if /usr/lib64 exists and 'lib' otherwise.
    8181        log_eval bin/get_ipopt.sh
    82         # ----------------------------------------------------------------------
     82        # -------------------------------------------------------------------
    8383        # Running bin/get_sacado.sh will install include files in
    8484        #       $trunk_dir/build/prefix/include
     
    8686        #       $trunk_dir/build/prefix/$libdir
    8787        log_eval bin/get_sacado.sh
    88         # ----------------------------------------------------------------------
     88        # -------------------------------------------------------------------
    8989        # Running bin/get_acolc.sh will install include files in
    9090        #       $trunk_dir/build/prefix/include/adolc
     
    9393        log_eval bin/get_colpack.sh
    9494        log_eval bin/get_adolc.sh
    95         # ----------------------------------------------------------------------
     95        # -------------------------------------------------------------------
    9696fi
    9797# -----------------------------------------------------------------------
     
    122122$trunk_dir/configure \\
    123123        $build_type \\
     124        ADOLC_DIR="$trunk_dir/build/prefix" \\
    124125        SACADO_DIR="$trunk_dir/build/prefix" \\
    125126        EIGEN_DIR="$trunk_dir/build/prefix" \\
  • trunk/example/makefile.am

    r2892 r2940  
    1818ADOLC_SRC_FILES    =  mul_level_adolc.cpp mul_level_adolc_ode.cpp
    1919ADOLC_EXTRA_FILES  =
    20 ADOLC_LIB          = -ladolc -L$(ADOLC_DIR)/lib -L$(ADOLC_DIR)/lib64
     20ADOLC_LIB          = -ladolc -lColPack -L$(ADOLC_DIR)/lib -L$(ADOLC_DIR)/lib64
    2121ADOLC_FLAGS        = -DCPPAD_ADOLC_EXAMPLES -I$(ADOLC_DIR)/include
    2222else
  • trunk/example/makefile.in

    r2895 r2940  
    371371@CppAD_ADOLC_TRUE@ADOLC_EXTRA_FILES =
    372372@CppAD_ADOLC_FALSE@ADOLC_LIB =
    373 @CppAD_ADOLC_TRUE@ADOLC_LIB = -ladolc -L$(ADOLC_DIR)/lib -L$(ADOLC_DIR)/lib64
     373@CppAD_ADOLC_TRUE@ADOLC_LIB = -ladolc -lColPack -L$(ADOLC_DIR)/lib -L$(ADOLC_DIR)/lib64
    374374@CppAD_ADOLC_FALSE@ADOLC_FLAGS =
    375375@CppAD_ADOLC_TRUE@ADOLC_FLAGS = -DCPPAD_ADOLC_EXAMPLES -I$(ADOLC_DIR)/include
  • trunk/example/test_one.sh.in

    r2780 r2940  
    6868        if [ -e @adolc_prefix@/$lib ]
    6969        then
    70                 cmd="$cmd -L@adolc_prefix@/$lib -ladolc"
     70                cmd="$cmd -L@adolc_prefix@/$lib -ladolc -lColPack"
    7171                export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:@adolc_prefix@/$lib"
    7272        fi
  • trunk/speed/adolc/makefile.am

    r2506 r2940  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
     
    3232# END DEBUG
    3333#
    34 LDADD            = -lspeed -ladolc
     34LDADD            = -lspeed -ladolc -lColPack
    3535AM_LDFLAGS       = -L../src -L$(ADOLC_DIR)/lib -L$(ADOLC_DIR)/lib64
    3636#
  • trunk/speed/adolc/makefile.in

    r2885 r2940  
    285285# END DEBUG
    286286#
    287 LDADD = -lspeed -ladolc
     287LDADD = -lspeed -ladolc -lColPack
    288288AM_LDFLAGS = -L../src -L$(ADOLC_DIR)/lib -L$(ADOLC_DIR)/lib64
    289289#
  • trunk/test_more/makefile.am

    r2859 r2940  
    2525ADOLC_SRC_FILES   = base_adolc.cpp
    2626ADOLC_EXTRA_FILES =
    27 ADOLC_LIB         = -ladolc -L$(ADOLC_DIR)/lib -L$(ADOLC_DIR)/lib64
     27ADOLC_LIB         = -ladolc -lColPack -L$(ADOLC_DIR)/lib -L$(ADOLC_DIR)/lib64
    2828ADOLC_FLAGS       = -DCPPAD_ADOLC_TEST -I$(ADOLC_DIR)/include
    2929else
  • trunk/test_more/makefile.in

    r2885 r2940  
    345345@CppAD_ADOLC_TRUE@ADOLC_EXTRA_FILES =
    346346@CppAD_ADOLC_FALSE@ADOLC_LIB =
    347 @CppAD_ADOLC_TRUE@ADOLC_LIB = -ladolc -L$(ADOLC_DIR)/lib -L$(ADOLC_DIR)/lib64
     347@CppAD_ADOLC_TRUE@ADOLC_LIB = -ladolc -lColPack -L$(ADOLC_DIR)/lib -L$(ADOLC_DIR)/lib64
    348348@CppAD_ADOLC_FALSE@ADOLC_FLAGS =
    349349@CppAD_ADOLC_TRUE@ADOLC_FLAGS = -DCPPAD_ADOLC_TEST -I$(ADOLC_DIR)/include
  • trunk/test_more/test_one.sh.in

    r2859 r2940  
    6464        if [ -e @adolc_prefix@/$lib ]
    6565        then
    66                 cmd="$cmd -L@adolc_prefix@/$lib -ladolc"
     66                cmd="$cmd -L@adolc_prefix@/$lib -ladolc -lColPack"
    6767                export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:@adolc_prefix@/$lib"
    6868        fi
Note: See TracChangeset for help on using the changeset viewer.