Changeset 46424 in webkit

Timestamp:

Jul 27, 2009 11:54:28 AM (15 years ago)

Author:

pkasting@chromium.org

Message:

2009-07-27 Peter Kasting <​pkasting@google.com>

Reviewed by Adam Roben.

​https://bugs.webkit.org/show_bug.cgi?id=27323
Correctly parse command output, even when the line endings are not LF,
so that we don't create an autoversion.h that MSVC chokes on.

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

Location:

trunk/WebKitLibraries

Files:

• ChangeLog (modified) (1 diff)
• win/tools/scripts/auto-version.sh (modified) (2 diffs)

trunk/WebKitLibraries/ChangeLog

@@ +1 @@
+2009-07-27  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Adam Roben.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27323
+        Correctly parse command output, even when the line endings are not LF,
+        so that we don't create an autoversion.h that MSVC chokes on.
+
+        * win/tools/scripts/auto-version.sh:
+
 2009-07-13  Brent Fulgham  <bfulgham@webkit.org>
 

trunk/WebKitLibraries/win/tools/scripts/auto-version.sh

@@ -39 +39 @@
 
 if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
-    PROPOSEDVERSION=$(cat "$SRCPATH/VERSION")
+    PROPOSEDVERSION=`cat $SRCPATH/VERSION | sed -r 's/(.*\S+)\s*$/\1/'`
 else
     PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION"
@@ -53 +53 @@
     BLDVARIANTVERSION=0
 fi
-SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed 's/^Revision: \(.*\)/\1/'`
+SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed -r 's/^Revision: (.*\S+)\s*$/\1/'`
 
 BLDNMBR="$PROPOSEDVERSION"