Commit 1c86a86b authored by sfalken@apple.com's avatar sfalken@apple.com

<https://bugs.webkit.org/show_bug.cgi?id=29989>

Safari version number shouldn't be exposed in WebKit code
        
Reviewed by Mark Rowe.

For a WebKit version of 532.3.4:
Product version is: 5.32.3.4 (was 4.0.3.0)
File version is: 5.32.3.4 (was 4.532.3.4)

JavaScriptCore: 

* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc:

WebCore: 

* WebCore.vcproj/QTMovieWin.rc:

WebKit/win: 

* WebKit.vcproj/WebKit.rc:

WebKitLibraries: 

* win/tools/scripts/PRODUCTVERSION: Removed.
* win/tools/scripts/auto-version.sh: Re-worked script to remove references to PRODUCTVERSION.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49026 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ca012416
2009-10-02 Steve Falkenburg <sfalken@apple.com>
Reviewed by Mark Rowe.
<https://bugs.webkit.org/show_bug.cgi?id=29989>
Safari version number shouldn't be exposed in WebKit code
For a WebKit version of 532.3.4:
Product version is: 5.32.3.4 (was 4.0.3.0)
File version is: 5.32.3.4 (was 4.532.3.4)
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc:
2009-10-02 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Rubber-stamped by Simon Hausmann.
......
......@@ -14,8 +14,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION __VERSION_MAJOR__,__BUILD_NUMBER_MAJOR__,__BUILD_NUMBER_MINOR__,__BUILD_NUMBER_VARIANT__
PRODUCTVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,0
FILEVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,__VERSION_BUILD__
PRODUCTVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,__VERSION_BUILD__
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -37,7 +37,7 @@ BEGIN
VALUE "LegalCopyright", "Copyright Apple Inc. 2003-2009"
VALUE "OriginalFilename", "JavaScriptCore.dll"
VALUE "ProductName", " JavaScriptCore"
VALUE "ProductVersion", __BUILD_NUMBER_SHORT__
VALUE "ProductVersion", __VERSION_TEXT__
END
END
BLOCK "VarFileInfo"
......
2009-10-02 Steve Falkenburg <sfalken@apple.com>
Reviewed by Mark Rowe.
<https://bugs.webkit.org/show_bug.cgi?id=29989>
Safari version number shouldn't be exposed in WebKit code
For a WebKit version of 532.3.4:
Product version is: 5.32.3.4 (was 4.0.3.0)
File version is: 5.32.3.4 (was 4.532.3.4)
* WebCore.vcproj/QTMovieWin.rc:
2009-10-02 Stephen White <senorblanco@chromium.org>
Reviewed by Dimitri Glazkov.
......@@ -14,8 +14,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION __VERSION_MAJOR__,__BUILD_NUMBER_MAJOR__,__BUILD_NUMBER_MINOR__,__BUILD_NUMBER_VARIANT__
PRODUCTVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,0
FILEVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,__VERSION_BUILD__
PRODUCTVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,__VERSION_BUILD__
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -37,7 +37,7 @@ BEGIN
VALUE "LegalCopyright", "Copyright Apple Inc. 2007-2009"
VALUE "OriginalFilename", "QTMovieWin.dll"
VALUE "ProductName", "WebKit"
VALUE "ProductVersion", __BUILD_NUMBER_SHORT__
VALUE "ProductVersion", __VERSION_TEXT__
END
END
BLOCK "VarFileInfo"
......
2009-10-02 Steve Falkenburg <sfalken@apple.com>
Reviewed by Mark Rowe.
<https://bugs.webkit.org/show_bug.cgi?id=29989>
Safari version number shouldn't be exposed in WebKit code
For a WebKit version of 532.3.4:
Product version is: 5.32.3.4 (was 4.0.3.0)
File version is: 5.32.3.4 (was 4.532.3.4)
* WebKit.vcproj/WebKit.rc:
2009-09-30 Sam Weinig <sam@webkit.org>
Reviewed by Dan Bernstein.
......
......@@ -22,8 +22,8 @@ IDR_WEBKIT TYPELIB "WebKit.tlb"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION __VERSION_MAJOR__,__BUILD_NUMBER_MAJOR__,__BUILD_NUMBER_MINOR__,__BUILD_NUMBER_VARIANT__
PRODUCTVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,0
FILEVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,__VERSION_BUILD__
PRODUCTVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,__VERSION_BUILD__
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -45,7 +45,7 @@ BEGIN
VALUE "LegalCopyright", "Copyright Apple Inc. 2003-2009"
VALUE "OriginalFilename", "WebKit.dll"
VALUE "ProductName", " WebKit"
VALUE "ProductVersion", __BUILD_NUMBER_SHORT__
VALUE "ProductVersion", __VERSION_TEXT__
END
END
BLOCK "VarFileInfo"
......
2009-10-02 Steve Falkenburg <sfalken@apple.com>
Reviewed by Mark Rowe.
<https://bugs.webkit.org/show_bug.cgi?id=29989>
Safari version number shouldn't be exposed in WebKit code
For a WebKit version of 532.3.4:
Product version is: 5.32.3.4 (was 4.0.3.0)
File version is: 5.32.3.4 (was 4.532.3.4)
* win/tools/scripts/PRODUCTVERSION: Removed.
* win/tools/scripts/auto-version.sh: Re-worked script to remove references to PRODUCTVERSION.
2009-09-25 Dan Bernstein <mitz@apple.com>
Reviewed by Adam Roben.
......
......@@ -29,20 +29,11 @@ VERSIONPATH=$VERSIONPATH/include
VERSIONFILE=$VERSIONPATH/autoversion.h
mkdir -p "$VERSIONPATH"
PRODUCTVERSION=`cat $SRCPATH/PRODUCTVERSION | sed -r 's/(.+?)[\r\n]*$/\1/'`
MAJORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/'`
MINORVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/'`
TINYVERSION=`echo "$PRODUCTVERSION" | sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/'`
if [ "$TINYVERSION" == "" ]; then
TINYVERSION=0
fi
if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
PROPOSEDVERSION=`cat $SRCPATH/VERSION`
PROPOSEDVERSION=$(cat "$SRCPATH/VERSION")
else
PROPOSEDVERSION="$RC_PROJECTSOURCEVERSION"
fi
PROPOSEDVERSION=`echo "$PROPOSEDVERSION" | sed -r 's/(.+?)[\r\n]*$/\1/'`
BLDMAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'`
BLDMINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'`
......@@ -53,25 +44,34 @@ fi
if [ "$BLDVARIANTVERSION" == "" ]; then
BLDVARIANTVERSION=0
fi
SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed -r 's/^Revision: (.+?)[\r\n]*$/\1/'`
SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed 's/^Revision: \(.*\)/\1/'`
MAJORVERSION=`echo "$PROPOSEDVERSION" | sed 's/\(.\)[^\.]*\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'`
MINORVERSION=`echo "$PROPOSEDVERSION" | sed 's/.\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\1/'`
TINYVERSION=`echo "$PROPOSEDVERSION" | sed 's/\([^\.]*\)\(\.\([^.]*\)\(\.\([^.]*\)\)\?\)\?/\3/'`
if [ "$MINORVERSION" == "" ]; then
MINORVERSION=0
fi
if [ "$TINYVERSION" == "" ]; then
TINYVERSION=0
fi
BLDNMBR="$PROPOSEDVERSION"
BLDNMBRSHORT="$BLDNMBR"
if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
BLDNMBRSHORT="$BLDNMBRSHORT+"
BLDUSERNAME=`echo "$(whoami)" | sed -r 's/(.+?)[\r\n]*$/\1/'`
BLDDATE=`echo "$(date)" | sed -r 's/(.+?)[\r\n]*$/\1/'`
BLDNMBR="$BLDNMBRSHORT $BLDUSERNAME - $BLDDATE - r$SVNOPENSOURCEREVISION"
BLDNMBR="$BLDNMBRSHORT $(whoami) - $(date) - r$SVNOPENSOURCEREVISION"
fi
cat > "$VERSIONFILE" <<EOF
#define __VERSION_TEXT__ "$PRODUCTVERSION ($BLDNMBR)"
#define __VERSION_TEXT__ "$BLDNMBR"
#define __BUILD_NUMBER__ "$BLDNMBR"
#define __BUILD_NUMBER_SHORT__ "$BLDNMBRSHORT"
#define __VERSION_MAJOR__ $MAJORVERSION
#define __VERSION_MINOR__ $MINORVERSION
#define __VERSION_TINY__ $TINYVERSION
#define __VERSION_BUILD__ $BLDVARIANTVERSION
#define __BUILD_NUMBER_MAJOR__ $BLDMAJORVERSION
#define __BUILD_NUMBER_MINOR__ $BLDMINORVERSION
#define __BUILD_NUMBER_VARIANT__ $BLDVARIANTVERSION
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment