From a16f2049743e30b176bca6e176066eca7e8faf26 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Wed, 26 Sep 2012 15:49:24 +0000
Subject: [PATCH] Merge revision 797 changes: - Mac: Add version number to
 dylib files (issue #730).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1180@798 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 cef1/cef.gyp           |  6 ++++++
 cef1/tools/revision.py | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 cef1/tools/revision.py

diff --git a/cef1/cef.gyp b/cef1/cef.gyp
index 7a0f27b67..894d25867 100644
--- a/cef1/cef.gyp
+++ b/cef1/cef.gyp
@@ -8,6 +8,10 @@
     'chromium_code': 1,
     'repack_locales_cmd': ['python', 'tools/repack_locales.py'],
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/cef',
+    'revision': '<!(python tools/revision.py)',
+    # Need to be creative to match dylib version formatting requirements.
+    'version_mac_dylib':
+        '<!(python ../chrome/tools/build/version.py -f ../chrome/VERSION -t "1<(revision).@BUILD_HI@.@BUILD_LO@" -e "BUILD_HI=int(BUILD)/256" -e "BUILD_LO=int(BUILD)%256")',
   },
   'conditions': [
     [ 'os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', {
@@ -477,6 +481,8 @@
         # runtime error. See http://developer.apple.com/library/mac/#qa/qa1490/_index.html
         # for more information.
         'OTHER_LDFLAGS': ['-Wl,-ObjC'],
+        'DYLIB_COMPATIBILITY_VERSION': '<(version_mac_dylib)',
+        'DYLIB_CURRENT_VERSION': '<(version_mac_dylib)',
       },
       'conditions': [
         ['OS=="win"', {
diff --git a/cef1/tools/revision.py b/cef1/tools/revision.py
new file mode 100644
index 000000000..1096c12dd
--- /dev/null
+++ b/cef1/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())
+
+