diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 66f1e38e9a0a4b17715781c5f9acc05318f87f76..f217b265943ec5ac587fe0045800c60f0ca3df3b 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,14 @@ +2009-08-12 Peter Kasting + + Reviewed by Darin Adler. + + 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. + + * win/tools/scripts/auto-version.sh: + 2009-08-10 Peter Kasting Reviewed by George Staikos. diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh index 06f7667e78c44b66896f8ffac5bba7fa01910c9a..f4312c0175b60c7106604fc529664dd76ef3d6a5 100755 --- a/WebKitLibraries/win/tools/scripts/auto-version.sh +++ b/WebKitLibraries/win/tools/scripts/auto-version.sh @@ -29,7 +29,7 @@ VERSIONPATH=$VERSIONPATH/include VERSIONFILE=$VERSIONPATH/autoversion.h mkdir -p "$VERSIONPATH" -PRODUCTVERSION=`cat $SRCPATH/PRODUCTVERSION | sed -r 's/(.*\S+)\s*$/\1/'` +PRODUCTVERSION=`cat $SRCPATH/PRODUCTVERSION | sed -r 's/(.+?)[\r\n]*$/\1/'` MAJORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/'` MINORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/'` TINYVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/'` @@ -42,7 +42,7 @@ if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then else PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION" fi -PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(.*\S+)\s*$/\1/'` +PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(.+?)[\r\n]*$/\1/'` BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'` BLDMINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'` @@ -53,15 +53,15 @@ fi if [ "$BLDVARIANTVERSION" == "" ]; then BLDVARIANTVERSION=0 fi -SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed -r 's/^Revision: (.*\S+)\s*$/\1/'` +SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed -r 's/^Revision: (.+?)[\r\n]*$/\1/'` BLDNMBR="$PROPOSEDVERSION" BLDNMBRSHORT="$BLDNMBR" if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then BLDNMBRSHORT="$BLDNMBRSHORT+" - BLDUSERNAME=`echo "$(whoami)" | sed -r 's/(.*\S+)\s*$/\1/'` - BLDDATE=`echo "$(date)" | sed -r 's/(.*\S+)\s*$/\1/'` + BLDUSERNAME=`echo "$(whoami)" | sed -r 's/(.+?)[\r\n]*$/\1/'` + BLDDATE=`echo "$(date)" | sed -r 's/(.+?)[\r\n]*$/\1/'` BLDNMBR="$BLDNMBRSHORT $BLDUSERNAME - $BLDDATE - r$SVNOPENSOURCEREVISION" fi diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog index d03d1ac3fb508463a2c221dbcc8e3fc5cae751c8..653abfc3920293b521b8def900923e662fa43647 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,17 @@ +2009-08-12 Peter Kasting + + Reviewed by Darin Adler. + + 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. + + * Scripts/prepare-ChangeLog: + * Scripts/resolve-ChangeLogs: + * Scripts/svn-create-patch: + * Scripts/update-webkit: + 2009-08-12 Kevin Ollivier wx waf build fix, add new directories to the build. diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog index c3e2cef80c3bf366337f4ed581a026b154394a5f..16bf620d529bc8e52b1ea4d7a6415b9f35549290 100755 --- a/WebKitTools/Scripts/prepare-ChangeLog +++ b/WebKitTools/Scripts/prepare-ChangeLog @@ -326,7 +326,7 @@ if (@logs && $updateChangeLogs && $isSVN) { my @conflictedChangeLogs; while (my $line = ) { print STDERR " ", $line; - push @conflictedChangeLogs, $1 if $line =~ m/^C\s+(.*\S+)\s*$/; + push @conflictedChangeLogs, $1 if $line =~ m/^C\s+(.+?)[\r\n]*$/; } close ERRORS; @@ -1323,7 +1323,7 @@ sub createPatchCommand($) sub diffHeaderFormat() { - return qr/^Index: (\S+)\s*$/ if $isSVN; + return qr/^Index: (\S+)[\r\n]*$/ if $isSVN; return qr/^diff --git a\/.+ b\/(.+)$/ if $isGit; } @@ -1333,7 +1333,7 @@ sub findOriginalFileFromSvn($) my $baseUrl; open INFO, "$SVN info . |" or die; while () { - if (/^URL: (.*\S+)\s*$/) { + if (/^URL: (.+?)[\r\n]*$/) { $baseUrl = $1; } } @@ -1341,7 +1341,7 @@ sub findOriginalFileFromSvn($) my $sourceFile; open INFO, "$SVN info '$file' |" or die; while () { - if (/^Copied From URL: (.*\S+)\s*$/) { + if (/^Copied From URL: (.+?)[\r\n]*$/) { $sourceFile = File::Spec->abs2rel($1, $baseUrl); } } @@ -1362,11 +1362,11 @@ sub generateFileList(\@\@\%) if ($isSVN) { my $matches; if (eval "v$svnVersion" ge v1.6) { - $matches = /^([ACDMR]).{6} (.*\S+)\s*$/; + $matches = /^([ACDMR]).{6} (.+?)[\r\n]*$/; $status = $1; $file = $2; } else { - $matches = /^([ACDMR]).{5} (.*\S+)\s*$/; + $matches = /^([ACDMR]).{5} (.+?)[\r\n]*$/; $status = $1; $file = $2; } diff --git a/WebKitTools/Scripts/resolve-ChangeLogs b/WebKitTools/Scripts/resolve-ChangeLogs index 9107fd2f8bc765fc30cb2af4d4fbedfff321a097..abc0fc0a9d91db3e5fc4a69e7d5538bbf2551e27 100755 --- a/WebKitTools/Scripts/resolve-ChangeLogs +++ b/WebKitTools/Scripts/resolve-ChangeLogs @@ -256,10 +256,10 @@ sub findUnmergedChangeLogs() my $matches; my $file; if (eval "v$svnVersion" ge v1.6) { - $matches = /^([C]).{6} (.*\S+)\s*$/; + $matches = /^([C]).{6} (.+?)[\r\n]*$/; $file = $2; } else { - $matches = /^([C]).{5} (.*\S+)\s*$/; + $matches = /^([C]).{5} (.+?)[\r\n]*$/; $file = $2; } if ($matches) { diff --git a/WebKitTools/Scripts/svn-create-patch b/WebKitTools/Scripts/svn-create-patch index 538cd317c5b780bf3ffdbc650b532623613a405a..6e61164bef7fe1387b5d4677b6acccb4e76fe44d 100755 --- a/WebKitTools/Scripts/svn-create-patch +++ b/WebKitTools/Scripts/svn-create-patch @@ -156,7 +156,7 @@ sub findBaseUrl($) my $baseUrl; open INFO, "svn info '$infoPath' |" or die; while () { - if (/^URL: (.*\S+)\s*$/) { + if (/^URL: (.+?)[\r\n]*$/) { $baseUrl = $1; } } @@ -200,7 +200,7 @@ sub findSourceFileAndRevision($) my $sourceRevision; open INFO, "svn info '$file' |" or die; while () { - if (/^Copied From URL: (.*\S+)\s*$/) { + if (/^Copied From URL: (.+?)[\r\n]*$/) { $sourceFile = File::Spec->abs2rel($1, $baseUrl); } elsif (/^Copied From Rev: ([0-9]+)/) { $sourceRevision = $1; diff --git a/WebKitTools/Scripts/update-webkit b/WebKitTools/Scripts/update-webkit index 5f72869d4a3a2e792bdacc7154071341a4823716..5a87b0509081ebf6a5ba940b60ce79b14da41ea9 100755 --- a/WebKitTools/Scripts/update-webkit +++ b/WebKitTools/Scripts/update-webkit @@ -80,7 +80,7 @@ sub runSvnUpdate() my @conflictedChangeLogs; while (my $line = ) { print $line; - $line =~ m/^C\s+(.*\S+)\s*$/; + $line =~ m/^C\s+(.+?)[\r\n]*$/; if ($1) { my $filename = normalizePath($1); push @conflictedChangeLogs, $filename if basename($filename) eq "ChangeLog";