Changeset 4051


Ignore:
Timestamp:
Jan 9, 2020 11:47:41 PM (5 months ago)
Author:
stefan
Message:

add COIN-OR version of glpk config files

  • adapt captureConfigFiles to store them in dir glpk_config_files
  • adapt get.Glpk to copy them from glpk_config_files
  • rename glpk-4.65_config.patch to glpk_config.patch, as everything is 4.65 specific here anyway
Location:
ThirdParty/Glpk/branches/autotools-update
Files:
17 added
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/branches/autotools-update/captureConfigFiles

    r4050 r4051  
    44# glpk's configure.ac, src/Makefile.am, and examples/Makefile.am and running
    55# run_autotools.
     6# This assumes that the right run_autotools is found in your PATH!
    67
    78# Note that glpk's config.h.in is hand-crafted. We don't want the new,
    89# autogenerated version.
    910
     11set -e
     12
    1013wgetcmd=wget
    1114glpk_ver=4.65
    1215
    13 glpk_config_patch=glpk-${glpk_ver}_config.patch
    14 glpk_config_tar=glpk-${glpk_ver}_config.tar
    15 
    16 if [[ ! -r "$glpk_config_patch" ]] ; then
    17   echo "Cannot find configuration patch file '$glpk_config_patch'. Aborting"
     16if [[ ! -r glpk_config.patch ]] ; then
     17  echo "Cannot find configuration patch file glpk_config.patch. Aborting"
    1818  exit 1
    1919fi
     
    4949
    5050echo "Patching configuration source files ..."
    51 patch -p0 < ${glpk_config_patch}
     51patch -p0 < glpk_config.patch
    5252
    5353echo "Running autotools on patched source ..."
    5454run_autotools -f glpk
    5555
    56 echo "Capturing modified configuration files ..."
    57 pushd glpk &>/dev/null
    58 tar cf ../${glpk_config_tar} "${newConfigFiles[@]}"
    59 popd &>/dev/null
    60 
     56echo "Capturing modified configuration files in glpk_config_files/..."
     57for f in "${newConfigFiles[@]}" ; do
     58  mkdir -p `dirname glpk_config_files/$f`
     59  cp -f glpk/$f glpk_config_files/$f
     60done
  • ThirdParty/Glpk/branches/autotools-update/get.Glpk

    r4050 r4051  
    33set -e
    44glpk_ver=4.65
    5 glpk_config_tar=glpk-${glpk_ver}_config.tar
    65
    76wgetcmd=wget
     
    5049echo " "
    5150echo "Done downloading the source code for GLPK."
    52 echo "Applying patch file."
    5351
    54 if test -r "$glpk_config_tar" ; then
    55   echo "Installing modified configuration files."
    56   tar -x -f ${glpk_config_tar} --directory=glpk
    57 fi
     52echo "Installing modified configuration files."
     53cp -r glpk_config_files/* glpk/
    5854
    5955echo "Touch every source file to force rebuild of whole package."
Note: See TracChangeset for help on using the changeset viewer.