Adding ffmpeg_binaries target which copies FFmpeg binaries alongside chrome.dll if present.

Review URL: http://codereview.chromium.org/114048

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16826 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 64 insertions, 1 deletions

diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 56b1ba0..887b0c4 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -105,6 +105,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "..\third_party\l
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg", "..\third_party\ffmpeg\ffmpeg.vcproj", "{D7A94F58-576A-45D9-A45F-EB87C63ABBB0}"
 	ProjectSection(ProjectDependencies) = postProject
+		{4E4070E1-EFD9-4EF1-8634-3960956F6F10} = {4E4070E1-EFD9-4EF1-8634-3960956F6F10}
+		{D28CF9C7-B857-C11E-B94D-ECA46CDEB3CE} = {D28CF9C7-B857-C11E-B94D-ECA46CDEB3CE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg_binaries", "..\third_party\ffmpeg\ffmpeg_binaries.vcproj", "{4E4070E1-EFD9-4EF1-8634-3960956F6F10}"
+	ProjectSection(ProjectDependencies) = postProject
 		{D28CF9C7-B857-C11E-B94D-ECA46CDEB3CE} = {D28CF9C7-B857-C11E-B94D-ECA46CDEB3CE}
 	EndProjectSection
 EndProject
@@ -2047,6 +2053,14 @@ Global
 		{4D2B38E6-65FF-4F97-B88A-E441DF54EBF7}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{4D2B38E6-65FF-4F97-B88A-E441DF54EBF7}.Release|Win32.ActiveCfg = Release|Win32
 		{4D2B38E6-65FF-4F97-B88A-E441DF54EBF7}.Release|Win32.Build.0 = Release|Win32
+		{4E4070E1-EFD9-4EF1-8634-3960956F6F10}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{4E4070E1-EFD9-4EF1-8634-3960956F6F10}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{4E4070E1-EFD9-4EF1-8634-3960956F6F10}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4E4070E1-EFD9-4EF1-8634-3960956F6F10}.Debug|Win32.Build.0 = Debug|Win32
+		{4E4070E1-EFD9-4EF1-8634-3960956F6F10}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{4E4070E1-EFD9-4EF1-8634-3960956F6F10}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{4E4070E1-EFD9-4EF1-8634-3960956F6F10}.Release|Win32.ActiveCfg = Release|Win32
+		{4E4070E1-EFD9-4EF1-8634-3960956F6F10}.Release|Win32.Build.0 = Release|Win32
 		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{4EA8CE12-9C6F-45E5-9D08-720383FE3685}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -3138,6 +3152,7 @@ Global
 		{4B60E8B8-416F-40B2-8A54-F75970A21992} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{4B6E199A-034A-49BD-AB93-458DD37E45B1} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{4D2B38E6-65FF-4F97-B88A-E441DF54EBF7} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
+		{4E4070E1-EFD9-4EF1-8634-3960956F6F10} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{4EA8CE12-9C6F-45E5-9D08-720383FE3685} = {846901FD-A619-4BD5-A303-38174730CDD6}
 		{50B079C7-CD01-42D3-B8C4-9F8D9322E822} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 6092c58..3cef150 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -41,4 +41,6 @@ Resources\Inspector\Images\*.*: %(VersionDir)s\Resources\Inspector\Images
 servers\*.dll: %(VersionDir)s\
 
 [GOOGLE_CHROME]
+av*.dll: %(VersionDir)s\
+pthreadGC2.dll: %(VersionDir)s\
 rlz.dll: %(VersionDir)s\
diff --git a/third_party/ffmpeg/copy_binaries.sh b/third_party/ffmpeg/copy_binaries.sh
new file mode 100644
index 0000000..fb59e15
--- /dev/null
+++ b/third_party/ffmpeg/copy_binaries.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copies FFmpeg binaries due to gyp limitations on how much you can cram
+# into a rules action.
+
+SOURCE=$1
+DESTINATION=$2
+
+# Our cygwin environment is very limited: "if" isn't available.
+test -f $SOURCE && cp -v -f $SOURCE $DESTINATION
+
+# Make sure we always succeed.
+exit 0
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 30d03b7..13edb9a 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -68,7 +68,10 @@
               ],
             },
           },
-          'dependencies': ['../../build/win/system.gyp:cygwin'],
+          'dependencies': [
+            'ffmpeg_binaries',
+            '../../build/win/system.gyp:cygwin',
+          ],
           'rules': [
             {
               'rule_name': 'generate_libs',
@@ -93,5 +96,35 @@
         }],
       ],
     },
+    {
+      'target_name': 'ffmpeg_binaries',
+      'type': 'none',
+      'msvs_guid': '4E4070E1-EFD9-4ef1-8634-3960956F6F10',
+      'conditions': [
+        ['OS=="win"', {
+          'sources': [
+            'binaries/avcodec-52.dll',
+            'binaries/avformat-52.dll',
+            'binaries/avutil-50.dll',
+            'binaries/pthreadGC2.dll',
+          ],
+          'dependencies': ['../../build/win/system.gyp:cygwin'],
+          'rules': [
+            {
+              'rule_name': 'copy_binaries',
+              'extension': 'dll',
+              'inputs': [
+                'copy_binaries.sh',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/<(RULE_INPUT_NAME)',
+              ],
+              'action': ['./copy_binaries.sh', '"<@(RULE_INPUT_PATH)"', '"<@(PRODUCT_DIR)/<@(RULE_INPUT_NAME)"'],
+              'message': 'Copying binaries...',
+            },
+          ],
+        }],
+      ],
+    },
   ],
 }