1 files changed, 48 insertions, 28 deletions

diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh
index 6bbfb5c..a93f4af 100755
--- a/WebKitLibraries/win/tools/scripts/auto-version.sh
+++ b/WebKitLibraries/win/tools/scripts/auto-version.sh
@@ -30,30 +30,29 @@ VERSIONFILE=$VERSIONPATH/autoversion.h
 mkdir -p "$VERSIONPATH"
 
 PRODUCTVERSION=`cat "$SRCPATH/PRODUCTVERSION"`
-MAJORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/'`
-MINORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/'`
-TINYVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/'`
+MAJORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/' "$SRCPATH/PRODUCTVERSION"`
+MINORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/' "$SRCPATH/PRODUCTVERSION"`
+TINYVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/' "$SRCPATH/PRODUCTVERSION"`
 if [ "$TINYVERSION" == "" ]; then
     TINYVERSION=0
 fi
 
 if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
-    PROPOSEDVERSION=$(cat "$SRCPATH/VERSION")
+    echo -n `cat "$SRCPATH/VERSION"` > "$VERSIONFILE"
 else
-    PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION"
+    echo -n $RC_PROJECTSOURCEVERSION > "$VERSIONFILE"
 fi
 
-if [ `echo "$PROPOSEDVERSION" | grep -c -E "4\.|4$"` -ne 0 ]; then
-    echo "
-    Can't set WebKit's version to something that ends in a 4!
-    If we do, someone's going to think it's Netscape 4.
-    Radar bug 3787996 has some details."
+if [ `grep -c -E "4\.|4$" "$VERSIONFILE"` -ne 0 ]; then
+    echo "Can't set WebKit's version to something that ends in a 4!"
+    echo "If we do, someone's going to think it's Netscape 4."
+    echo "Radar bug 3787996 has some details."
     exit 1
 fi
 
-BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'`
-BLDMINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'`
-BLDVARIANTVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/'`
+BLDMAJORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/' "$VERSIONFILE"`
+BLDMINORVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/' "$VERSIONFILE"`
+BLDVARIANTVERSION=`sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\5/' "$VERSIONFILE"`
 if [ "$BLDMINORVERSION" == "" ]; then
     BLDMINORVERSION=0
 fi
@@ -62,22 +61,43 @@ if [ "$BLDVARIANTVERSION" == "" ]; then
 fi
 SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed 's/^Revision: \(.*\)/\1/'`
 
-BLDNMBR="$PROPOSEDVERSION"
-BLDNMBRSHORT="$BLDNMBR"
+BLDNMBR=`cat "$VERSIONFILE"`
+BLDNMBRSHORT=`cat "$VERSIONFILE"`
+BUILDER=""
 
 if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
-    BLDNMBRSHORT="$BLDNMBRSHORT+"
-    BLDNMBR="$BLDNMBRSHORT $(whoami) - $(date) - r$SVNOPENSOURCEREVISION"
+    echo -n "+" >> "$VERSIONFILE"
+    BLDNMBRSHORT=`cat "$VERSIONFILE"`
+    echo -n " " >> "$VERSIONFILE"
+    echo -n `whoami` >> "$VERSIONFILE"
+    echo -n " - " >> "$VERSIONFILE"
+    echo -n `date` >> "$VERSIONFILE"
+    echo -n " - r$SVNOPENSOURCEREVISION" >> "$VERSIONFILE"
+    BLDNMBR=`cat "$VERSIONFILE"`
 fi
 
-cat > "$VERSIONFILE" <<EOF
-#define __VERSION_TEXT__ "$PRODUCTVERSION ($BLDNMBR)"
-#define __BUILD_NUMBER_SHORT__ "$BLDNMBRSHORT"
-#define __VERSION_MAJOR__ $MAJORVERSION
-#define __VERSION_MINOR__ $MINORVERSION
-#define __VERSION_TINY__ $TINYVERSION
-#define __BUILD_NUMBER_MAJOR__ $BLDMAJORVERSION
-#define __BUILD_NUMBER_MINOR__ $BLDMINORVERSION
-#define __BUILD_NUMBER_VARIANT__ $BLDVARIANTVERSION
-#define __SVN_REVISION__ $SVNREVISION
-EOF
+echo -n '#define __VERSION_TEXT__ "' > "$VERSIONFILE"
+echo -n $PRODUCTVERSION >> "$VERSIONFILE"
+echo -n " (" >> "$VERSIONFILE"
+echo -n $BLDNMBR >> "$VERSIONFILE"
+echo ')"' >> "$VERSIONFILE"
+echo -n '#define __BUILD_NUMBER_SHORT__ "' >> "$VERSIONFILE"
+echo -n $BLDNMBRSHORT >> "$VERSIONFILE"
+echo '"' >> "$VERSIONFILE"
+
+echo -n '#define __VERSION_MAJOR__ ' >> "$VERSIONFILE"
+echo $MAJORVERSION >> "$VERSIONFILE"
+echo -n '#define __VERSION_MINOR__ ' >> "$VERSIONFILE"
+echo $MINORVERSION >> "$VERSIONFILE"
+echo -n '#define __VERSION_TINY__ ' >> "$VERSIONFILE"
+echo $TINYVERSION >> "$VERSIONFILE"
+
+echo -n '#define __BUILD_NUMBER_MAJOR__ ' >> "$VERSIONFILE"
+echo $BLDMAJORVERSION >> "$VERSIONFILE"
+echo -n '#define __BUILD_NUMBER_MINOR__ ' >> "$VERSIONFILE"
+echo $BLDMINORVERSION >> "$VERSIONFILE"
+echo -n '#define __BUILD_NUMBER_VARIANT__ ' >> "$VERSIONFILE"
+echo $BLDVARIANTVERSION >> "$VERSIONFILE"
+
+echo -n '#define __SVN_REVISION__ ' >> "$VERSIONFILE"
+echo $SVNREVISION >> "$VERSIONFILE"