COIN-OR::LEMON - Graph Library

Ticket #186: 3af1acfc8c45.patch

File 3af1acfc8c45.patch, 1.8 KB (added by Peter Kovacs, 11 years ago)
  • scripts/unify-sources.sh

    # HG changeset patch
    # User Peter Kovacs <kpeter@inf.elte.hu>
    # Date 1228065136 -3600
    # Node ID 3af1acfc8c4526d39c1228171687d080d6134f47
    # Parent  0c5dd7ceda033c6e2292d1c220c15b38291476fd
    Small improvements for scripts
    
     - unify-sources: errors can also be accepted when used as a hg hook.
     - lemon-0.x-to-1.x: rename _graph and _Graph iff they are whole words.
    
    diff --git a/scripts/unify-sources.sh b/scripts/unify-sources.sh
    a b  
    130130    echo $FAILED_FILES out of $TOTAL_FILES files has been failed.
    131131    echo $WARNED_FILES out of $TOTAL_FILES files triggered warnings.
    132132
    133     if [ $FAILED_FILES -gt 0 ]
    134     then
    135         return 1
    136     elif [ $WARNED_FILES -gt 0 ]
     133    if [ $WARNED_FILES -gt 0 -o $FAILED_FILES -gt 0 ]
    137134    then
    138135        if [ "$WARNING" == 'INTERACTIVE' ]
    139136        then
    140             echo -n "Are the files with warnings acceptable? (yes/no) "
     137            echo -n "Are the files with errors/warnings acceptable? (yes/no) "
    141138            while read answer
    142139            do
    143140                if [ "$answer" == 'yes' ]
     
    147144                then
    148145                    return 1
    149146                fi
    150                 echo -n "Are the files with warnings acceptable? (yes/no) "
     147                echo -n "Are the files with errors/warnings acceptable? (yes/no) "
    151148            done
    152149        elif [ "$WARNING" == 'WERROR' ]
    153150        then
  • tools/lemon-0.x-to-1.x.sh

    diff --git a/tools/lemon-0.x-to-1.x.sh b/tools/lemon-0.x-to-1.x.sh
    a b  
    2626        -e "s/\<graph\>/_digr_aph_label_/g"\
    2727        -e "s/\<Graphs\>/_Digr_aph_label_s/g"\
    2828        -e "s/\<graphs\>/_digr_aph_label_s/g"\
     29        -e "s/\<_graph\>/__digr_aph_label_/g"\
     30        -e "s/\<_Graph\>/__Digr_aph_label_/g"\
    2931        -e "s/_Graph/__Gr_aph_label_/g"\
    3032        -e "s/\([Gg]\)raph\([a-z_]\)/_\1r_aph_label_\2/g"\
    3133        -e "s/\([a-z_]\)graph/\1_gr_aph_label_/g"\