2009-08-06 Peter Kasting <pkasting@google.com>
authorpkasting@chromium.org <pkasting@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Aug 2009 00:27:38 +0000 (00:27 +0000)
committerpkasting@chromium.org <pkasting@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Aug 2009 00:27:38 +0000 (00:27 +0000)
        Reviewed by Adam Barth.

        https://bugs.webkit.org/show_bug.cgi?id=27323
        Strip line endings at all points auto-version.sh reads data, not just
        the one I happened to run into.

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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@46872 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index 4a3208421d349015dd9337d98cff7d9b92e02d71..3054511338bd1f55639602f9c89ff0541350122e 100644 (file)
@@ -1,3 +1,13 @@
+2009-08-06  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Adam Barth.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27323
+        Strip line endings at all points auto-version.sh reads data, not just
+        the one I happened to run into.
+
+        * win/tools/scripts/auto-version.sh:
+
 2009-07-27  Peter Kasting  <pkasting@google.com>
 
         Reviewed by Adam Roben.
index 70b560291eae3f2fff9153ae67bff0aaca8c9ed2..f9d4efb8972b3a1d74b5bea0ed16c2e0379714b3 100755 (executable)
@@ -29,7 +29,7 @@ VERSIONPATH=$VERSIONPATH/include
 VERSIONFILE=$VERSIONPATH/autoversion.h
 mkdir -p "$VERSIONPATH"
 
-PRODUCTVERSION=`cat "$SRCPATH/PRODUCTVERSION"`
+PRODUCTVERSION=`cat $SRCPATH/PRODUCTVERSION | sed -r 's/(.*\S+)\s*$/\1/'`
 MAJORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/'`
 MINORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/'`
 TINYVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/'`
@@ -38,10 +38,11 @@ if [ "$TINYVERSION" == "" ]; then
 fi
 
 if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
-    PROPOSEDVERSION=`cat $SRCPATH/VERSION | sed -r 's/(.*\S+)\s*$/\1/'`
+    PROPOSEDVERSION=`cat $SRCPATH/VERSION`
 else
     PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION"
 fi
+PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(.*\S+)\s*$/\1/'`
 
 BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'`
 BLDMINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'`