Changeset 3632


Ignore:
Timestamp:
Aug 9, 2016 12:29:26 PM (3 years ago)
Author:
stefan
Message:

merge r3631 from trunk: replaced tabs by spaces in run_autotools

Location:
stable/0.8
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.8

    • Property svn:mergeinfo changed
      /trunkmerged: 3631
  • stable/0.8/run_autotools

    r2365 r3632  
    1010#
    1111# Author: Andreas Waechter     IBM      2006-04-14
    12 # Modified: Lou Hafer          SFU      2010-06-11
     12# Modified: Lou Hafer          SFU      2010-06-11
    1313#      Mods to allow variations from standard package structure. Decision to
    1414#      process a configure.ac file is based on presence of COIN macros.
    1515#      Directories specified on the command line are recursively searched
    1616#      for configure.ac files. Install-sh signals an independent unit.
    17 # Modified: Lou Hafer          SFU      2010-07-08
     17# Modified: Lou Hafer          SFU      2010-07-08
    1818#      More mods to maintain flexibility but be a bit less aggressive about
    1919#      forcing installation of autotools auxilliary scripts. Also add some
     
    170170  case "$1" in
    171171    -h* | --h* )
    172         printHelp=1
    173         ;;
     172      printHelp=1
     173      ;;
    174174    -nr* | --no-recursion )
    175         doRecurse=0
    176         ;;
     175      doRecurse=0
     176      ;;
    177177    -i | --independent )
    178         forceScripts=1
    179         doRecurse=0
    180         ;;
     178      forceScripts=1
     179      doRecurse=0
     180      ;;
    181181    -* ) echo "$0: unrecognised command line switch '"$1"'."
    182         printHelp=1
    183         ;;
     182      printHelp=1
     183      ;;
    184184     * ) dirsToProcess="$dirsToProcess $1"
    185         userSpecifiedDirs=1
    186         ;;
     185      userSpecifiedDirs=1
     186      ;;
    187187  esac
    188188  shift
     
    236236    case "$candDirs" in
    237237      *"$tmp"* )
    238           ;;
     238        ;;
    239239      * )
    240           candDirs="$candDirs $tmp"
    241           ;;
     240        candDirs="$candDirs $tmp"
     241        ;;
    242242      esac
    243243  done
     
    275275      skip=0
    276276      for skipdir in $skip_dirs ; do
    277         if test $dir = $skipdir ; then
    278           skip=1
    279           break
    280         fi
     277        if test $dir = $skipdir ; then
     278          skip=1
     279          break
     280        fi
    281281      done
    282282      if test $skip = 0 ; then
    283         dirs="$dirs $dir"
     283        dirs="$dirs $dir"
    284284      else
    285         echo "  Skipping $dir listed in COIN_SKIP_PROJECTS."
     285        echo "  Skipping $dir listed in COIN_SKIP_PROJECTS."
    286286      fi
    287287    done
     
    324324    if test -f Makefile.am || test $needScripts = 1 ; then
    325325      if test -d BuildTools || test -L BuildTools ; then
    326         createLink=0
    327         toolsDir=`pwd`/BuildTools
     326        createLink=0
     327        toolsDir=`pwd`/BuildTools
    328328      else
    329         createLink=1
    330         toolsDir=$runautotoolDir
     329        createLink=1
     330        toolsDir=$runautotoolDir
    331331      fi
    332332      echo "  BuildTools directory: $toolsDir"
     
    335335
    336336      if test $createLink = 0 && test "$toolsDir" != "$runautotoolDir" ; then
    337         echo "WARNING: using run_autotools from $runautotoolDir"
    338         echo "         but BuildTools is $toolsDir."
    339         echo "         Consider carefully if this is what you wanted to do."
     337        echo "WARNING: using run_autotools from $runautotoolDir"
     338        echo "         but BuildTools is $toolsDir."
     339        echo "         Consider carefully if this is what you wanted to do."
    340340      fi
    341341
     
    343343
    344344      if test ! -r $toolsDir/coin.m4 ; then
    345         echo "Cannot find Coin autotools macro file $toolsDir/coin.m4."
    346         echo "It should be in the BuildTools directory."
    347         exit 1
     345        echo "Cannot find Coin autotools macro file $toolsDir/coin.m4."
     346        echo "It should be in the BuildTools directory."
     347        exit 1
    348348      fi
    349349
     
    351351
    352352      if test $createLink = 1 ; then
    353         ln -s $toolsDir BuildTools
    354         buildtoolsLinks="$buildtoolsLinks `pwd`/BuildTools"
    355         echo "  creating temporary link for ./BuildTools -> $toolsDir"
     353        ln -s $toolsDir BuildTools
     354        buildtoolsLinks="$buildtoolsLinks `pwd`/BuildTools"
     355        echo "  creating temporary link for ./BuildTools -> $toolsDir"
    356356      fi
    357357
     
    359359
    360360      if test $needScripts = 1 ; then
    361         echo "  refreshing autotools scripts in this directory."
    362         for file in $autotoolsFiles ; do
    363           cp BuildTools/$file .
    364         done
     361        echo "  refreshing autotools scripts in this directory."
     362        for file in $autotoolsFiles ; do
     363          cp BuildTools/$file .
     364        done
    365365      fi
    366366
Note: See TracChangeset for help on using the changeset viewer.