Changeset 47154 in webkit
- Timestamp:
- Aug 12, 2009 3:15:51 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitLibraries/ChangeLog
r47012 r47154 1 2009-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 1 12 2009-08-10 Peter Kasting <pkasting@google.com> 2 13 -
trunk/WebKitLibraries/win/tools/scripts/auto-version.sh
r47012 r47154 30 30 mkdir -p "$VERSIONPATH" 31 31 32 PRODUCTVERSION=`cat $SRCPATH/PRODUCTVERSION | sed -r 's/(. *\S+)\s*$/\1/'`32 PRODUCTVERSION=`cat $SRCPATH/PRODUCTVERSION | sed -r 's/(.+?)[\r\n]*$/\1/'` 33 33 MAJORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/'` 34 34 MINORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/'` … … 43 43 PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION" 44 44 fi 45 PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(. *\S+)\s*$/\1/'`45 PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(.+?)[\r\n]*$/\1/'` 46 46 47 47 BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'` … … 54 54 BLDVARIANTVERSION=0 55 55 fi 56 SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed -r 's/^Revision: (. *\S+)\s*$/\1/'`56 SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed -r 's/^Revision: (.+?)[\r\n]*$/\1/'` 57 57 58 58 BLDNMBR="$PROPOSEDVERSION" … … 61 61 if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then 62 62 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/'` 65 65 BLDNMBR="$BLDNMBRSHORT $BLDUSERNAME - $BLDDATE - r$SVNOPENSOURCEREVISION" 66 66 fi -
trunk/WebKitTools/ChangeLog
r47125 r47154 1 2009-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 1 15 2009-08-12 Kevin Ollivier <kevino@theolliviers.com> 2 16 -
trunk/WebKitTools/Scripts/prepare-ChangeLog
r46680 r47154 327 327 while (my $line = <ERRORS>) { 328 328 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]*$/; 330 330 } 331 331 close ERRORS; … … 1324 1324 sub diffHeaderFormat() 1325 1325 { 1326 return qr/^Index: (\S+) \s*$/ if $isSVN;1326 return qr/^Index: (\S+)[\r\n]*$/ if $isSVN; 1327 1327 return qr/^diff --git a\/.+ b\/(.+)$/ if $isGit; 1328 1328 } … … 1334 1334 open INFO, "$SVN info . |" or die; 1335 1335 while (<INFO>) { 1336 if (/^URL: (. *\S+)\s*$/) {1336 if (/^URL: (.+?)[\r\n]*$/) { 1337 1337 $baseUrl = $1; 1338 1338 } … … 1342 1342 open INFO, "$SVN info '$file' |" or die; 1343 1343 while (<INFO>) { 1344 if (/^Copied From URL: (. *\S+)\s*$/) {1344 if (/^Copied From URL: (.+?)[\r\n]*$/) { 1345 1345 $sourceFile = File::Spec->abs2rel($1, $baseUrl); 1346 1346 } … … 1363 1363 my $matches; 1364 1364 if (eval "v$svnVersion" ge v1.6) { 1365 $matches = /^([ACDMR]).{6} (. *\S+)\s*$/;1365 $matches = /^([ACDMR]).{6} (.+?)[\r\n]*$/; 1366 1366 $status = $1; 1367 1367 $file = $2; 1368 1368 } else { 1369 $matches = /^([ACDMR]).{5} (. *\S+)\s*$/;1369 $matches = /^([ACDMR]).{5} (.+?)[\r\n]*$/; 1370 1370 $status = $1; 1371 1371 $file = $2; -
trunk/WebKitTools/Scripts/resolve-ChangeLogs
r46988 r47154 257 257 my $file; 258 258 if (eval "v$svnVersion" ge v1.6) { 259 $matches = /^([C]).{6} (. *\S+)\s*$/;259 $matches = /^([C]).{6} (.+?)[\r\n]*$/; 260 260 $file = $2; 261 261 } else { 262 $matches = /^([C]).{5} (. *\S+)\s*$/;262 $matches = /^([C]).{5} (.+?)[\r\n]*$/; 263 263 $file = $2; 264 264 } -
trunk/WebKitTools/Scripts/svn-create-patch
r47061 r47154 157 157 open INFO, "svn info '$infoPath' |" or die; 158 158 while (<INFO>) { 159 if (/^URL: (. *\S+)\s*$/) {159 if (/^URL: (.+?)[\r\n]*$/) { 160 160 $baseUrl = $1; 161 161 } … … 201 201 open INFO, "svn info '$file' |" or die; 202 202 while (<INFO>) { 203 if (/^Copied From URL: (. *\S+)\s*$/) {203 if (/^Copied From URL: (.+?)[\r\n]*$/) { 204 204 $sourceFile = File::Spec->abs2rel($1, $baseUrl); 205 205 } elsif (/^Copied From Rev: ([0-9]+)/) { -
trunk/WebKitTools/Scripts/update-webkit
r46064 r47154 81 81 while (my $line = <UPDATE>) { 82 82 print $line; 83 $line =~ m/^C\s+(. *\S+)\s*$/;83 $line =~ m/^C\s+(.+?)[\r\n]*$/; 84 84 if ($1) { 85 85 my $filename = normalizePath($1);
Note: See TracChangeset
for help on using the changeset viewer.