Adopt VersionStamper tool for Windows WebKit DLLs
authorsfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Mar 2011 22:06:45 +0000 (22:06 +0000)
committersfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Mar 2011 22:06:45 +0000 (22:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=55784

Reviewed by NOBODY Jon Honeycutt.

We now use a tool to stamp the version number onto the Apple WebKit DLLs
during the post-build step.

* WebCore.vcproj/QTMovieWin.rc: Removed.
* WebCore.vcproj/QTMovieWin.vcproj:
* WebCore.vcproj/QTMovieWinPostBuild.cmd: Stamp version with VersionStamper.
* WebCore.vcproj/QTMovieWinPreBuild.cmd: Don't run auto-version.sh. We don't use autoversion.h in this project.
* WebCore.vcproj/WebCoreMediaQT.vsprops: Remove unnecessary include paths for resource files.

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

Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcproj/QTMovieWin.rc [deleted file]
Source/WebCore/WebCore.vcproj/QTMovieWin.vcproj
Source/WebCore/WebCore.vcproj/QTMovieWinPostBuild.cmd
Source/WebCore/WebCore.vcproj/QTMovieWinPreBuild.cmd
Source/WebCore/WebCore.vcproj/WebCoreMediaQT.vsprops

index eac52eb..76ab641 100644 (file)
@@ -1,3 +1,19 @@
+2011-03-04  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by NOBODY Jon Honeycutt.
+
+        Adopt VersionStamper tool for Windows WebKit DLLs
+        https://bugs.webkit.org/show_bug.cgi?id=55784
+        
+        We now use a tool to stamp the version number onto the Apple WebKit DLLs
+        during the post-build step.
+
+        * WebCore.vcproj/QTMovieWin.rc: Removed.
+        * WebCore.vcproj/QTMovieWin.vcproj:
+        * WebCore.vcproj/QTMovieWinPostBuild.cmd: Stamp version with VersionStamper.
+        * WebCore.vcproj/QTMovieWinPreBuild.cmd: Don't run auto-version.sh. We don't use autoversion.h in this project.
+        * WebCore.vcproj/WebCoreMediaQT.vsprops: Remove unnecessary include paths for resource files.
+
 2011-03-04  Cosmin Truta  <ctruta@chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/Source/WebCore/WebCore.vcproj/QTMovieWin.rc b/Source/WebCore/WebCore.vcproj/QTMovieWin.rc
deleted file mode 100644 (file)
index ee374e1..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "autoversion.h"
-#include "winresrc.h"
-
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,__VERSION_BUILD__
- PRODUCTVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,__VERSION_BUILD__
- 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-" __COPYRIGHT_YEAR_END_TEXT__
-            VALUE "OriginalFilename", "QTMovieWin.dll"
-            VALUE "ProductName", "WebKit"
-            VALUE "ProductVersion", __VERSION_TEXT__
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
index 7d85d2f..3c9cc6f 100644 (file)
                                >
                        </File>
                </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-                       <File
-                               RelativePath=".\QTMovieWin.rc"
-                               >
-                       </File>
-               </Filter>
        </Files>
        <Globals>
        </Globals>
index 8063ee0..e88748c 100644 (file)
@@ -1,4 +1,5 @@
 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\QTMovieWin"
 xcopy /y /d "%PROJECTDIR%..\platform\graphics\win\QTMovie.h" "%CONFIGURATIONBUILDDIR%\include\QTMovieWin"
+if exist "%WEBKITLIBRARIESDIR%\tools\VersionStamper\VersionStamper.exe" "%WEBKITLIBRARIESDIR%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
 
 if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
index 86692d2..bfffcf1 100644 (file)
@@ -5,5 +5,3 @@ cmd /c
 if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
 if errorlevel 1 exit 1
 echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
-
-bash "%WEBKITLIBRARIESDIR%\tools\scripts\auto-version.sh" "%INTDIR%"
index 91c20c5..da0f5a2 100644 (file)
@@ -4,8 +4,4 @@
        Version="8.00"
        Name="WebCoreMediaQT"
        >
-       <Tool
-               Name="VCCLCompilerTool"
-               AdditionalIncludeDirectories="$(ConfigurationBuildDir)\include\QTMovieWin"
-       />
 </VisualStudioPropertySheet>