- Mac: Add plugin_carbon_interpose target to fix plugin crash (issue #680).

- Mac: Add version number to dylib files (issue #730).


git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@795 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

tools/distrib/cefclient.gyp

@@ -100,6 +100,7 @@
               'destination': '<(PRODUCT_DIR)/cefclient.app/Contents/Frameworks',
               'files': [
                 '<(PRODUCT_DIR)/cefclient Helper.app',
+                '$(CONFIGURATION)/libplugin_carbon_interpose.dylib',
               ],
             },
           ],

tools/make_distrib.py

@@ -367,9 +367,10 @@ elif platform == 'macosx':
     make_dir(dst_dir, options.quiet)
     copy_file(os.path.join(build_dir, 'ffmpegsumo.so'), dst_dir, options.quiet)
     copy_file(os.path.join(build_dir, 'libcef.dylib'), dst_dir, options.quiet)
+    copy_file(os.path.join(build_dir, 'libplugin_carbon_interpose.dylib'), dst_dir, options.quiet)
   else:
     build_dir = None
-  
+
   # transfer xcodebuild/Release files
   build_dir = os.path.join(src_dir, 'xcodebuild/Release')
   if not options.allowpartial or path_exists(build_dir):
@@ -377,6 +378,7 @@ elif platform == 'macosx':
     make_dir(dst_dir, options.quiet)
     copy_file(os.path.join(build_dir, 'ffmpegsumo.so'), dst_dir, options.quiet)
     copy_file(os.path.join(build_dir, 'libcef.dylib'), dst_dir, options.quiet)
+    copy_file(os.path.join(build_dir, 'libplugin_carbon_interpose.dylib'), dst_dir, options.quiet)
 
     if not options.nosymbols:
       # create the real dSYM file from the "fake" dSYM file

tools/revision.py

@@ -0,0 +1,19 @@
+# Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+# reserved. Use of this source code is governed by a BSD-style license that
+# can be found in the LICENSE file.
+
+import svn_util as svn
+import git_util as git
+import sys
+
+# cannot be loaded as a module
+if __name__ != "__main__":
+    sys.stderr.write('This file cannot be loaded as a module!')
+    sys.exit()
+
+try:
+  sys.stdout.write(svn.get_revision())
+except:
+  sys.stdout.write(git.get_svn_revision())
+
+