WebKit/win:

        Fix version parsing.

        Rubber-stamped by Oliver.

        * WebKit.vcproj/auto-version.sh:

WebKitTools:

        Fix version parsing.

        Rubber-stamped by Oliver.

        * Drosera/win/Drosera.vcproj/auto-version.sh:

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

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 7b2006bc42219102d04bf052d50ec33898c2e2bd..90b58975072139fcc52b584a42b36289b5df33bf 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-07  Steve Falkenburg  <sfalken@apple.com>
+
+        Fix version parsing.
+
+        Rubber-stamped by Oliver.
+
+        * WebKit.vcproj/auto-version.sh:
+
 2007-12-07  Steve Falkenburg  <sfalken@apple.com>
 
         Fix build.

diff --git a/WebKit/win/WebKit.vcproj/auto-version.sh b/WebKit/win/WebKit.vcproj/auto-version.sh
index 5c0e8790242b96a2837d865748e1a070c9337fef..a2c6d2c3596abb348b039ce0c730b22e8cf2660f 100755 (executable)
--- a/WebKit/win/WebKit.vcproj/auto-version.sh
+++ b/WebKit/win/WebKit.vcproj/auto-version.sh
@@ -50,9 +50,12 @@ if [ `grep -c -E "4\.|4$" "$VERSIONFILE"` -ne 0 ]; then
     exit 1
 fi
 
-BLDMAJORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/' "$VERSIONFILE"`
-BLDMINORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/' "$VERSIONFILE"`
-BLDVARIANTVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/' "$VERSIONFILE"`
+BLDMAJORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/' "$VERSIONFILE"`
+BLDMINORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/' "$VERSIONFILE"`
+BLDVARIANTVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/' "$VERSIONFILE"`
+if [ "$BLDMINORVERSION" == "" ]; then
+    BLDMINORVERSION=0
+fi
 if [ "$BLDVARIANTVERSION" == "" ]; then
     BLDVARIANTVERSION=0
 fi

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 07ee1966db3a0ca9c42e43a9352193d5b9c95caf..e6c10ceaa7077a237f2f7381f2974b3099950406 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-07  Steve Falkenburg  <sfalken@apple.com>
+
+        Fix version parsing.
+
+        Rubber-stamped by Oliver.
+
+        * Drosera/win/Drosera.vcproj/auto-version.sh:
+
 2007-12-07  Steve Falkenburg  <sfalken@apple.com>
 
         Build modifications for Drosera.

diff --git a/WebKitTools/Drosera/win/Drosera.vcproj/auto-version.sh b/WebKitTools/Drosera/win/Drosera.vcproj/auto-version.sh
index 5c0e8790242b96a2837d865748e1a070c9337fef..a2c6d2c3596abb348b039ce0c730b22e8cf2660f 100644 (file)
--- a/WebKitTools/Drosera/win/Drosera.vcproj/auto-version.sh
+++ b/WebKitTools/Drosera/win/Drosera.vcproj/auto-version.sh
@@ -50,9 +50,12 @@ if [ `grep -c -E "4\.|4$" "$VERSIONFILE"` -ne 0 ]; then
     exit 1
 fi
 
-BLDMAJORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/' "$VERSIONFILE"`
-BLDMINORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/' "$VERSIONFILE"`
-BLDVARIANTVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/' "$VERSIONFILE"`
+BLDMAJORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/' "$VERSIONFILE"`
+BLDMINORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/' "$VERSIONFILE"`
+BLDVARIANTVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/' "$VERSIONFILE"`
+if [ "$BLDMINORVERSION" == "" ]; then
+    BLDMINORVERSION=0
+fi
 if [ "$BLDVARIANTVERSION" == "" ]; then
     BLDVARIANTVERSION=0
 fi