Changeset 46872 in webkit


Ignore:
Timestamp:
Aug 6, 2009 5:27:38 PM (15 years ago)
Author:
pkasting@chromium.org
Message:

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:
Location:
trunk/WebKitLibraries
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitLibraries/ChangeLog

    r46424 r46872  
     12009-08-06  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=27323
     6        Strip line endings at all points auto-version.sh reads data, not just
     7        the one I happened to run into.
     8
     9        * win/tools/scripts/auto-version.sh:
     10
    1112009-07-27  Peter Kasting  <pkasting@google.com>
    212
  • trunk/WebKitLibraries/win/tools/scripts/auto-version.sh

    r46424 r46872  
    3030mkdir -p "$VERSIONPATH"
    3131
    32 PRODUCTVERSION=`cat "$SRCPATH/PRODUCTVERSION"`
     32PRODUCTVERSION=`cat $SRCPATH/PRODUCTVERSION | sed -r 's/(.*\S+)\s*$/\1/'`
    3333MAJORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/'`
    3434MINORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/'`
     
    3939
    4040if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
    41     PROPOSEDVERSION=`cat $SRCPATH/VERSION | sed -r 's/(.*\S+)\s*$/\1/'`
     41    PROPOSEDVERSION=`cat $SRCPATH/VERSION`
    4242else
    4343    PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION"
    4444fi
     45PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(.*\S+)\s*$/\1/'`
    4546
    4647BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'`
Note: See TracChangeset for help on using the changeset viewer.