diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 16:31:53 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 16:31:53 +0000 |
| commit | 7ceedfd34e5935881f16b10dea86d85fe1ca0017 (patch) | |
| tree | 406a42d9dc3968bf1a31bb9fbf140efaf6bf257f /chrome/chrome.gyp | |
| parent | b234451e153982926a3bd76b7eb239d383293d6b (diff) | |
| download | chromium_src-7ceedfd34e5935881f16b10dea86d85fe1ca0017.zip chromium_src-7ceedfd34e5935881f16b10dea86d85fe1ca0017.tar.gz chromium_src-7ceedfd34e5935881f16b10dea86d85fe1ca0017.tar.bz2 | |
Change how version_build_patch is computed to allow PATCH > 255
version_build_patch is built as BUILD.PATCH and then used to set
DYLIB_CURRENT_VERSION and DYLIB_COMPATIBILITY_VERSION on Mac OS X.
These VERSION strings have the format X.Y.Z, where X cannot exceed 65535 and Y
and Z cannot exceed 255 (see the ld man page).
In order to allow PATCH to exceed 255, change version_build_patch to
BUILD.PATCH/256.PATCH%256.
BUG=39244
TEST=Set PATCH > 255 in chrome/VERSION, rebuild, and use otool -L to confirm
version
Patch by Jay Soffian <jaysoffian@gmail.com>
Review URL: http://codereview.chromium.org/1322002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 616a0f4..eb07bb5 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -13,8 +13,8 @@ 'version_path': '<(version_path)', 'version_full': '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")', - 'version_build_patch': - '<!(python <(version_py_path) -f <(version_path) -t "@BUILD@.@PATCH@")', + 'version_mac_dylib': + '<!(python <(version_py_path) -f <(version_path) -t "@BUILD@.@PATCH_HI@.@PATCH_LO@" -e "PATCH_HI=int(PATCH)/256" -e "PATCH_LO=int(PATCH)%256")', # Define the common dependencies that contain all the actual # Chromium functionality. This list gets pulled in below by @@ -1210,8 +1210,8 @@ ], }, 'xcode_settings': { - 'DYLIB_COMPATIBILITY_VERSION': '<(version_build_patch)', - 'DYLIB_CURRENT_VERSION': '<(version_build_patch)', + 'DYLIB_COMPATIBILITY_VERSION': '<(version_mac_dylib)', + 'DYLIB_CURRENT_VERSION': '<(version_mac_dylib)', 'DYLIB_INSTALL_NAME_BASE': '@executable_path', }, 'postbuilds': [ |