2008-01-07 Steve Falkenburg <sfalken@apple.com>
authorsfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2008 03:56:49 +0000 (03:56 +0000)
committersfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2008 03:56:49 +0000 (03:56 +0000)
        Add version resource to QTMovieWin.dll

        Reviewed by Adam.

        * WebCore.vcproj/PRODUCTVERSION: Copied from ../WebKit/win/WebKit.vcproj/PRODUCTVERSION.
        * WebCore.vcproj/QTMovieWin.rc: Added.
        * WebCore.vcproj/QTMovieWin.vcproj:
        * WebCore.vcproj/VERSION: Copied from ../WebKit/win/WebKit.vcproj/VERSION.
        * WebCore.vcproj/auto-version.sh: Copied from ../WebKit/win/WebKit.vcproj/auto-version.sh.

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

WebCore/ChangeLog
WebCore/WebCore.vcproj/PRODUCTVERSION [new file with mode: 0644]
WebCore/WebCore.vcproj/QTMovieWin.rc [new file with mode: 0644]
WebCore/WebCore.vcproj/QTMovieWin.vcproj
WebCore/WebCore.vcproj/VERSION [new file with mode: 0644]
WebCore/WebCore.vcproj/auto-version.sh [new file with mode: 0755]

index 7a4686b..8bcfcc3 100644 (file)
@@ -1,3 +1,15 @@
+2008-01-07  Steve Falkenburg  <sfalken@apple.com>
+
+        Add version resource to QTMovieWin.dll
+        
+        Reviewed by Adam.
+
+        * WebCore.vcproj/PRODUCTVERSION: Copied from ../WebKit/win/WebKit.vcproj/PRODUCTVERSION.
+        * WebCore.vcproj/QTMovieWin.rc: Added.
+        * WebCore.vcproj/QTMovieWin.vcproj:
+        * WebCore.vcproj/VERSION: Copied from ../WebKit/win/WebKit.vcproj/VERSION.
+        * WebCore.vcproj/auto-version.sh: Copied from ../WebKit/win/WebKit.vcproj/auto-version.sh.
+
 2008-01-07  Dan Bernstein  <mitz@apple.com>
 
         Build fix.
diff --git a/WebCore/WebCore.vcproj/PRODUCTVERSION b/WebCore/WebCore.vcproj/PRODUCTVERSION
new file mode 100644 (file)
index 0000000..7da3c16
--- /dev/null
@@ -0,0 +1 @@
+3.0.5
\ No newline at end of file
diff --git a/WebCore/WebCore.vcproj/QTMovieWin.rc b/WebCore/WebCore.vcproj/QTMovieWin.rc
new file mode 100644 (file)
index 0000000..bfc5907
--- /dev/null
@@ -0,0 +1,47 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "autoversion.h"
+#include "winres.h"
+
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION __VERSION_MAJOR__,__BUILD_NUMBER_MAJOR__,__BUILD_NUMBER_MINOR__,__BUILD_NUMBER_VARIANT__
+ PRODUCTVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "WebKit QuickTime Movie Dynamic Link Library"
+            VALUE "FileVersion", __VERSION_TEXT__
+            VALUE "CompanyName", "Apple Inc."
+            VALUE "InternalName", "WebKit"
+            VALUE "LegalCopyright", "Copyright Apple Inc. 2007, 2008"
+            VALUE "OriginalFilename", "QTMovieWin.dll"
+            VALUE "ProductName", "WebKit"
+            VALUE "ProductVersion", __BUILD_NUMBER_SHORT__
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
index d9b0d47..481e086 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8,00"\r
+       Version="8.00"\r
        Name="QTMovieWin"\r
        ProjectGUID="{E498CA9D-3BD2-4D52-8E37-C8DC76526325}"\r
        RootNamespace="QuickTimeWin"\r
@@ -25,6 +25,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -56,6 +57,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               AdditionalIncludeDirectories="$(IntDir)\include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               AdditionalIncludeDirectories="$(IntDir)\include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               AdditionalIncludeDirectories="$(IntDir)\include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
+                       <File\r
+                               RelativePath=".\QTMovieWin.rc"\r
+                               >\r
+                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r
diff --git a/WebCore/WebCore.vcproj/VERSION b/WebCore/WebCore.vcproj/VERSION
new file mode 100644 (file)
index 0000000..642ea6f
--- /dev/null
@@ -0,0 +1 @@
+525
diff --git a/WebCore/WebCore.vcproj/auto-version.sh b/WebCore/WebCore.vcproj/auto-version.sh
new file mode 100755 (executable)
index 0000000..a2c6d2c
--- /dev/null
@@ -0,0 +1,103 @@
+#!/usr/bin/bash
+
+# Copyright (C) 2007 Apple Inc.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
+SRCPATH=`cygpath -u "$1"`
+VERSIONPATH=`cygpath -u "$2"`
+VERSIONPATH=$VERSIONPATH/include
+VERSIONFILE=$VERSIONPATH/autoversion.h
+mkdir -p "$VERSIONPATH"
+
+PRODUCTVERSION=`cat "$SRCPATH/PRODUCTVERSION"`
+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
+    echo -n `cat "$SRCPATH/VERSION"` > "$VERSIONFILE"
+else
+    echo -n $RC_PROJECTSOURCEVERSION > "$VERSIONFILE"
+fi
+
+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=`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
+SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed 's/^Revision: \(.*\)/\1/'`
+
+BLDNMBR=`cat "$VERSIONFILE"`
+BLDNMBRSHORT=`cat "$VERSIONFILE"`
+BUILDER=""
+
+if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
+    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
+
+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"