Changeset 0e2190 for util


Ignore:
Timestamp:
Aug 3, 2009, 6:58:46 PM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
f4a346
Parents:
4e4940 (diff), e8de2e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'ConcaveHull' of ​ssh://heber@192.168.194.2/home/metzler/workspace/espack into ConcaveHull

Conflicts:

molecuilder/src/atom.cpp
molecuilder/src/boundary.cpp
molecuilder/src/boundary.hpp
molecuilder/src/linkedcell.cpp
molecuilder/src/linkedcell.hpp
molecuilder/src/molecules.hpp
molecuilder/src/vector.hpp

  • added Saskia Metzler's code that finds whether a point is in- or outside.
  • The code is not yet incorporated, but I rather want to continue with merging TesselationRefactoring first.
Location:
util
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • util/depcomp

    r4e4940 r0e2190  
    22# depcomp - compile a program generating dependencies as side-effects
    33
    4 scriptversion=2007-03-29.01
    5 
    6 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
     4scriptversion=2006-10-15.18
     5
     6# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
    77# Foundation, Inc.
    88
    … …  
    216216  # start of each line; $object doesn't have directory information.
    217217  # Version 6 uses the directory in both cases.
    218   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
    219   test "x$dir" = "x$object" && dir=
    220   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
     218  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
     219  tmpdepfile="$stripped.u"
    221220  if test "$libtool" = yes; then
    222     tmpdepfile1=$dir$base.u
    223     tmpdepfile2=$base.u
    224     tmpdepfile3=$dir.libs/$base.u
    225221    "$@" -Wc,-M
    226222  else
    227     tmpdepfile1=$dir$base.u
    228     tmpdepfile2=$dir$base.u
    229     tmpdepfile3=$dir$base.u
    230223    "$@" -M
    231224  fi
    232225  stat=$?
    233226
     227  if test -f "$tmpdepfile"; then :
     228  else
     229    stripped=`echo "$stripped" | sed 's,^.*/,,'`
     230    tmpdepfile="$stripped.u"
     231  fi
     232
    234233  if test $stat -eq 0; then :
    235234  else
    236     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     235    rm -f "$tmpdepfile"
    237236    exit $stat
    238237  fi
    239238
    240   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
    241   do
    242     test -f "$tmpdepfile" && break
    243   done
    244239  if test -f "$tmpdepfile"; then
     240    outname="$stripped.o"
    245241    # Each line is of the form `foo.o: dependent.h'.
    246242    # Do two passes, one to just change these to
    247243    # `$object: dependent.h' and one to simply `dependent.h:'.
    248     sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
    249     # That's a tab and a space in the [].
    250     sed -e 's,^.*\.[a-z]*:[      ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
     244    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
     245    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
    251246  else
    252247    # The sourcefile does not contain any dependencies, so just

  • util/install-sh

    r4e4940 r0e2190  
    22# install - install a program, script, or datafile
    33
    4 scriptversion=2006-12-25.00
     4scriptversion=2006-10-14.15
    55
    66# This originates from X11R5 (mit/util/scripts/install.sh), which was
    … …  
    4949
    5050# Don't use :- since 4.3BSD and earlier shells don't like it.
    51 doit=${DOITPROG-}
     51doit="${DOITPROG-}"
    5252if test -z "$doit"; then
    5353  doit_exec=exec
    … …  
    5959# or use environment vars.
    6060
    61 chgrpprog=${CHGRPPROG-chgrp}
    62 chmodprog=${CHMODPROG-chmod}
    63 chownprog=${CHOWNPROG-chown}
    64 cmpprog=${CMPPROG-cmp}
    65 cpprog=${CPPROG-cp}
    66 mkdirprog=${MKDIRPROG-mkdir}
    67 mvprog=${MVPROG-mv}
    68 rmprog=${RMPROG-rm}
    69 stripprog=${STRIPPROG-strip}
    70 
    71 posix_glob='?'
    72 initialize_posix_glob='
    73   test "$posix_glob" != "?" || {
    74     if (set -f) 2>/dev/null; then
    75       posix_glob=
    76     else
    77       posix_glob=:
    78     fi
    79   }
    80 '
    81 
     61mvprog="${MVPROG-mv}"
     62cpprog="${CPPROG-cp}"
     63chmodprog="${CHMODPROG-chmod}"
     64chownprog="${CHOWNPROG-chown}"
     65chgrpprog="${CHGRPPROG-chgrp}"
     66stripprog="${STRIPPROG-strip}"
     67rmprog="${RMPROG-rm}"
     68mkdirprog="${MKDIRPROG-mkdir}"
     69
     70posix_glob=
    8271posix_mkdir=
    8372
    … …  
    8574mode=0755
    8675
    87 chgrpcmd=
    8876chmodcmd=$chmodprog
    8977chowncmd=
    90 mvcmd=$mvprog
     78chgrpcmd=
     79stripcmd=
    9180rmcmd="$rmprog -f"
    92 stripcmd=
    93 
     81mvcmd="$mvprog"
    9482src=
    9583dst=
    9684dir_arg=
    97 dst_arg=
    98 
    99 copy_on_change=false
     85dstarg=
    10086no_target_directory=
    10187
    102 usage="\
    103 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
     88usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    10489   or: $0 [OPTION]... SRCFILES... DIRECTORY
    10590   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    … …  
    11196
    11297Options:
    113      --help     display this help and exit.
    114      --version  display version info and exit.
    115 
    116   -c            (ignored)
    117   -C            install only if different (preserve the last data modification time)
    118   -d            create directories instead of installing files.
    119   -g GROUP      $chgrpprog installed files to GROUP.
    120   -m MODE       $chmodprog installed files to MODE.
    121   -o USER       $chownprog installed files to USER.
    122   -s            $stripprog installed files.
    123   -t DIRECTORY  install into DIRECTORY.
    124   -T            report an error if DSTFILE is a directory.
     98-c         (ignored)
     99-d         create directories instead of installing files.
     100-g GROUP   $chgrpprog installed files to GROUP.
     101-m MODE    $chmodprog installed files to MODE.
     102-o USER    $chownprog installed files to USER.
     103-s         $stripprog installed files.
     104-t DIRECTORY  install into DIRECTORY.
     105-T         report an error if DSTFILE is a directory.
     106--help     display this help and exit.
     107--version  display version info and exit.
    125108
    126109Environment variables override the default commands:
    127   CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
    128   RMPROG STRIPPROG
     110  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
    129111"
    130112
    131113while test $# -ne 0; do
    132114  case $1 in
    133     -c) ;;
    134 
    135     -C) copy_on_change=true;;
    136 
    137     -d) dir_arg=true;;
     115    -c) shift
     116        continue;;
     117
     118    -d) dir_arg=true
     119        shift
     120        continue;;
    138121
    139122    -g) chgrpcmd="$chgrpprog $2"
    140         shift;;
     123        shift
     124        shift
     125        continue;;
    141126
    142127    --help) echo "$usage"; exit $?;;
    143128
    144129    -m) mode=$2
     130        shift
     131        shift
    145132        case $mode in
    146133          *' '* | *'    '* | *'
    … …  
    149136            exit 1;;
    150137        esac
    151         shift;;
     138        continue;;
    152139
    153140    -o) chowncmd="$chownprog $2"
    154         shift;;
    155 
    156     -s) stripcmd=$stripprog;;
    157 
    158     -t) dst_arg=$2
    159         shift;;
    160 
    161     -T) no_target_directory=true;;
     141        shift
     142        shift
     143        continue;;
     144
     145    -s) stripcmd=$stripprog
     146        shift
     147        continue;;
     148
     149    -t) dstarg=$2
     150        shift
     151        shift
     152        continue;;
     153
     154    -T) no_target_directory=true
     155        shift
     156        continue;;
    162157
    163158    --version) echo "$0 $scriptversion"; exit $?;;
    … …  
    171166    *)  break;;
    172167  esac
    173   shift
    174168done
    175169
    176 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     170if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
    177171  # When -d is used, all remaining arguments are directories to create.
    178172  # When -t is used, the destination is already specified.
    … …  
    180174  for arg
    181175  do
    182     if test -n "$dst_arg"; then
     176    if test -n "$dstarg"; then
    183177      # $@ is not empty: it contains at least $arg.
    184       set fnord "$@" "$dst_arg"
     178      set fnord "$@" "$dstarg"
    185179      shift # fnord
    186180    fi
    187181    shift # arg
    188     dst_arg=$arg
     182    dstarg=$arg
    189183  done
    190184fi
    … …  
    231225  # Protect names starting with `-'.
    232226  case $src in
    233     -*) src=./$src;;
     227    -*) src=./$src ;;
    234228  esac
    235229
    … …  
    249243    fi
    250244
    251     if test -z "$dst_arg"; then
     245    if test -z "$dstarg"; then
    252246      echo "$0: no destination specified." >&2
    253247      exit 1
    254248    fi
    255249
    256     dst=$dst_arg
     250    dst=$dstarg
    257251    # Protect names starting with `-'.
    258252    case $dst in
    259       -*) dst=./$dst;;
     253      -*) dst=./$dst ;;
    260254    esac
    261255
    … …  
    264258    if test -d "$dst"; then
    265259      if test -n "$no_target_directory"; then
    266         echo "$0: $dst_arg: Is a directory" >&2
     260        echo "$0: $dstarg: Is a directory" >&2
    267261        exit 1
    268262      fi
    … …  
    385379
    386380      case $dstdir in
    387         /*) prefix='/';;
    388         -*) prefix='./';;
    389         *)  prefix='';;
     381        /*) prefix=/ ;;
     382        -*) prefix=./ ;;
     383        *)  prefix= ;;
    390384      esac
    391385
    392       eval "$initialize_posix_glob"
     386      case $posix_glob in
     387        '')
     388          if (set -f) 2>/dev/null; then
     389            posix_glob=true
     390          else
     391            posix_glob=false
     392          fi ;;
     393      esac
    393394
    394395      oIFS=$IFS
    395396      IFS=/
    396       $posix_glob set -f
     397      $posix_glob && set -f
    397398      set fnord $dstdir
    398399      shift
    399       $posix_glob set +f
     400      $posix_glob && set +f
    400401      IFS=$oIFS
    401402
    … …  
    459460    # errors from the above "$doit $cpprog $src $dsttmp" command.
    460461    #
    461     { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
    462     { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
    463     { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
    464     { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
    465 
    466     # If -C, don't bother to copy if it wouldn't change the file.
    467     if $copy_on_change &&
    468        old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
    469        new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
    470 
    471        eval "$initialize_posix_glob" &&
    472        $posix_glob set -f &&
    473        set X $old && old=:$2:$4:$5:$6 &&
    474        set X $new && new=:$2:$4:$5:$6 &&
    475        $posix_glob set +f &&
    476 
    477        test "$old" = "$new" &&
    478        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
    479     then
    480       rm -f "$dsttmp"
    481     else
    482       # Rename the file to the real destination.
    483       $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
    484 
    485       # The rename failed, perhaps because mv can't rename something else
    486       # to itself, or perhaps because mv is so ancient that it does not
    487       # support -f.
    488       {
    489         # Now remove or move aside any old file at destination location.
    490         # We try this two ways since rm can't unlink itself on some
    491         # systems and the destination file might be busy for other
    492         # reasons.  In this case, the final cleanup might fail but the new
    493         # file should still install successfully.
    494         {
    495           test ! -f "$dst" ||
    496           $doit $rmcmd -f "$dst" 2>/dev/null ||
    497           { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
    498             { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
    499           } ||
    500           { echo "$0: cannot unlink or rename $dst" >&2
    501             (exit 1); exit 1
    502           }
    503         } &&
    504 
    505         # Now rename the file to the real destination.
    506         $doit $mvcmd "$dsttmp" "$dst"
    507       }
    508     fi || exit 1
     462    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
     463      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
     464      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
     465      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
     466
     467    # Now rename the file to the real destination.
     468    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
     469      || {
     470           # The rename failed, perhaps because mv can't rename something else
     471           # to itself, or perhaps because mv is so ancient that it does not
     472           # support -f.
     473
     474           # Now remove or move aside any old file at destination location.
     475           # We try this two ways since rm can't unlink itself on some
     476           # systems and the destination file might be busy for other
     477           # reasons.  In this case, the final cleanup might fail but the new
     478           # file should still install successfully.
     479           {
     480             if test -f "$dst"; then
     481               $doit $rmcmd -f "$dst" 2>/dev/null \
     482               || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
     483                     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
     484               || {
     485                 echo "$0: cannot unlink or rename $dst" >&2
     486                 (exit 1); exit 1
     487               }
     488             else
     489               :
     490             fi
     491           } &&
     492
     493           # Now rename the file to the real destination.
     494           $doit $mvcmd "$dsttmp" "$dst"
     495         }
     496    } || exit 1
    509497
    510498    trap '' 0
Note: See TracChangeset for help on using the changeset viewer.