Changeset 47154 in webkit


Ignore:
Timestamp:
Aug 12, 2009 3:15:51 PM (15 years ago)
Author:
pkasting@chromium.org
Message:

WebKitLibraries: https://bugs.webkit.org/show_bug.cgi?id=27323
Change pattern that strips all trailing whitespace to just remove EOL
chars (\r, \n), to make it clear that varying EOL chars is the primary
problem being solved.

Reviewed by Darin Adler.

  • win/tools/scripts/auto-version.sh:

WebKitTools: https://bugs.webkit.org/show_bug.cgi?id=27323
Change pattern that strips all trailing whitespace to just remove EOL
chars (\r, \n), to make it clear that varying EOL chars is the primary
problem being solved.

Reviewed by Darin Adler.

  • Scripts/prepare-ChangeLog:
  • Scripts/resolve-ChangeLogs:
  • Scripts/svn-create-patch:
  • Scripts/update-webkit:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitLibraries/ChangeLog

    r47012 r47154  
     12009-08-12  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=27323
     6        Change pattern that strips all trailing whitespace to just remove EOL
     7        chars (\r, \n), to make it clear that varying EOL chars is the primary
     8        problem being solved.
     9
     10        * win/tools/scripts/auto-version.sh:
     11
    1122009-08-10  Peter Kasting  <pkasting@google.com>
    213
  • trunk/WebKitLibraries/win/tools/scripts/auto-version.sh

    r47012 r47154  
    3030mkdir -p "$VERSIONPATH"
    3131
    32 PRODUCTVERSION=`cat $SRCPATH/PRODUCTVERSION | sed -r 's/(.*\S+)\s*$/\1/'`
     32PRODUCTVERSION=`cat $SRCPATH/PRODUCTVERSION | sed -r 's/(.+?)[\r\n]*$/\1/'`
    3333MAJORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/'`
    3434MINORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/'`
     
    4343    PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION"
    4444fi
    45 PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(.*\S+)\s*$/\1/'`
     45PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(.+?)[\r\n]*$/\1/'`
    4646
    4747BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'`
     
    5454    BLDVARIANTVERSION=0
    5555fi
    56 SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed -r 's/^Revision: (.*\S+)\s*$/\1/'`
     56SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed -r 's/^Revision: (.+?)[\r\n]*$/\1/'`
    5757
    5858BLDNMBR="$PROPOSEDVERSION"
     
    6161if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
    6262    BLDNMBRSHORT="$BLDNMBRSHORT+"
    63     BLDUSERNAME=`echo "$(whoami)" | sed -r 's/(.*\S+)\s*$/\1/'`
    64     BLDDATE=`echo "$(date)" | sed -r 's/(.*\S+)\s*$/\1/'`
     63    BLDUSERNAME=`echo "$(whoami)" | sed -r 's/(.+?)[\r\n]*$/\1/'`
     64    BLDDATE=`echo "$(date)" | sed -r 's/(.+?)[\r\n]*$/\1/'`
    6565    BLDNMBR="$BLDNMBRSHORT $BLDUSERNAME - $BLDDATE - r$SVNOPENSOURCEREVISION"
    6666fi
  • trunk/WebKitTools/ChangeLog

    r47125 r47154  
     12009-08-12  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=27323
     6        Change pattern that strips all trailing whitespace to just remove EOL
     7        chars (\r, \n), to make it clear that varying EOL chars is the primary
     8        problem being solved.
     9
     10        * Scripts/prepare-ChangeLog:
     11        * Scripts/resolve-ChangeLogs:
     12        * Scripts/svn-create-patch:
     13        * Scripts/update-webkit:
     14
    1152009-08-12  Kevin Ollivier  <kevino@theolliviers.com>
    216
  • trunk/WebKitTools/Scripts/prepare-ChangeLog

    r46680 r47154  
    327327    while (my $line = <ERRORS>) {
    328328        print STDERR "    ", $line;
    329         push @conflictedChangeLogs, $1 if $line =~ m/^C\s+(.*\S+)\s*$/;
     329        push @conflictedChangeLogs, $1 if $line =~ m/^C\s+(.+?)[\r\n]*$/;
    330330    }
    331331    close ERRORS;
     
    13241324sub diffHeaderFormat()
    13251325{
    1326     return qr/^Index: (\S+)\s*$/ if $isSVN;
     1326    return qr/^Index: (\S+)[\r\n]*$/ if $isSVN;
    13271327    return qr/^diff --git a\/.+ b\/(.+)$/ if $isGit;
    13281328}
     
    13341334    open INFO, "$SVN info . |" or die;
    13351335    while (<INFO>) {
    1336         if (/^URL: (.*\S+)\s*$/) {
     1336        if (/^URL: (.+?)[\r\n]*$/) {
    13371337            $baseUrl = $1;
    13381338        }
     
    13421342    open INFO, "$SVN info '$file' |" or die;
    13431343    while (<INFO>) {
    1344         if (/^Copied From URL: (.*\S+)\s*$/) {
     1344        if (/^Copied From URL: (.+?)[\r\n]*$/) {
    13451345            $sourceFile = File::Spec->abs2rel($1, $baseUrl);
    13461346        }
     
    13631363            my $matches;
    13641364            if (eval "v$svnVersion" ge v1.6) {
    1365                 $matches = /^([ACDMR]).{6} (.*\S+)\s*$/;
     1365                $matches = /^([ACDMR]).{6} (.+?)[\r\n]*$/;
    13661366                $status = $1;
    13671367                $file = $2;
    13681368            } else {
    1369                 $matches = /^([ACDMR]).{5} (.*\S+)\s*$/;
     1369                $matches = /^([ACDMR]).{5} (.+?)[\r\n]*$/;
    13701370                $status = $1;
    13711371                $file = $2;
  • trunk/WebKitTools/Scripts/resolve-ChangeLogs

    r46988 r47154  
    257257            my $file;
    258258            if (eval "v$svnVersion" ge v1.6) {
    259                 $matches = /^([C]).{6} (.*\S+)\s*$/;
     259                $matches = /^([C]).{6} (.+?)[\r\n]*$/;
    260260                $file = $2;
    261261            } else {
    262                 $matches = /^([C]).{5} (.*\S+)\s*$/;
     262                $matches = /^([C]).{5} (.+?)[\r\n]*$/;
    263263                $file = $2;
    264264            }
  • trunk/WebKitTools/Scripts/svn-create-patch

    r47061 r47154  
    157157    open INFO, "svn info '$infoPath' |" or die;
    158158    while (<INFO>) {
    159         if (/^URL: (.*\S+)\s*$/) {
     159        if (/^URL: (.+?)[\r\n]*$/) {
    160160            $baseUrl = $1;
    161161        }
     
    201201    open INFO, "svn info '$file' |" or die;
    202202    while (<INFO>) {
    203         if (/^Copied From URL: (.*\S+)\s*$/) {
     203        if (/^Copied From URL: (.+?)[\r\n]*$/) {
    204204            $sourceFile = File::Spec->abs2rel($1, $baseUrl);
    205205        } elsif (/^Copied From Rev: ([0-9]+)/) {
  • trunk/WebKitTools/Scripts/update-webkit

    r46064 r47154  
    8181    while (my $line = <UPDATE>) {
    8282        print $line;
    83         $line =~ m/^C\s+(.*\S+)\s*$/;
     83        $line =~ m/^C\s+(.+?)[\r\n]*$/;
    8484        if ($1) {
    8585          my $filename = normalizePath($1);
Note: See TracChangeset for help on using the changeset viewer.